From a3719c362861ed7cb0a6e466a320adce9538b4a4 Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Mon, 2 Mar 2020 12:52:23 +0000
Subject: [PATCH] Compile in C++03 and C++14

---
 NewKernel_d/include/CGAL/Epick_d.h                 |  4 ++--
 .../include/CGAL/NewKernel_d/Cartesian_filter_K.h  | 14 +++++++-------
 NewKernel_d/include/CGAL/typeset.h                 |  6 ++++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/NewKernel_d/include/CGAL/Epick_d.h b/NewKernel_d/include/CGAL/Epick_d.h
index d4421196b86..1c8fa985ac3 100644
--- a/NewKernel_d/include/CGAL/Epick_d.h
+++ b/NewKernel_d/include/CGAL/Epick_d.h
@@ -75,8 +75,8 @@ template<class Dim>
 struct Epick_d_help3
 : CGAL_BASE
 {
-  constexpr Epick_d_help3(){}
-  constexpr Epick_d_help3(int d):CGAL_BASE(d){}
+  CGAL_CONSTEXPR Epick_d_help3(){}
+  CGAL_CONSTEXPR Epick_d_help3(int d):CGAL_BASE(d){}
 };
 #undef CGAL_BASE
 #define CGAL_BASE \
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_filter_K.h b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_filter_K.h
index 6ebb0e9daa3..f931da3f15d 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_filter_K.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_filter_K.h
@@ -31,22 +31,22 @@ namespace CGAL {
 
   // It would be nicer to write the table in the other direction: Orientation_of_points_tag is good up to 6, Side_of_oriented_sphere_tag up to 5, etc.
 template<class> struct Functors_without_division { typedef typeset<> type; };
-template<> struct Functors_without_division<Dimension_tag<1>> {
+template<> struct Functors_without_division<Dimension_tag<1> > {
   typedef typeset<Orientation_of_points_tag, Side_of_oriented_sphere_tag> type;
 };
-template<> struct Functors_without_division<Dimension_tag<2>> {
+template<> struct Functors_without_division<Dimension_tag<2> > {
   typedef typeset<Orientation_of_points_tag, Side_of_oriented_sphere_tag> type;
 };
-template<> struct Functors_without_division<Dimension_tag<3>> {
+template<> struct Functors_without_division<Dimension_tag<3> > {
   typedef typeset<Orientation_of_points_tag, Side_of_oriented_sphere_tag> type;
 };
-template<> struct Functors_without_division<Dimension_tag<4>> {
+template<> struct Functors_without_division<Dimension_tag<4> > {
   typedef typeset<Orientation_of_points_tag, Side_of_oriented_sphere_tag> type;
 };
-template<> struct Functors_without_division<Dimension_tag<5>> {
+template<> struct Functors_without_division<Dimension_tag<5> > {
   typedef typeset<Orientation_of_points_tag, Side_of_oriented_sphere_tag> type;
 };
-template<> struct Functors_without_division<Dimension_tag<6>> {
+template<> struct Functors_without_division<Dimension_tag<6> > {
   typedef typeset<Orientation_of_points_tag> type;
 };
 
@@ -63,7 +63,7 @@ struct Cartesian_filter_K : public Base_,
     typedef Base_ Kernel_base;
     typedef AK_ AK;
     typedef EK_ EK;
-    static_assert(internal::Do_not_store_kernel<AK>::value, "Only handle stateless kernels as AK");
+    CGAL_static_assertion_msg(internal::Do_not_store_kernel<AK>::value, "Only handle stateless kernels as AK");
     AK approximate_kernel()const{return {};}
     typedef typename Store_kernel<EK_>::reference_type EK_rt;
     EK_rt exact_kernel()const{return this->Store_kernel<EK>::kernel();}
diff --git a/NewKernel_d/include/CGAL/typeset.h b/NewKernel_d/include/CGAL/typeset.h
index fb88973e387..a08c6c48215 100644
--- a/NewKernel_d/include/CGAL/typeset.h
+++ b/NewKernel_d/include/CGAL/typeset.h
@@ -88,8 +88,10 @@ namespace CGAL {
     struct typeset<H,T>::add<H,V> : typeset<H,T> {};
   struct typeset_all {
     typedef typeset_all type;
-    template<class X> struct contains : public std::true_type {};
-    template<class X> struct add : public typeset_all {};
+    template<class X> struct contains : public boost::true_type {};
+    template<class X> struct add {
+      typedef typeset_all type;
+    };
   };
 #endif