From 5c0d9aaa226e105f30172d3a29577ba62f932cd6 Mon Sep 17 00:00:00 2001
From: Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
Date: Fri, 27 Mar 2020 19:06:13 +0100
Subject: [PATCH] Change parameter orders for copy methods in CMap, GMap

---
 .../include/CGAL/Combinatorial_map.h          | 92 +++++++++----------
 .../include/CGAL/Generalized_map.h            | 82 ++++++++---------
 2 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h
index 05c0b521736..4e79e0157e2 100644
--- a/Combinatorial_map/include/CGAL/Combinatorial_map.h
+++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h
@@ -220,11 +220,11 @@ namespace CGAL {
               typename Converters, typename DartInfoConverter,
               typename PointConverter>
     void generic_copy(CMap2& amap,
+                      boost::unordered_map<Dart_handle_2, Dart_handle>* origin_to_copy,
+                      boost::unordered_map<Dart_handle, Dart_handle_2>* copy_to_origin,
                       const Converters& converters,
                       const DartInfoConverter& dartinfoconverter,
-                      const PointConverter& pointconverter,
-                      boost::unordered_map<Dart_handle_2, Dart_handle>* origin_to_copy=nullptr,
-                      boost::unordered_map<Dart_handle, Dart_handle_2>* copy_to_origin=nullptr)
+                      const PointConverter& pointconverter)
     {
       this->clear();
 
@@ -304,94 +304,94 @@ namespace CGAL {
     template<typename CMap2, typename Converters, typename DartInfoConverter,
              typename PointConverter>
     void copy(CMap2& amap,
+              boost::unordered_map
+              <typename CMap2::Dart_handle, Dart_handle>* origin_to_copy,
+              boost::unordered_map
+              <Dart_handle, typename CMap2::Dart_handle>* copy_to_origin,
               const Converters& converters,
               const DartInfoConverter& dartinfoconverter,
-              const PointConverter& pointconverter,
-              boost::unordered_map
-              <typename CMap2::Dart_handle, Dart_handle>* origin_to_copy=nullptr,
-              boost::unordered_map
-              <Dart_handle, typename CMap2::Dart_handle>* copy_to_origin=nullptr)
+              const PointConverter& pointconverter)
     {
       generic_copy<CMap2, typename CMap2::Dart_handle, Converters,
           DartInfoConverter, PointConverter>
-          (amap, converters, dartinfoconverter, pointconverter,
-           origin_to_copy, copy_to_origin);
+          (amap,  origin_to_copy, copy_to_origin,
+           converters, dartinfoconverter, pointconverter);
     }
 
     // (1b) copy(const amap, converters, dartinfoconverter, pointconverter)
     template<typename CMap2, typename Converters, typename DartInfoConverter,
              typename PointConverter>
     void copy(const CMap2& amap,
+              boost::unordered_map
+              <typename CMap2::Dart_const_handle, Dart_handle>* origin_to_copy,
+              boost::unordered_map
+              <Dart_handle, typename CMap2::Dart_const_handle>* copy_to_origin,
               const Converters& converters,
               const DartInfoConverter& dartinfoconverter,
-              const PointConverter& pointconverter,
-              boost::unordered_map
-              <typename CMap2::Dart_const_handle, Dart_handle>* origin_to_copy=nullptr,
-              boost::unordered_map
-              <Dart_handle, typename CMap2::Dart_const_handle>* copy_to_origin=nullptr)
-    {
+              const PointConverter& pointconverter)
+   {
       generic_copy<CMap2, typename CMap2::Dart_const_handle, Converters,
           DartInfoConverter, PointConverter>
-          (const_cast<CMap2&>(amap), converters, dartinfoconverter,
-           pointconverter, origin_to_copy, copy_to_origin);
+          (const_cast<CMap2&>(amap), origin_to_copy, copy_to_origin,
+           converters, dartinfoconverter, pointconverter);
     }
 
     // (2a) copy(amap, converters, dartinfoconverter)
     template<typename CMap2, typename Converters, typename DartInfoConverter>
     void copy(CMap2& amap,
+              boost::unordered_map
+              <typename CMap2::Dart_handle, Dart_handle>* origin_to_copy,
+              boost::unordered_map
+              <Dart_handle, typename CMap2::Dart_handle>* copy_to_origin,
               const Converters& converters,
-              const DartInfoConverter& dartinfoconverter,
-              boost::unordered_map
-              <typename CMap2::Dart_handle, Dart_handle>* origin_to_copy=nullptr,
-              boost::unordered_map
-              <Dart_handle, typename CMap2::Dart_handle>* copy_to_origin=nullptr)
+              const DartInfoConverter& dartinfoconverter)
     {
       Default_converter_cmap_0attributes_with_point<typename CMap2::Refs, Refs>
         pointconverter;
-      copy(amap, converters, dartinfoconverter, pointconverter,
-           origin_to_copy, copy_to_origin);
+      copy(amap, origin_to_copy, copy_to_origin,
+           converters, dartinfoconverter, pointconverter);
     }
 
     // (2b) copy(const amap, converters, dartinfoconverter)
     template <typename CMap2, typename Converters, typename DartInfoConverter>
     void copy(const CMap2& amap,
+              boost::unordered_map
+              <typename CMap2::Dart_const_handle, Dart_handle>* origin_to_copy,
+              boost::unordered_map
+              <Dart_handle, typename CMap2::Dart_const_handle>* copy_to_origin,
               const Converters& converters,
-              const DartInfoConverter& dartinfoconverter,
-              boost::unordered_map
-              <typename CMap2::Dart_const_handle, Dart_handle>* origin_to_copy=nullptr,
-              boost::unordered_map
-              <Dart_handle, typename CMap2::Dart_const_handle>* copy_to_origin=nullptr)
+              const DartInfoConverter& dartinfoconverter)
     {
       Default_converter_cmap_0attributes_with_point<typename CMap2::Refs, Refs>
           pointconverter;
-      copy(amap, converters, dartinfoconverter, pointconverter,
-           origin_to_copy, copy_to_origin);
+      copy(amap, origin_to_copy, copy_to_origin,
+           converters, dartinfoconverter, pointconverter);
     }
     
     // (3a) copy(amap, converters)
     template<typename CMap2, typename Converters>
     void copy(CMap2& amap,
-              const Converters& converters,
               boost::unordered_map
-              <typename CMap2::Dart_handle, Dart_handle>* origin_to_copy=nullptr,
+              <typename CMap2::Dart_handle, Dart_handle>* origin_to_copy,
               boost::unordered_map
-              <Dart_handle, typename CMap2::Dart_handle>* copy_to_origin=nullptr)
+              <Dart_handle, typename CMap2::Dart_handle>* copy_to_origin,
+              const Converters& converters)
     {
       Default_converter_dart_info<typename CMap2::Refs, Refs> dartinfoconverter;
-      copy(amap, converters, dartinfoconverter, origin_to_copy, copy_to_origin);
+      copy(amap, origin_to_copy, copy_to_origin, converters, dartinfoconverter);
     }
 
     // (3b) copy(const amap, converters)
     template <typename CMap2, typename Converters>
     void copy(const CMap2& amap,
-              const Converters& converters,
               boost::unordered_map
-              <typename CMap2::Dart_const_handle, Dart_handle>* origin_to_copy=nullptr,
+              <typename CMap2::Dart_const_handle, Dart_handle>* origin_to_copy,
               boost::unordered_map
-              <Dart_handle, typename CMap2::Dart_const_handle>* copy_to_origin=nullptr)
+              <Dart_handle, typename CMap2::Dart_const_handle>* copy_to_origin,
+              const Converters& converters)
     {
       Default_converter_dart_info<typename CMap2::Refs, Refs> dartinfoconverter;
-      copy(amap, converters, dartinfoconverter, origin_to_copy, copy_to_origin);
+      copy(amap, origin_to_copy, copy_to_origin, converters, dartinfoconverter);
     }
     
     // (4a) copy(amap)
@@ -403,7 +403,7 @@ namespace CGAL {
               <Dart_handle, typename CMap2::Dart_handle>* copy_to_origin=nullptr)
     {
       CGAL::cpp11::tuple<> converters;
-      copy(amap, converters, origin_to_copy, copy_to_origin);
+      copy(amap, origin_to_copy, copy_to_origin, converters);
     }
 
     // (4b) copy(const amap)
@@ -415,8 +415,8 @@ namespace CGAL {
               <Dart_handle, typename CMap2::Dart_const_handle>* copy_to_origin=nullptr)
     {
       CGAL::cpp11::tuple<> converters;
-      copy(amap, converters, origin_to_copy, copy_to_origin);
-    }    
+      copy(amap, origin_to_copy, copy_to_origin, converters);
+    }
 
     // Copy constructor from a map having exactly the same type.
     Combinatorial_map_base (const Self & amap)
@@ -435,7 +435,7 @@ namespace CGAL {
     Combinatorial_map_base(const Combinatorial_map_base<d2, Refs2, Items2,
                            Alloc2, Storage2>& amap,
                            const Converters& converters)
-    { copy(amap, converters); }
+    { copy(amap, nullptr, nullptr, converters); }
 
     // "Copy constructor" from a map having different type.
     template <unsigned int d2, typename Refs2, typename Items2, typename Alloc2,
@@ -444,7 +444,7 @@ namespace CGAL {
                            Alloc2, Storage2>& amap,
                            const Converters& converters,
                            const DartInfoConverter& dartinfoconverter)
-    { copy(amap, converters, dartinfoconverter); }
+    { copy(amap, nullptr, nullptr, converters, dartinfoconverter); }
 
     // "Copy constructor" from a map having different type.
     template <unsigned int d2, typename Refs2, typename Items2, typename Alloc2,
@@ -456,7 +456,7 @@ namespace CGAL {
                            const Converters& converters,
                            const DartInfoConverter& dartinfoconverter,
                            const PointConverter& pointconverter)
-    { copy(amap, converters, dartinfoconverter, pointconverter); }
+    { copy(amap, nullptr, nullptr, converters, dartinfoconverter, pointconverter); }
 
     /** Affectation operation. Copies one map to the other.
      * @param amap a combinatorial map.
diff --git a/Generalized_map/include/CGAL/Generalized_map.h b/Generalized_map/include/CGAL/Generalized_map.h
index 342c6c7d7da..3b99c7160cc 100644
--- a/Generalized_map/include/CGAL/Generalized_map.h
+++ b/Generalized_map/include/CGAL/Generalized_map.h
@@ -186,11 +186,11 @@ namespace CGAL {
               typename Converters, typename DartInfoConverter, 
               typename PointConverter>
     void generic_copy(GMap2& amap,
+                      boost::unordered_map<Dart_handle_2, Dart_handle>* origin_to_copy,
+                      boost::unordered_map<Dart_handle, Dart_handle_2>* copy_to_origin,
                       const Converters& converters,
                       const DartInfoConverter& dartinfoconverter,
-                      const PointConverter& pointconverter,
-                      boost::unordered_map<Dart_handle_2, Dart_handle>* origin_to_copy=nullptr,
-                      boost::unordered_map<Dart_handle, Dart_handle_2>* copy_to_origin=nullptr)
+                      const PointConverter& pointconverter)
     {
       this->clear();
 
@@ -268,94 +268,94 @@ namespace CGAL {
     template<typename GMap2, typename Converters, typename DartInfoConverter,
              typename PointConverter>
     void copy(GMap2& amap,
+              boost::unordered_map
+              <typename GMap2::Dart_handle, Dart_handle>* origin_to_copy,
+              boost::unordered_map
+              <Dart_handle, typename GMap2::Dart_handle>* copy_to_origin,
               const Converters& converters,
               const DartInfoConverter& dartinfoconverter,
-              const PointConverter& pointconverter,
-              boost::unordered_map
-              <typename GMap2::Dart_handle, Dart_handle>* origin_to_copy=nullptr,
-              boost::unordered_map
-              <Dart_handle, typename GMap2::Dart_handle>* copy_to_origin=nullptr)
+              const PointConverter& pointconverter)
     {
       generic_copy<GMap2, typename GMap2::Dart_handle, Converters,
           DartInfoConverter, PointConverter>
-          (amap, converters, dartinfoconverter, pointconverter,
-           origin_to_copy, copy_to_origin);
+          (amap,  origin_to_copy, copy_to_origin,
+           converters, dartinfoconverter, pointconverter);
     }
 
     // (1b) copy(const amap, converters, dartinfoconverter, pointconverter)
     template<typename GMap2, typename Converters, typename DartInfoConverter,
              typename PointConverter>
     void copy(const GMap2& amap,
+              boost::unordered_map
+              <typename GMap2::Dart_const_handle, Dart_handle>* origin_to_copy,
+              boost::unordered_map
+              <Dart_handle, typename GMap2::Dart_const_handle>* copy_to_origin,
               const Converters& converters,
               const DartInfoConverter& dartinfoconverter,
-              const PointConverter& pointconverter,
-              boost::unordered_map
-              <typename GMap2::Dart_const_handle, Dart_handle>* origin_to_copy=nullptr,
-              boost::unordered_map
-              <Dart_handle, typename GMap2::Dart_const_handle>* copy_to_origin=nullptr)
+              const PointConverter& pointconverter)
     {
       generic_copy<GMap2, typename GMap2::Dart_const_handle,
           Converters, DartInfoConverter, PointConverter>
-          (const_cast<GMap2&>(amap), converters, dartinfoconverter,
-           pointconverter, origin_to_copy, copy_to_origin);
+          (const_cast<GMap2&>(amap), origin_to_copy, copy_to_origin,
+           converters, dartinfoconverter, pointconverter);
     }
 
     // (2a) copy(amap, converters, dartinfoconverter)
     template<typename GMap2, typename Converters, typename DartInfoConverter>
     void copy(GMap2& amap,
+              boost::unordered_map
+              <typename GMap2::Dart_handle, Dart_handle>* origin_to_copy,
+              boost::unordered_map
+              <Dart_handle, typename GMap2::Dart_handle>* copy_to_origin,
               const Converters& converters,
-              const DartInfoConverter& dartinfoconverter,
-              boost::unordered_map
-              <typename GMap2::Dart_handle, Dart_handle>* origin_to_copy=nullptr,
-              boost::unordered_map
-              <Dart_handle, typename GMap2::Dart_handle>* copy_to_origin=nullptr)
+              const DartInfoConverter& dartinfoconverter)
     {
       Default_converter_cmap_0attributes_with_point<typename GMap2::Refs, Refs>
         pointconverter;
-      copy(amap, converters, dartinfoconverter, pointconverter,
-           origin_to_copy, copy_to_origin);
+      copy(amap, origin_to_copy, copy_to_origin, converters,
+           dartinfoconverter, pointconverter);
     }
 
     // (2b) copy(const amap, converters, dartinfoconverter)
     template <typename GMap2, typename Converters, typename DartInfoConverter>
     void copy(const GMap2& amap,
+              boost::unordered_map
+              <typename GMap2::Dart_const_handle, Dart_handle>* origin_to_copy,
+              boost::unordered_map
+              <Dart_handle, typename GMap2::Dart_const_handle>* copy_to_origin,
               const Converters& converters,
-              const DartInfoConverter& dartinfoconverter,
-              boost::unordered_map
-              <typename GMap2::Dart_const_handle, Dart_handle>* origin_to_copy=nullptr,
-              boost::unordered_map
-              <Dart_handle, typename GMap2::Dart_const_handle>* copy_to_origin=nullptr)
+              const DartInfoConverter& dartinfoconverter)
     {
       Default_converter_cmap_0attributes_with_point<typename GMap2::Refs, Refs>
           pointconverter;
-      copy(amap, converters, dartinfoconverter, pointconverter,
-           origin_to_copy, copy_to_origin);
+      copy(amap, origin_to_copy, copy_to_origin, converters,
+           dartinfoconverter, pointconverter);
     }
     
     // (3a) copy(amap, converters)
     template<typename GMap2, typename Converters>
     void copy(GMap2& amap,
-              const Converters& converters,
               boost::unordered_map
-              <typename GMap2::Dart_handle, Dart_handle>* origin_to_copy=nullptr,
+              <typename GMap2::Dart_handle, Dart_handle>* origin_to_copy,
               boost::unordered_map
-              <Dart_handle, typename GMap2::Dart_handle>* copy_to_origin=nullptr)
+              <Dart_handle, typename GMap2::Dart_handle>* copy_to_origin,
+              const Converters& converters)
     {
       Default_converter_dart_info<typename GMap2::Refs, Refs> dartinfoconverter;
-      copy(amap, converters, dartinfoconverter, origin_to_copy, copy_to_origin);
+      copy(amap, origin_to_copy, copy_to_origin, converters, dartinfoconverter);
     }
 
     // (3b) copy(const amap, converters)
     template <typename GMap2, typename Converters>
     void copy(const GMap2& amap,
-              const Converters& converters,
               boost::unordered_map
-              <typename GMap2::Dart_const_handle, Dart_handle>* origin_to_copy=nullptr,
+              <typename GMap2::Dart_const_handle, Dart_handle>* origin_to_copy,
               boost::unordered_map
-              <Dart_handle, typename GMap2::Dart_const_handle>* copy_to_origin=nullptr)
+              <Dart_handle, typename GMap2::Dart_const_handle>* copy_to_origin,
+              const Converters& converters)
     {
       Default_converter_dart_info<typename GMap2::Refs, Refs> dartinfoconverter;
-      copy(amap, converters, dartinfoconverter, origin_to_copy, copy_to_origin);
+      copy(amap, origin_to_copy, copy_to_origin, converters, dartinfoconverter);
     }
     
     // (4a) copy(amap)
@@ -367,7 +367,7 @@ namespace CGAL {
               <Dart_handle, typename GMap2::Dart_handle>* copy_to_origin=nullptr)
     {
       CGAL::cpp11::tuple<> converters;
-      copy(amap, converters, origin_to_copy, copy_to_origin);
+      copy(amap, origin_to_copy, copy_to_origin, converters);
     }
 
     // (4b) copy(const amap)
@@ -379,7 +379,7 @@ namespace CGAL {
               <Dart_handle, typename GMap2::Dart_const_handle>* copy_to_origin=nullptr)
     {
       CGAL::cpp11::tuple<> converters;
-      copy(amap, converters, origin_to_copy, copy_to_origin);
+      copy(amap, origin_to_copy, copy_to_origin, converters);
     }    
 
     // Copy constructor from a map having exactly the same type.