From a878f9ca35384117d1fb15a355b7972b0cfb645c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?=
 <mael.rouxel.labbe@geometryfactory.com>
Date: Thu, 21 Jun 2018 10:19:57 +0200
Subject: [PATCH] Use proper (cpp98) namespace for CGAL functional functions

---
 Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h              | 9 +++++----
 Mesh_3/include/CGAL/Mesh_3/Triangulation_sizing_field.h  | 4 +++-
 .../test_triply_periodic_minimal_surfaces.cpp            | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h b/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
index 5a55fa61f5b..ce2a11b6906 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
@@ -38,6 +38,7 @@
 #include <CGAL/Bbox_3.h>
 #include <CGAL/Double_map.h>
 #include <CGAL/enum.h>
+#include <CGAL/functional.h>
 #include <CGAL/internal/Has_member_visited.h>
 #include <CGAL/iterator.h>
 #include <CGAL/Real_timer.h>
@@ -86,11 +87,11 @@ namespace details { // various function objects
 // to use them. -- Laurent Rineau, 2007/07/27
 template <typename Map>
 struct Second_of
-  : public CGAL::unary_function<typename Map::value_type,
-                                const typename Map::mapped_type&>
+  : public CGAL::cpp98::unary_function<typename Map::value_type,
+                                       const typename Map::mapped_type&>
 {
-  typedef CGAL::unary_function<typename Map::value_type,
-                               const typename Map::mapped_type&> Base;
+  typedef CGAL::cpp98::unary_function<typename Map::value_type,
+                                      const typename Map::mapped_type&> Base;
   typedef typename Base::result_type                             result_type;
   typedef typename Base::argument_type                           argument_type;
 
diff --git a/Mesh_3/include/CGAL/Mesh_3/Triangulation_sizing_field.h b/Mesh_3/include/CGAL/Mesh_3/Triangulation_sizing_field.h
index c20c3ebf070..fc8d522dfff 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Triangulation_sizing_field.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Triangulation_sizing_field.h
@@ -36,6 +36,8 @@
 #include <CGAL/Triangulation_cell_base_3.h>
 #include <CGAL/Triangulation_vertex_base_with_info_3.h>
 
+#include <CGAL/functional.h>
+
 #include <CGAL/boost/iterator/transform_iterator.hpp>
 
 namespace CGAL {
@@ -121,7 +123,7 @@ private:
    * Used by boost transform iterator
    */
   struct Extract_point :
-    public CGAL::unary_function<typename Tr::Vertex, Weighted_point>
+    public CGAL::cpp98::unary_function<typename Tr::Vertex, Weighted_point>
   {
     Weighted_point operator()(const typename Tr::Vertex& v) const { return v.point(); }
   };
diff --git a/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp b/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp
index 90f46404a30..e7ff3beeacb 100644
--- a/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp
+++ b/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp
@@ -177,7 +177,7 @@ FT split_p (const Point& p)
 }
 
 struct Segments_function
-  : public CGAL::unary_function<Point, FT>
+  : public CGAL::cpp98::unary_function<Point, FT>
 {
   typedef std::vector<Segment> Segments;