From 4c3bfb1eedbb9ce6f155882908d528de509f8c77 Mon Sep 17 00:00:00 2001
From: Maxime Gimeno <maxime.gimeno@gmail.com>
Date: Wed, 10 Apr 2019 13:48:04 +0200
Subject: [PATCH 1/4] Add a fucntion to_tuple() to the Dispatch_output_iterator
 and use it in the test to avoid a clang error on old macs

---
 STL_Extension/include/CGAL/iterator.h                 | 11 +++++++++++
 .../test/STL_Extension/test_dispatch_output.cpp       |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/STL_Extension/include/CGAL/iterator.h b/STL_Extension/include/CGAL/iterator.h
index 44238dd2111..f810be17152 100644
--- a/STL_Extension/include/CGAL/iterator.h
+++ b/STL_Extension/include/CGAL/iterator.h
@@ -1408,6 +1408,16 @@ public:
     tuple_dispatch(t);
     return *this;
   }
+  
+  std::tuple<O...>& to_tuple()
+  {
+    return static_cast<std::tuple<O...>&>(*this);
+  }
+  
+  const std::tuple<O...>& to_tuple() const
+  {
+    return static_cast<std::tuple<const O...>&> (*this);
+  }
 };
 
 template < typename... V, typename... O>
@@ -1449,6 +1459,7 @@ public:
 
   template <class T>
   Self& operator=(const T&) { return *this; }
+  
 };
 
 
diff --git a/STL_Extension/test/STL_Extension/test_dispatch_output.cpp b/STL_Extension/test/STL_Extension/test_dispatch_output.cpp
index 622e907952b..1f782d23509 100644
--- a/STL_Extension/test/STL_Extension/test_dispatch_output.cpp
+++ b/STL_Extension/test/STL_Extension/test_dispatch_output.cpp
@@ -76,8 +76,8 @@ void complete_test(std::vector<T1> data1,std::list<T2> data2){
   
   T1* d;
 
-  std::tie(d, bck_ins) = disp;
-  std::tie(d, bck_ins) = drop;
+  std::tie(d, bck_ins) = disp.to_tuple();
+  std::tie(d, bck_ins) = drop.to_tuple();
 
   //testing putting the tuple directly
   std::tuple<T1,T2> tuple =

From a7361a3444943197c8b7932ca607bae1a2d5554e Mon Sep 17 00:00:00 2001
From: Maxime Gimeno <maxime.gimeno@gmail.com>
Date: Wed, 10 Apr 2019 14:08:37 +0200
Subject: [PATCH 2/4] Clean-up

---
 STL_Extension/include/CGAL/iterator.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/STL_Extension/include/CGAL/iterator.h b/STL_Extension/include/CGAL/iterator.h
index f810be17152..ee140e1346e 100644
--- a/STL_Extension/include/CGAL/iterator.h
+++ b/STL_Extension/include/CGAL/iterator.h
@@ -1416,7 +1416,7 @@ public:
   
   const std::tuple<O...>& to_tuple() const
   {
-    return static_cast<std::tuple<const O...>&> (*this);
+    return static_cast<const std::tuple<const O...>&> (*this);
   }
 };
 
@@ -1459,7 +1459,7 @@ public:
 
   template <class T>
   Self& operator=(const T&) { return *this; }
-  
+
 };
 
 

From 920133b7853cec71f4dc50debe36c4dfc3c47cb9 Mon Sep 17 00:00:00 2001
From: Maxime Gimeno <maxime.gimeno@gmail.com>
Date: Fri, 12 Apr 2019 14:29:24 +0200
Subject: [PATCH 3/4] Replace to_tuple() by operator std::tuple

---
 STL_Extension/include/CGAL/iterator.h           | 17 +++++++++++++----
 .../test/STL_Extension/test_dispatch_output.cpp |  4 ++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/STL_Extension/include/CGAL/iterator.h b/STL_Extension/include/CGAL/iterator.h
index ee140e1346e..8d40cec8c38 100644
--- a/STL_Extension/include/CGAL/iterator.h
+++ b/STL_Extension/include/CGAL/iterator.h
@@ -43,6 +43,7 @@
 
 #include <vector>
 #include <map>
+#include <utility>
 
 namespace CGAL {
 
@@ -1324,6 +1325,14 @@ struct Derivator<D, std::tuple<V1, V...>, std::tuple<O1, O...> >
 
 } // internal
 
+namespace tuple_internal {
+template <typename ...Args, std::size_t ...Is>
+auto to_tuple(std::tuple<Args...> &t, std::index_sequence<Is...>)
+{
+  return std::tuple<Args&...>(std::get<Is>(t)...);
+}
+
+}//end namespace  tuple_internal
 
 // OutputIterator which accepts several types in *o++= and dispatches,
 // wraps several other output iterators, and dispatches accordingly.
@@ -1409,14 +1418,14 @@ public:
     return *this;
   }
   
-  std::tuple<O...>& to_tuple()
+  operator std::tuple<O&...>()
   {
-    return static_cast<std::tuple<O...>&>(*this);
+    return tuple_internal::to_tuple(*this, std::index_sequence_for<O...>{});
   }
   
-  const std::tuple<O...>& to_tuple() const
+  operator std::tuple<const O&...>()const
   {
-    return static_cast<const std::tuple<const O...>&> (*this);
+    return tuple_internal::to_tuple(*this, std::index_sequence_for<O...>{});
   }
 };
 
diff --git a/STL_Extension/test/STL_Extension/test_dispatch_output.cpp b/STL_Extension/test/STL_Extension/test_dispatch_output.cpp
index 1f782d23509..622e907952b 100644
--- a/STL_Extension/test/STL_Extension/test_dispatch_output.cpp
+++ b/STL_Extension/test/STL_Extension/test_dispatch_output.cpp
@@ -76,8 +76,8 @@ void complete_test(std::vector<T1> data1,std::list<T2> data2){
   
   T1* d;
 
-  std::tie(d, bck_ins) = disp.to_tuple();
-  std::tie(d, bck_ins) = drop.to_tuple();
+  std::tie(d, bck_ins) = disp;
+  std::tie(d, bck_ins) = drop;
 
   //testing putting the tuple directly
   std::tuple<T1,T2> tuple =

From ff012669f5a8b272ff55abb51b412d4ffe7f52d5 Mon Sep 17 00:00:00 2001
From: Maxime Gimeno <maxime.gimeno@gmail.com>
Date: Tue, 16 Apr 2019 10:12:11 +0200
Subject: [PATCH 4/4] enable c++14 in check_headers

---
 Scripts/developer_scripts/cgal_check_dependencies.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scripts/developer_scripts/cgal_check_dependencies.sh b/Scripts/developer_scripts/cgal_check_dependencies.sh
index 65b989a8ca2..0a8d7b34e14 100644
--- a/Scripts/developer_scripts/cgal_check_dependencies.sh
+++ b/Scripts/developer_scripts/cgal_check_dependencies.sh
@@ -30,7 +30,7 @@ do
   fi
 done
 
-cmake -DCGAL_HEADER_ONLY=FALSE -DCGAL_ENABLE_CHECK_HEADERS=TRUE -DDOXYGEN_EXECUTABLE="$DOX_PATH" -DCGAL_COPY_DEPENDENCIES=TRUE -DCMAKE_CXX_FLAGS="-std=c++11" ..
+cmake -DCGAL_HEADER_ONLY=FALSE -DCGAL_ENABLE_CHECK_HEADERS=TRUE -DDOXYGEN_EXECUTABLE="$DOX_PATH" -DCGAL_COPY_DEPENDENCIES=TRUE -DCMAKE_CXX_FLAGS="-std=c++14" ..
 if [ -n "$DO_CHECK_HEADERS" ]; then
     make -j$(nproc --all) -k check_headers
 fi