From 128a07c44ae5ca92627ac2e4f00cddc475151ad8 Mon Sep 17 00:00:00 2001
From: Maxime Gimeno <maxime.gimeno@gmail.com>
Date: Thu, 16 Jul 2020 16:27:36 +0200
Subject: [PATCH] Fix typeset bad call

---
 .../CGAL/NewKernel_d/Cartesian_filter_K.h      | 18 ++++++++++++------
 .../CGAL/Concurrent_compact_container.h        |  5 -----
 2 files changed, 12 insertions(+), 11 deletions(-)

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 2a293685bdf..192abe58431 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_filter_K.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_filter_K.h
@@ -32,22 +32,28 @@ 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> > {
-  typedef typeset<Orientation_of_points_tag, Side_of_oriented_sphere_tag> type;
+  typedef typeset<Orientation_of_points_tag>
+  ::add<Side_of_oriented_sphere_tag>::type type;
 };
 template<> struct Functors_without_division<Dimension_tag<2> > {
-  typedef typeset<Orientation_of_points_tag, Side_of_oriented_sphere_tag> type;
+  typedef typeset<Orientation_of_points_tag>
+  ::add<Side_of_oriented_sphere_tag>::type type;
 };
 template<> struct Functors_without_division<Dimension_tag<3> > {
-  typedef typeset<Orientation_of_points_tag, Side_of_oriented_sphere_tag> type;
+  typedef typeset<Orientation_of_points_tag>
+  ::add<Side_of_oriented_sphere_tag >::type  type;
 };
 template<> struct Functors_without_division<Dimension_tag<4> > {
-  typedef typeset<Orientation_of_points_tag, Side_of_oriented_sphere_tag> type;
+  typedef typeset<Orientation_of_points_tag>
+  ::add<Side_of_oriented_sphere_tag>::type type;
 };
 template<> struct Functors_without_division<Dimension_tag<5> > {
-  typedef typeset<Orientation_of_points_tag, Side_of_oriented_sphere_tag> type;
+  typedef typeset<Orientation_of_points_tag>
+  ::add<Side_of_oriented_sphere_tag>::type type;
 };
 template<> struct Functors_without_division<Dimension_tag<6> > {
-  typedef typeset<Orientation_of_points_tag, Side_of_oriented_sphere_tag> type;
+  typedef typeset<Orientation_of_points_tag>
+  ::add<Side_of_oriented_sphere_tag>::type type;
 };
 
 // FIXME:
diff --git a/STL_Extension/include/CGAL/Concurrent_compact_container.h b/STL_Extension/include/CGAL/Concurrent_compact_container.h
index 47b020aa4e2..92a676f00ef 100644
--- a/STL_Extension/include/CGAL/Concurrent_compact_container.h
+++ b/STL_Extension/include/CGAL/Concurrent_compact_container.h
@@ -47,11 +47,6 @@
 
 #include <boost/mpl/if.hpp>
 
-#ifdef CGAL_CXX11
-#define CGAL_CONSTEXPR constexpr
-#else
-#define CGAL_CONSTEXPR
-#endif
 namespace CGAL {
 
 #define CGAL_GENERATE_MEMBER_DETECTOR(X)                                           \