From 2d248ae75e00f84221ef66a3473d066c042071bc Mon Sep 17 00:00:00 2001
From: Simon Giraudot <simon.giraudot@geometryfactory.com>
Date: Fri, 2 Oct 2015 16:07:13 +0200
Subject: [PATCH] Bugfix: wrong default template parameter (from bad conflict
 resolution)

---
 .../include/CGAL/Scale_space_surface_reconstruction_3.h    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Scale_space_reconstruction_3/include/CGAL/Scale_space_surface_reconstruction_3.h b/Scale_space_reconstruction_3/include/CGAL/Scale_space_surface_reconstruction_3.h
index 6ade3bde845..a089d89599b 100644
--- a/Scale_space_reconstruction_3/include/CGAL/Scale_space_surface_reconstruction_3.h
+++ b/Scale_space_reconstruction_3/include/CGAL/Scale_space_surface_reconstruction_3.h
@@ -90,12 +90,13 @@ namespace CGAL {
  *  \tparam Ct indicates whether to use concurrent processing. It must be
  *  either `Sequential_tag` or `Parallel_tag` (the default value).
  */
-template < class Gt, class FS = Tag_true, class wA = Default, class Ct = Parallel_tag >
+template < class Gt, class FS = Tag_true,
+	   class wA = CGAL::Default_diagonalize_traits<typename Gt::FT, 3>, class Ct = Parallel_tag >
 class Scale_space_surface_reconstruction_3 {
 
 public:
-	typedef typename Gt::Point_3                        Point;          ///< defines the point type.
-  typedef boost::tuple<Point, std::size_t>                           Point_and_size_t;
+    typedef typename Gt::Point_3                        Point;          ///< defines the point type.
+    typedef boost::tuple<Point, std::size_t>                           Point_and_size_t;
 
 private:
     // Searching for neighbors.