From 200857c14eea85aff1ffb8c080b9e12db78bf59e Mon Sep 17 00:00:00 2001
From: Efi Fogel <efifogel@gmail.com>
Date: Thu, 19 Aug 2021 16:27:42 +0300
Subject: [PATCH 1/3] Fixed warning BOOST_PARAMETER_MAX_ARITY redefinition

---
 .../examples/Arrangement_on_surface_2/bgl_dual_adapter.cpp     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_dual_adapter.cpp b/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_dual_adapter.cpp
index dc8b6772e0b..8bdee4d02b0 100644
--- a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_dual_adapter.cpp
+++ b/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_dual_adapter.cpp
@@ -1,10 +1,11 @@
 //! \file examples/Arrangement_on_surface_2/bgl_dual_adapter.cpp
 // Adapting the dual of an arrangement to a BGL graph.
 
+#include <CGAL/basic.h>
+
 #include <boost/graph/breadth_first_search.hpp>
 #include <boost/graph/visitors.hpp>
 
-#include <CGAL/basic.h>
 #include <CGAL/Arr_extended_dcel.h>
 #include <CGAL/graph_traits_dual_arrangement_2.h>
 #include <CGAL/Arr_face_index_map.h>

From d3b18687282ae1457b5f514d1ea7d68c8bbd0e12 Mon Sep 17 00:00:00 2001
From: Efi Fogel <efifogel@gmail.com>
Date: Thu, 19 Aug 2021 16:56:43 +0300
Subject: [PATCH 2/3] Added default definition of special functions to pacify
 the compiler

---
 .../test_rational_function_traits_2.cpp                   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_rational_function_traits_2.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_rational_function_traits_2.cpp
index bb1733dda5a..cc93156c185 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_rational_function_traits_2.cpp
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_rational_function_traits_2.cpp
@@ -28,9 +28,15 @@ typedef Traits_2::Point_2                          Point_2;
 
 template <typename Cmp_object>
 struct Cmp {
-  Cmp<Cmp_object>& operator=(const  Cmp<Cmp_object>&);
   const Cmp_object& m_cmp_object;
+
+  Cmp(const Cmp&) = default;
+  Cmp(Cmp&&) = default;
+  Cmp<Cmp_object>& operator=(const Cmp&) = default;
+  Cmp<Cmp_object>& operator=(Cmp&&) = default;
+
   Cmp(const Cmp_object& cmp_object) : m_cmp_object(cmp_object) {}
+
   bool operator()(const Point_2& p1, const Point_2& p2) const
   { return (m_cmp_object(p1, p2) == CGAL::LARGER); }
 };

From 3125f166ac9b6cd0ea4c8f89fe0d41e892c75cc4 Mon Sep 17 00:00:00 2001
From: Efi Fogel <efifogel@gmail.com>
Date: Thu, 19 Aug 2021 16:59:27 +0300
Subject: [PATCH 3/3] Replaced inclusion of CGAL/basic.h with config.h

---
 .../examples/Arrangement_on_surface_2/bgl_dual_adapter.cpp      | 2 +-
 .../examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_dual_adapter.cpp b/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_dual_adapter.cpp
index 8bdee4d02b0..14b2dffee91 100644
--- a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_dual_adapter.cpp
+++ b/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_dual_adapter.cpp
@@ -1,7 +1,7 @@
 //! \file examples/Arrangement_on_surface_2/bgl_dual_adapter.cpp
 // Adapting the dual of an arrangement to a BGL graph.
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 
 #include <boost/graph/breadth_first_search.hpp>
 #include <boost/graph/visitors.hpp>
diff --git a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp b/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp
index 21d995e73b1..ea317557aae 100644
--- a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp
+++ b/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 
 #include <boost/graph/dijkstra_shortest_paths.hpp>