From 76c16e45eec61d21c3707b66032f91ff4886b0e8 Mon Sep 17 00:00:00 2001
From: Marc Glisse <Marc.Glisse@inria.fr>
Date: Thu, 12 May 2011 12:47:30 +0000
Subject: [PATCH] a

---
 NewKernel_d/include/CGAL/Kernel_d/Cartesian_LA_base.h | 2 ++
 NewKernel_d/include/CGAL/Kernel_d/Segmentd.h          | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_LA_base.h b/NewKernel_d/include/CGAL/Kernel_d/Cartesian_LA_base.h
index 518d9957514..4455c832dbb 100644
--- a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_LA_base.h
+++ b/NewKernel_d/include/CGAL/Kernel_d/Cartesian_LA_base.h
@@ -55,6 +55,7 @@ struct Cartesian_LA_base_d : public Dimension_base<Dim_>
     typedef LA_vector Point;
     typedef LA_vector Vector;
 
+#if 0
     // old way
     typedef CartesianDVectorBase::Construct_LA_vector<Self> Construct_point;
     typedef CartesianDVectorBase::Construct_LA_vector<Self> Construct_vector;
@@ -65,6 +66,7 @@ struct Cartesian_LA_base_d : public Dimension_base<Dim_>
     typedef CartesianDVectorBase::Construct_midpoint<Self> Construct_midpoint;
 
     typedef CartesianDVectorBase::Compute_cartesian_coordinate<Self> Compute_cartesian_coordinate;
+#endif
 
     // new way
     template<class, /* C++ sucks */ int=0> struct Construct {
diff --git a/NewKernel_d/include/CGAL/Kernel_d/Segmentd.h b/NewKernel_d/include/CGAL/Kernel_d/Segmentd.h
index 875fe3f6c51..a965e6564a1 100644
--- a/NewKernel_d/include/CGAL/Kernel_d/Segmentd.h
+++ b/NewKernel_d/include/CGAL/Kernel_d/Segmentd.h
@@ -1,13 +1,14 @@
 #ifndef CGAL_KERNELD_SEGMENTD_H
 #define CGAL_KERNELD_SEGMENTD_H
 #include <utility>
+#include <CGAL/functor_tags.h>
 #define Segmentd SegmentCd
 namespace CGAL {
 template <class R_> class Segmentd {
 	typedef typename R_::FT FT_;
 	typedef typename R_::Point Point_;
 	typedef typename R_::Vector Vector_;
-	typedef typename R_::Construct_vector Cv_;
+	typedef typename R_::template Construct<Construct_vector_tag>::type Cv_;
 //	typedef typename R_::Compute_squared_distance Csd_;
 	typedef std::pair<Point_,Point_> Data_;
 	Data_ data;