Merge remote-tracking branch 'remotes/cgal/master' into Faster_dd_spatial_searching-cjamin

.travis.yml

@@ -9,40 +9,46 @@ env:
   - PACKAGE='Alpha_shapes_2 Alpha_shapes_3 Apollonius_graph_2 ' 
   - PACKAGE='Arithmetic_kernel Arrangement_on_surface_2 Barycentric_coordinates_2 ' 
   - PACKAGE='BGL Boolean_set_operations_2 Bounding_volumes ' 
-  - PACKAGE='Box_intersection_d CGAL_ImageIO CGAL_ipelets ' 
+  - PACKAGE='Box_intersection_d Cartesian_kernel CGAL_Core ' 
-  - PACKAGE='Circular_kernel_2 Circular_kernel_3 Circulator ' 
+  - PACKAGE='CGAL_ImageIO CGAL_ipelets Circular_kernel_2 ' 
+  - PACKAGE='Circular_kernel_3 Circulator Classification ' 
   - PACKAGE='Combinatorial_map Cone_spanners_2 Convex_decomposition_3 ' 
   - PACKAGE='Convex_hull_2 Convex_hull_3 Convex_hull_d ' 
   - PACKAGE='Distance_2 Distance_3 Envelope_2 ' 
   - PACKAGE='Envelope_3 Filtered_kernel Generalized_map ' 
   - PACKAGE='Generator Geomview GraphicsView ' 
-  - PACKAGE='HalfedgeDS Hash_map Inscribed_areas ' 
+  - PACKAGE='HalfedgeDS Hash_map Homogeneous_kernel ' 
-  - PACKAGE='Installation Interpolation Intersections_2 ' 
+  - PACKAGE='Inscribed_areas Installation Interpolation ' 
-  - PACKAGE='Intersections_3 Interval_skip_list Interval_support ' 
+  - PACKAGE='Intersections_2 Intersections_3 Interval_skip_list ' 
-  - PACKAGE='Inventor Jet_fitting_3 Kernel_23 ' 
+  - PACKAGE='Interval_support Inventor Jet_fitting_3 ' 
-  - PACKAGE='Kernel_d Kinetic_data_structures Kinetic_framework ' 
+  - PACKAGE='Kernel_23 Kernel_d Kinetic_data_structures ' 
-  - PACKAGE='Linear_cell_complex Matrix_search Mesh_2 ' 
+  - PACKAGE='Kinetic_framework LEDA Linear_cell_complex ' 
-  - PACKAGE='Mesh_3 Minkowski_sum_2 Minkowski_sum_3 ' 
+  - PACKAGE='MacOSX Maintenance Matrix_search ' 
-  - PACKAGE='Modifier Modular_arithmetic Nef_2 ' 
+  - PACKAGE='Mesh_2 Mesh_3 Mesher_level ' 
-  - PACKAGE='Nef_3 Nef_S2 NewKernel_d ' 
+  - PACKAGE='Minkowski_sum_2 Minkowski_sum_3 Modifier ' 
-  - PACKAGE='Number_types Optimal_transportation_reconstruction_2 Partition_2 ' 
+  - PACKAGE='Modular_arithmetic Nef_2 Nef_3 ' 
-  - PACKAGE='Periodic_2_triangulation_2 Periodic_3_triangulation_3 Point_set_2 ' 
+  - PACKAGE='Nef_S2 NewKernel_d Number_types ' 
-  - PACKAGE='Point_set_3 Point_set_processing_3 Point_set_shape_detection_3 ' 
+  - PACKAGE='OpenNL Operations_on_polyhedra Optimal_transportation_reconstruction_2 ' 
-  - PACKAGE='Poisson_surface_reconstruction_3 Polygon Polygon_mesh_processing ' 
+  - PACKAGE='Optimisation_basic Partition_2 Periodic_2_triangulation_2 ' 
-  - PACKAGE='Polyhedron Polyhedron_IO Polyline_simplification_2 ' 
+  - PACKAGE='Periodic_3_triangulation_3 Point_set_2 Point_set_3 ' 
-  - PACKAGE='Polynomial Polytope_distance_d Principal_component_analysis ' 
+  - PACKAGE='Point_set_processing_3 Point_set_shape_detection_3 Poisson_surface_reconstruction_3 ' 
-  - PACKAGE='Profiling_tools QP_solver Random_numbers ' 
+  - PACKAGE='Polygon Polygon_mesh_processing Polyhedron ' 
-  - PACKAGE='Ridges_3 Scale_space_reconstruction_3 Segment_Delaunay_graph_2 ' 
+  - PACKAGE='Polyhedron_IO Polyline_simplification_2 Polynomial ' 
+  - PACKAGE='Polytope_distance_d Principal_component_analysis Principal_component_analysis_LGPL ' 
+  - PACKAGE='Profiling_tools Property_map QP_solver ' 
+  - PACKAGE='Random_numbers Ridges_3 Scale_space_reconstruction_3 ' 
+  - PACKAGE='Scripts SearchStructures Segment_Delaunay_graph_2 ' 
   - PACKAGE='Segment_Delaunay_graph_Linf_2 Set_movable_separability_2 Skin_surface_3 ' 
   - PACKAGE='Snap_rounding_2 Solver_interface Spatial_searching ' 
   - PACKAGE='Spatial_sorting STL_Extension Straight_skeleton_2 ' 
   - PACKAGE='Stream_lines_2 Stream_support Subdivision_method_3 ' 
-  - PACKAGE='Surface_mesh Surface_mesh_deformation Surface_mesher ' 
+  - PACKAGE='Surface_mesh Surface_mesh_deformation Surface_mesh_parameterization ' 
-  - PACKAGE='Surface_mesh_parameterization Surface_mesh_segmentation Surface_mesh_shortest_path ' 
+  - PACKAGE='Surface_mesh_segmentation Surface_mesh_shortest_path Surface_mesh_simplification ' 
-  - PACKAGE='Surface_mesh_simplification Surface_mesh_skeletonization Sweep_line_2 ' 
+  - PACKAGE='Surface_mesh_skeletonization Surface_mesher Sweep_line_2 ' 
-  - PACKAGE='TDS_2 TDS_3 Three ' 
+  - PACKAGE='TDS_2 TDS_3 Testsuite ' 
-  - PACKAGE='Triangulation Triangulation_2 Triangulation_3 ' 
+  - PACKAGE='Three Triangulation Triangulation_2 ' 
-  - PACKAGE='Union_find Visibility_2 Voronoi_diagram_2 ' 
+  - PACKAGE='Triangulation_3 Union_find Visibility_2 ' 
+  - PACKAGE='Voronoi_diagram_2 wininst ' 
   - PACKAGE='Polyhedron_demo' 
 compiler: 
   - clang-3.6

.travis/build_package.sh

@@ -75,7 +75,7 @@ do
 	  cd ..
   	for f in *
 	  do
-	    if [ -d  "$f/examples/$f" ] || [ -d  "$f/test/$f" ] || [ -d  "$f/demo/$f" ]
+	    if [ -d  "$f/package_info/$f" ]
 	        then
 	                PACKAGES+="$f "
 	        fi
@@ -87,6 +87,7 @@ do
 	  then
 	        echo "The matrix and the actual package list differ : ."
 					echo ${DIFFERENCE[*]}
+            echo "You should run generate_travis.sh."
 	        exit 1
 	  fi
 	  echo "Matrix is up to date."

.travis/generate_travis.sh

@@ -19,7 +19,7 @@ INDEX=0
 i=0
 for f in *
 do
-  if [ -d  "$f/examples/$f" ] || [ -d  "$f/test/$f" ] || [ -d  "$f/demo/$f" ]
+  if [ -d  "$f/package_info/$f" ]
 	then
 		PACKAGES[$INDEX]+="$f "
 		i=$[i+1]

.travis/packages.txt

@@ -14,11 +14,14 @@ BGL
 Boolean_set_operations_2 
 Bounding_volumes 
 Box_intersection_d 
+Cartesian_kernel 
+CGAL_Core 
 CGAL_ImageIO 
 CGAL_ipelets 
 Circular_kernel_2 
 Circular_kernel_3 
 Circulator 
+Classification 
 Combinatorial_map 
 Cone_spanners_2 
 Convex_decomposition_3 
@@ -36,6 +39,7 @@ Geomview
 GraphicsView 
 HalfedgeDS 
 Hash_map 
+Homogeneous_kernel 
 Inscribed_areas 
 Installation 
 Interpolation 
@@ -49,10 +53,14 @@ Kernel_23
 Kernel_d 
 Kinetic_data_structures 
 Kinetic_framework 
+LEDA 
 Linear_cell_complex 
+MacOSX 
+Maintenance 
 Matrix_search 
 Mesh_2 
 Mesh_3 
+Mesher_level 
 Minkowski_sum_2 
 Minkowski_sum_3 
 Modifier 
@@ -62,7 +70,10 @@ Nef_3
 Nef_S2 
 NewKernel_d 
 Number_types 
+OpenNL 
+Operations_on_polyhedra 
 Optimal_transportation_reconstruction_2 
+Optimisation_basic 
 Partition_2 
 Periodic_2_triangulation_2 
 Periodic_3_triangulation_3 
@@ -79,11 +90,15 @@ Polyline_simplification_2
 Polynomial 
 Polytope_distance_d 
 Principal_component_analysis 
+Principal_component_analysis_LGPL 
 Profiling_tools 
+Property_map 
 QP_solver 
 Random_numbers 
 Ridges_3 
 Scale_space_reconstruction_3 
+Scripts 
+SearchStructures 
 Segment_Delaunay_graph_2 
 Segment_Delaunay_graph_Linf_2 
 Set_movable_separability_2 
@@ -99,15 +114,16 @@ Stream_support
 Subdivision_method_3 
 Surface_mesh 
 Surface_mesh_deformation 
-Surface_mesher 
 Surface_mesh_parameterization 
 Surface_mesh_segmentation 
 Surface_mesh_shortest_path 
 Surface_mesh_simplification 
 Surface_mesh_skeletonization 
+Surface_mesher 
 Sweep_line_2 
 TDS_2 
 TDS_3 
+Testsuite 
 Three 
 Triangulation 
 Triangulation_2 
@@ -115,3 +131,4 @@ Triangulation_3
 Union_find 
 Visibility_2 
 Voronoi_diagram_2 
+wininst 

AABB_tree/demo/AABB_tree/AABB_demo.cpp

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s)     : Pierre Alliez, Camille Wormser

AABB_tree/demo/AABB_tree/CMakeLists.txt

@@ -6,14 +6,12 @@ project( AABB_tree_Demo )
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 # Instruct CMake to run moc automatically when needed.
 set(CMAKE_AUTOMOC ON)
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 3.1)
-if(POLICY CMP0053)
+if(NOT POLICY CMP0070 AND POLICY CMP0053)
+  # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
   cmake_policy(SET CMP0053 OLD)
 endif()
 
-if(POLICY CMP0043)
-  cmake_policy(SET CMP0043 OLD)
-endif()
 if(POLICY CMP0071)
   cmake_policy(SET CMP0071 NEW)
 endif()

AABB_tree/include/CGAL/AABB_face_graph_triangle_primitive.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s)     : Sebastien Loriot

AABB_tree/include/CGAL/AABB_halfedge_graph_segment_primitive.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s)     : Sebastien Loriot

AABB_tree/include/CGAL/AABB_polyhedron_segment_primitive.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s)     : Pierre Alliez, Stephane Tayeb

AABB_tree/include/CGAL/AABB_polyhedron_triangle_primitive.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s)     : Stéphane Tayeb, Pierre Alliez

AABB_tree/include/CGAL/AABB_primitive.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s)     : Sebastien Loriot

AABB_tree/include/CGAL/AABB_segment_primitive.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s)     : Sebastien Loriot

AABB_tree/include/CGAL/AABB_traits.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s) : Stéphane Tayeb, Pierre Alliez, Camille Wormser

AABB_tree/include/CGAL/AABB_tree.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s) : Camille Wormser, Pierre Alliez, Stephane Tayeb

AABB_tree/include/CGAL/AABB_triangle_primitive.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s)     : Sebastien Loriot

AABB_tree/include/CGAL/AABB_triangulation_3_triangle_primitive.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s)     : Stéphane Tayeb, Pierre Alliez

AABB_tree/include/CGAL/internal/AABB_tree/AABB_drawing_traits.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s)     :  Camille Wormser, Pierre Alliez

AABB_tree/include/CGAL/internal/AABB_tree/AABB_node.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s) : Camille Wormser, Pierre Alliez, Stephane Tayeb

AABB_tree/include/CGAL/internal/AABB_tree/AABB_ray_intersection.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s) : Philipp Moeller

AABB_tree/include/CGAL/internal/AABB_tree/AABB_search_tree.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s) : Pierre Alliez, Camille Wormser

AABB_tree/include/CGAL/internal/AABB_tree/AABB_traversal_traits.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s) : Camille Wormser, Pierre Alliez, Stephane Tayeb

AABB_tree/include/CGAL/internal/AABB_tree/Has_nested_type_Shared_data.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s)     : Sebastien Loriot

AABB_tree/include/CGAL/internal/AABB_tree/Is_ray_intersection_geomtraits.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s) : Philipp Moeller

AABB_tree/include/CGAL/internal/AABB_tree/Primitive_helper.h

@@ -12,9 +12,9 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// $URL: svn+ssh://sloriot@scm.gforge.inria.fr/svn/cgal/branches/features/AABB_tree-one_primitive_per_object-sloriot/AABB_tree/include/CGAL/AABB_tree.h $
+// $URL$
-// $Id: AABB_tree.h 69132 2012-05-15 08:46:42Z sloriot $
+// $Id$
-//
+// SPDX-License-Identifier: GPL-3.0+
 //
 // Author(s) : Sebastien Loriot
 

AABB_tree/test/AABB_tree/AABB_test_util.h

@@ -12,9 +12,9 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// $URL: $
+// $URL$
-// $Id: $
+// $Id$
-//
+// SPDX-License-Identifier: GPL-3.0+
 //
 // Author(s)     : Pierre Alliez, Stephane Tayeb, Camille Wormser
 //

AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp

@@ -12,9 +12,9 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// $URL: $
+// $URL$
-// $Id: $
+// $Id$
-//
+// SPDX-License-Identifier: GPL-3.0+
 //
 // Author(s)     : Pierre Alliez
 //

AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp

@@ -12,9 +12,9 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// $URL: $
+// $URL$
-// $Id: $
+// $Id$
-//
+// SPDX-License-Identifier: GPL-3.0+
 //
 // Author(s)     : Pierre Alliez
 //

AABB_tree/test/AABB_tree/aabb_distance_triangle_hint_test.cpp

@@ -12,9 +12,9 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// $URL: $
+// $URL$
-// $Id: $
+// $Id$
-//
+// SPDX-License-Identifier: GPL-3.0+
 //
 // Author(s)     : Camille Wormser, Pierre Alliez
 //

AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp

@@ -12,9 +12,9 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// $URL: $
+// $URL$
-// $Id: $
+// $Id$
-//
+// SPDX-License-Identifier: GPL-3.0+
 //
 // Author(s)     : Pierre Alliez
 //

AABB_tree/test/AABB_tree/aabb_intersection_triangle_test.cpp

@@ -12,9 +12,9 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// $URL: $
+// $URL$
-// $Id: $
+// $Id$
-//
+// SPDX-License-Identifier: GPL-3.0+
 //
 // Author(s)     : Pierre Alliez
 //

AABB_tree/test/AABB_tree/aabb_naive_vs_tree_distance_segment_test.cpp

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s)     : Stephane Tayeb

AABB_tree/test/AABB_tree/aabb_naive_vs_tree_distance_triangle_test.cpp

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s)     : Stephane Tayeb

AABB_tree/test/AABB_tree/aabb_naive_vs_tree_triangle_test.cpp

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 //
 // Author(s)     : Stephane Tayeb

Advancing_front_surface_reconstruction/include/CGAL/Advancing_front_surface_reconstruction.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 // Author(s)     : Frank Da, David Cohen-Steiner, Andreas Fabri
 
@@ -2311,7 +2312,7 @@ namespace CGAL {
     }
 
 
-    struct Remove : public std::unary_function<Vertex_handle, bool>
+    struct Remove : public CGAL::unary_function<Vertex_handle, bool>
     {
 
       Extract& E;
@@ -2449,7 +2450,7 @@ namespace CGAL {
   namespace AFSR {
 
     template <typename T>
-    struct Auto_count : public std::unary_function<const T&,std::pair<T,std::size_t> >{
+    struct Auto_count : public CGAL::unary_function<const T&,std::pair<T,std::size_t> >{
       mutable std::size_t i;
 
       Auto_count()
@@ -2462,7 +2463,7 @@ namespace CGAL {
     };
 
     template <typename T, typename CC>
-    struct Auto_count_cc : public std::unary_function<const T&,std::pair<T,std::size_t> >{
+    struct Auto_count_cc : public CGAL::unary_function<const T&,std::pair<T,std::size_t> >{
       mutable std::size_t i;
       CC cc;
 

Advancing_front_surface_reconstruction/include/CGAL/Advancing_front_surface_reconstruction_cell_base_3.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 // Author(s)     : Frank Da, David Cohen-Steiner, Andreas Fabri
 

Advancing_front_surface_reconstruction/include/CGAL/Advancing_front_surface_reconstruction_vertex_base_3.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 // Author(s)     : Frank Da, David Cohen-Steiner, Andreas Fabri
 

Advancing_front_surface_reconstruction/include/CGAL/internal/AFSR/Surface_face_base_2.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 // Author(s)     : Frank Da, David Cohen-Steiner, Andreas Fabri
 

Advancing_front_surface_reconstruction/include/CGAL/internal/AFSR/Surface_vertex_base_2.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 // Author(s)     : Frank Da, David Cohen-Steiner, Andreas Fabri
 

Advancing_front_surface_reconstruction/include/CGAL/internal/AFSR/construct_polyhedron.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 // Author(s)     : Frank Da, David Cohen-Steiner, Andreas Fabri
 

Advancing_front_surface_reconstruction/include/CGAL/internal/AFSR/construct_surface_2.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 // Author(s)     : Frank Da, David Cohen-Steiner, Andreas Fabri
 

Advancing_front_surface_reconstruction/include/CGAL/internal/AFSR/orient.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 // Author(s)     : Frank Da, David Cohen-Steiner, Andreas Fabri
 

Advancing_front_surface_reconstruction/include/CGAL/internal/AFSR/write_triple_indices.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: GPL-3.0+
 //
 // Author(s)     : Frank Da, David Cohen-Steiner, Andreas Fabri
 

Algebraic_foundations/include/CGAL/Algebraic_extension_traits.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 //
 //
 // Author(s)     : Michael Hemmer    <hemmer@mpi-inf.mpg.de>
@@ -29,7 +30,6 @@
 #define CGAL_ALGEBRAIC_NUMBER_TRAITS_H 1
 
 #include <numeric> // for std::accumulate
-#include <functional> // for std::unary_function
 #include <CGAL/tags.h>
 #include <CGAL/Algebraic_structure_traits.h>
 
@@ -47,7 +47,7 @@ public:
     //! computes the factor which normalizes a number to be integral after 
     //  multiplication
     class Normalization_factor 
-        : public std::unary_function<Type,Type> {
+        : public CGAL::unary_function<Type,Type> {
     private:
         static Type 
         normalization_factor(const Type&,Integral_domain_without_division_tag){
@@ -68,7 +68,7 @@ public:
     };
     
     class Denominator_for_algebraic_integers 
-        : public std::unary_function<Type,Type> {
+        : public CGAL::unary_function<Type,Type> {
     public: 
         //! determine normalization factor
         Type operator () (const Type&) {

Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 //
 //
 // Author(s)     : Michael Hemmer    <hemmer@mpi-inf.mpg.de>
@@ -111,7 +112,7 @@ class Algebraic_structure_traits_base< Type_, Null_tag > {
 
     // does nothing by default
     class Simplify 
-      : public std::unary_function< Type&, void > {
+      : public CGAL::unary_function< Type&, void > {
       public:
         void operator()( Type& ) const {}
     };
@@ -150,7 +151,7 @@ class Algebraic_structure_traits_base< Type_,
 
     // returns Type(1) by default
     class Unit_part 
-      : public std::unary_function< Type, Type > { 
+      : public CGAL::unary_function< Type, Type > { 
       public:
         Type operator()( const Type& x ) const {
           return( x < Type(0)) ? 
@@ -159,7 +160,7 @@ class Algebraic_structure_traits_base< Type_,
     };
     
     class Square 
-      : public std::unary_function< Type, Type > {
+      : public CGAL::unary_function< Type, Type > {
       public:        
         Type operator()( const Type& x ) const {
           return x*x;
@@ -167,7 +168,7 @@ class Algebraic_structure_traits_base< Type_,
     };
     
     class Is_zero 
-      : public std::unary_function< Type, bool > {
+      : public CGAL::unary_function< Type, bool > {
       public:        
         bool operator()( const Type& x ) const {
           return x == Type(0);
@@ -175,7 +176,7 @@ class Algebraic_structure_traits_base< Type_,
     };
 
     class Is_one 
-      : public std::unary_function< Type, bool > {
+      : public CGAL::unary_function< Type, bool > {
       public:        
         bool operator()( const Type& x ) const {
           return x == Type(1);
@@ -220,7 +221,7 @@ class Algebraic_structure_traits_base< Type_,
   // Default implementation of Divides functor for unique factorization domains
   // x divides y if gcd(y,x) equals x up to inverses 
   class Divides 
-    : public std::binary_function<Type,Type,bool>{ 
+    : public CGAL::binary_function<Type,Type,bool>{
   public:
     bool operator()( const Type& x,  const Type& y) const {  
       typedef CGAL::Algebraic_structure_traits<Type> AST;
@@ -256,7 +257,7 @@ class Algebraic_structure_traits_base< Type_,
 
     // maps to \c Div by default.
     class Integral_division 
-      : public std::binary_function< Type, Type,
+      : public CGAL::binary_function< Type, Type,
                                 Type > { 
       public:
         Type operator()( 
@@ -278,7 +279,7 @@ class Algebraic_structure_traits_base< Type_,
 
     // Algorithm from NiX/euclids_algorithm.h
     class Gcd 
-      : public std::binary_function< Type, Type,
+      : public CGAL::binary_function< Type, Type,
                                 Type > { 
       public:
         Type operator()( 
@@ -371,7 +372,7 @@ class Algebraic_structure_traits_base< Type_,
     
     // based on \c Div_mod.
     class Div 
-      : public std::binary_function< Type, Type,
+      : public CGAL::binary_function< Type, Type,
                                 Type > {
       public:
         Type operator()( const Type& x, 
@@ -389,7 +390,7 @@ class Algebraic_structure_traits_base< Type_,
 
     // based on \c Div_mod.
     class Mod 
-      : public std::binary_function< Type, Type,
+      : public CGAL::binary_function< Type, Type,
                                 Type > { 
       public:
         Type operator()( const Type& x, 
@@ -407,7 +408,7 @@ class Algebraic_structure_traits_base< Type_,
 
   // Divides for Euclidean Ring 
   class Divides 
-    : public std::binary_function<Type, Type, bool>{
+    : public CGAL::binary_function<Type, Type, bool>{
   public:
     bool operator()( const Type& x, const Type& y) const {
       typedef Algebraic_structure_traits<Type> AST;
@@ -447,7 +448,7 @@ class Algebraic_structure_traits_base< Type_, Field_tag >
 
     // returns the argument \a a by default
     class Unit_part 
-      : public std::unary_function< Type, Type > { 
+      : public CGAL::unary_function< Type, Type > { 
       public:
         Type operator()( const Type& x ) const {
             return( x == Type(0)) ? Type(1) : x;
@@ -455,7 +456,7 @@ class Algebraic_structure_traits_base< Type_, Field_tag >
     };
     // maps to \c operator/ by default.
     class Integral_division 
-      : public std::binary_function< Type, Type,
+      : public CGAL::binary_function< Type, Type,
                                 Type > { 
       public:
         Type operator()( const Type& x, 
@@ -474,7 +475,7 @@ class Algebraic_structure_traits_base< Type_, Field_tag >
   
   // maps to \c 1/x by default.
   class Inverse 
-    : public std::unary_function< Type, Type > { 
+    : public CGAL::unary_function< Type, Type > { 
   public:
     Type operator()( const Type& x ) const { 
       return Type(1)/x;
@@ -486,7 +487,7 @@ class Algebraic_structure_traits_base< Type_, Field_tag >
   // returns always true
   // \pre: x != 0
   class Divides
-    : public std::binary_function< Type, Type, bool > { 
+    : public CGAL::binary_function< Type, Type, bool > {
   public:
     bool operator()( const Type& CGAL_precondition_code(x), const Type& /* y */) const {
       CGAL_precondition_code( typedef Algebraic_structure_traits<Type> AST);
@@ -522,7 +523,7 @@ class Algebraic_structure_traits_base< Type_,
     typedef Field_with_sqrt_tag   Algebraic_category;
 
     struct Is_square
-        :public std::binary_function<Type,Type&,bool>
+        :public CGAL::binary_function<Type,Type&,bool>
     {
         bool operator()(const Type& ) const {return true;}
         bool operator()(
@@ -579,7 +580,7 @@ class Algebraic_structure_traits_base< Type_,
 namespace INTERN_AST {
   template< class Type >
   class Div_per_operator 
-    : public std::binary_function< Type, Type, 
+    : public CGAL::binary_function< Type, Type,
                               Type > {
     public:      
       Type operator()( const Type& x, 
@@ -592,7 +593,7 @@ namespace INTERN_AST {
   
   template< class Type >
   class Mod_per_operator 
-    : public std::binary_function< Type, Type,
+    : public CGAL::binary_function< Type, Type,
                               Type > {
     public:
       Type operator()( const Type& x, 
@@ -605,7 +606,7 @@ namespace INTERN_AST {
   
   template< class Type >
   class Is_square_per_sqrt
-    : public std::binary_function< Type, Type&,
+    : public CGAL::binary_function< Type, Type&,
                               bool > {
     public:      
       bool operator()( const Type& x, 

Algebraic_foundations/include/CGAL/Chinese_remainder_traits.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 //
 //
 // Author(s)     : Michael Hemmer    <hemmer@mpi-inf.mpg.de>

Algebraic_foundations/include/CGAL/Coercion_traits.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 //
 //
 // Author(s)     : Michael Hemmer    <hemmer@mpi-inf.mpg.de>

Algebraic_foundations/include/CGAL/Fraction_traits.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 //
 //
 // Author(s)     : Michael Hemmer    <hemmer@mpi-inf.mpg.de>

Algebraic_foundations/include/CGAL/Needs_parens_as_product.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 //
 //
 // Author(s)     : Michael Hemmer    <hemmer@mpi-inf.mpg.de>

Algebraic_foundations/include/CGAL/Rational_traits.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 //
 //
 // Author(s)     : Michael Hemmer    <hemmer@mpi-inf.mpg.de>

Algebraic_foundations/include/CGAL/Real_embeddable_traits.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 //
 //
 // Author(s)     : Michael Hemmer    <hemmer@mpi-inf.mpg.de>
@@ -36,7 +37,7 @@ struct  Is_zero_selector{ typedef AST_is_zero Type; };
 template< class T >
 struct Is_zero_selector< T, Null_functor >
 {
-  struct Type : public std::unary_function< T, bool >{
+  struct Type : public CGAL::unary_function< T, bool >{
     bool operator()( const T& x ) const {
       return x == T(0);
     }
@@ -80,7 +81,7 @@ public:
   Is_zero;
   
   //! The generic \c Is_finite functor returns true
-  class Is_finite : public std::unary_function< Type, Boolean > {
+  class Is_finite : public CGAL::unary_function< Type, Boolean > {
   public:
     Boolean operator()( const Type& ) const {
       return true;
@@ -90,7 +91,7 @@ public:
   //! The generic \c Abs functor implementation
   //! uses one comparisons and the unary minus if necessary.
   class Abs
-    : public std::unary_function< Type, Type > {
+    : public CGAL::unary_function< Type, Type > {
   public:
     //! the function call.
     Type  operator()( const Type& x ) const {
@@ -100,7 +101,7 @@ public:
     
   //! The generic \c Sgn functor implementation uses two comparisons.
   class Sgn 
-    : public std::unary_function< Type, ::CGAL::Sign > {
+    : public CGAL::unary_function< Type, ::CGAL::Sign > {
   public:
     //! the function call.
     ::CGAL::Sign operator()( const Type& x ) const {
@@ -114,7 +115,7 @@ public:
     
   //! The generic \c Is_positive functor implementation uses one comparison.
   class Is_positive 
-    : public std::unary_function< Type, Boolean > {
+    : public CGAL::unary_function< Type, Boolean > {
   public:        
     //! the function call.
     Boolean operator()( const Type& x ) const {
@@ -124,7 +125,7 @@ public:
     
   //! The generic \c Is_negative functor implementation uses one comparison.
   class Is_negative 
-    : public std::unary_function< Type, Boolean > {
+    : public CGAL::unary_function< Type, Boolean > {
   public:        
     //! the function call.
     Boolean operator()( const Type& x ) const {
@@ -134,7 +135,7 @@ public:
         
   //! The generic \c Compare functor implementation uses two comparisons.
   class Compare 
-    : public std::binary_function< Type, Type, 
+    : public CGAL::binary_function< Type, Type,
                                 Comparison_result > {
   public:
     //! the function call.
@@ -151,7 +152,7 @@ public:
         Comparison_result )
       };
   
-  class To_double : public std::unary_function< Type, double > {     
+  class To_double : public CGAL::unary_function< Type, double > {     
   public:
     double operator()( const Type& x ) const {
       return static_cast<double>(x);
@@ -159,7 +160,7 @@ public:
   };
   
   class To_interval 
-    : public std::unary_function< Type, std::pair<double,double> > {     
+    : public CGAL::unary_function< Type, std::pair<double,double> > {     
   public:
     std::pair<double,double> operator()( const Type& x ) const {
       double dx(static_cast<double>(x));

Algebraic_foundations/include/CGAL/Scalar_factor_traits.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 //
 //
 // Author(s)     : Michael Hemmer    <hemmer@mpi-inf.mpg.de>

Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 //
 //
 // Author(s)     : Lutz Kettner  <kettner@mpi-inf.mpg.de>

Algebraic_foundations/include/CGAL/Test/_test_coercion_traits.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 //
 //
 // Author(s)     : Michael Hemmer    <hemmer@mpi-inf.mpg.de>

Algebraic_foundations/include/CGAL/Test/_test_fraction_traits.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 //
 //
 // Author(s)     : Michael Hemmer    <hemmer@mpi-inf.mpg.de>

Algebraic_foundations/include/CGAL/Test/_test_rational_traits.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 //
 //
 // Author(s)     : Michael Hemmer    <hemmer@mpi-inf.mpg.de>

Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 //
 // Author(s)     : Lutz Kettner  <kettner@mpi-inf.mpg.de>
 //                 Michael Hemmer <hemmer@mpi-inf.mpg.de>

Algebraic_foundations/include/CGAL/extended_euclidean_algorithm.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 //
 // Author(s)     : Michael Hemmer, Dominik Huelse
 //

Algebraic_foundations/include/CGAL/ipower.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Hemmer 

Algebraic_foundations/include/CGAL/number_utils.h

@@ -18,6 +18,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Stefan Schirra

Algebraic_foundations/include/CGAL/number_utils_classes.h

@@ -18,6 +18,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Hoffmann <hoffmann@inf.ethz.ch>
@@ -101,7 +102,7 @@ struct Is_zero :
 namespace internal {
 template <class NT, class Compare> struct Compare_base: public Compare {};
 template <class NT> struct Compare_base<NT,Null_functor>
-  :public std::binary_function< NT, NT, Comparison_result > {
+  :public CGAL::binary_function< NT, NT, Comparison_result > {
   Comparison_result operator()( const NT& x, const NT& y) const
   {
     if (x < y) return SMALLER;

Algebraic_foundations/test/Algebraic_foundations/Chinese_remainder_traits.cpp

@@ -21,6 +21,7 @@
 // CGAL_release   : $Name:  $
 // Revision      : $Revision$
 // Revision_date : $Date$
+// SPDX-License-Identifier: GPL-3.0+
 //
 // Author(s)     : Dominik H<>lse <dominik.huelse@gmx.de>
 //                 Michael Hemmer <hemmer@mpi-inf.mpg.de>

Algebraic_foundations/test/Algebraic_foundations/extended_euclidean_algorithm.cpp

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 //
 // Author(s)     : Michael Hemmer, Dominik Hülse
 //

Algebraic_foundations/test/Algebraic_foundations/ipower.cpp

@@ -12,8 +12,10 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// $URL: svn+ssh://hemmer@scm.gforge.inria.fr/svn/cgal/trunk/Algebraic_foundations/test/Algebraic_foundations/extended_euclidean_algorithm.cpp $
+// $URL$
-// $Id: extended_euclidean_algorithm.cpp 47265 2008-12-08 06:26:27Z hemmer $
+// $Id$
+//
+// SPDX-License-Identifier: LGPL-3.0+
 //
 // Author(s)     : Michael Hemmer
 //

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Eric Berberich <eric@mpi-inf.mpg.de>
@@ -193,7 +194,7 @@ protected:
    
     //! polynomial canonicalizer, needed for the cache
     template <class Poly> 
-    struct Poly_canonicalizer : public std::unary_function< Poly, Poly >
+    struct Poly_canonicalizer : public CGAL::unary_function< Poly, Poly >
     {
     // use Polynomial_traits_d<>::Canonicalize ?
         Poly operator()(Poly p) 
@@ -349,7 +350,7 @@ public:
     // Composition of two unary functors
     template<typename InnerFunctor,typename OuterFunctor>
       class Unary_compose 
-      : public std::unary_function<typename InnerFunctor::argument_type,
+      : public CGAL::unary_function<typename InnerFunctor::argument_type,
                                    typename OuterFunctor::result_type> {
 				     
     public:
@@ -412,7 +413,7 @@ public:
      * when appropriate
      */
     class Construct_curve_2 :
-        public std::unary_function< Polynomial_2, Curve_analysis_2 > {
+        public CGAL::unary_function< Polynomial_2, Curve_analysis_2 > {
 
     public:
 
@@ -436,7 +437,7 @@ public:
      * caching is used when appropriate
      */
     class Construct_curve_pair_2 :
-            public std::binary_function<Curve_analysis_2, Curve_analysis_2,
+            public CGAL::binary_function<Curve_analysis_2, Curve_analysis_2,
                 Curve_pair_analysis_2> {
 
     public:
@@ -629,7 +630,7 @@ public:
 
     
     class Compute_polynomial_x_2 :
-      public std::unary_function<Algebraic_real_2, Polynomial_1> {
+      public CGAL::unary_function<Algebraic_real_2, Polynomial_1> {
 
     public:
 
@@ -649,7 +650,7 @@ public:
 			       compute_polynomial_x_2_object);
 
     class Compute_polynomial_y_2 :
-      public std::unary_function<Algebraic_real_2, Polynomial_1> {
+      public CGAL::unary_function<Algebraic_real_2, Polynomial_1> {
 
     public:
 
@@ -669,7 +670,7 @@ public:
 			       compute_polynomial_y_2_object);
 
 
-    class Isolate_x_2 : public std::binary_function<Algebraic_real_2,
+    class Isolate_x_2 : public CGAL::binary_function<Algebraic_real_2,
                                                     Polynomial_1,
                                                     std::pair<Bound,Bound> > {
       
@@ -692,7 +693,7 @@ public:
     CGAL_Algebraic_Kernel_cons(Isolate_x_2, 
 			       isolate_x_2_object);
 
-    class Isolate_y_2 : public std::binary_function<Algebraic_real_2,
+    class Isolate_y_2 : public CGAL::binary_function<Algebraic_real_2,
                                                     Polynomial_1,
                                                     std::pair<Bound,Bound> > {
       
@@ -880,7 +881,7 @@ public:
             
     //! returns the x-coordinate of an \c Algebraic_real_2 object
     class Compute_x_2 :
-        public std::unary_function<Algebraic_real_2, Algebraic_real_1> {
+        public CGAL::unary_function<Algebraic_real_2, Algebraic_real_1> {
 
     public:
 
@@ -915,7 +916,7 @@ public:
      * return approximation of the y-coordinate. 
      */
     class Compute_y_2 :
-        public std::unary_function<Algebraic_real_2, Algebraic_real_1> {
+        public CGAL::unary_function<Algebraic_real_2, Algebraic_real_1> {
         
     public:
         
@@ -938,7 +939,7 @@ public:
 #endif
 
     class Approximate_absolute_x_2 
-    : public std::binary_function<Algebraic_real_2,int,std::pair<Bound,Bound> >{
+    : public CGAL::binary_function<Algebraic_real_2,int,std::pair<Bound,Bound> >{
     
     public:
 
@@ -961,7 +962,7 @@ public:
                                approximate_absolute_x_2_object);
 
     class Approximate_relative_x_2 
-    : public std::binary_function<Algebraic_real_2,int,std::pair<Bound,Bound> >{
+    : public CGAL::binary_function<Algebraic_real_2,int,std::pair<Bound,Bound> >{
     
     public:
         
@@ -983,7 +984,7 @@ public:
                                approximate_relative_x_2_object);
 
     class Approximate_absolute_y_2 
-    : public std::binary_function<Algebraic_real_2,int,std::pair<Bound,Bound> >{
+    : public CGAL::binary_function<Algebraic_real_2,int,std::pair<Bound,Bound> >{
 
     public:
 
@@ -1013,7 +1014,7 @@ public:
                                approximate_absolute_y_2_object);
 
     class Approximate_relative_y_2 
-    : public std::binary_function<Algebraic_real_2,int,std::pair<Bound,Bound> >{
+    : public CGAL::binary_function<Algebraic_real_2,int,std::pair<Bound,Bound> >{
         
     public:
         
@@ -1164,7 +1165,7 @@ public:
     
     //! \brief comparison of x-coordinates 
     class Compare_x_2 :
-         public std::binary_function<Algebraic_real_2, Algebraic_real_2, 
+         public CGAL::binary_function<Algebraic_real_2, Algebraic_real_2,
                                       Comparison_result > {
 
     public:
@@ -1257,7 +1258,7 @@ public:
      * If possible, it is recommended to avoid this functor for efficiency.}
      */
     class Compare_y_2 :
-        public std::binary_function< Algebraic_real_2, Algebraic_real_2, 
+        public CGAL::binary_function< Algebraic_real_2, Algebraic_real_2,
                 Comparison_result > {
     
     public:
@@ -1369,7 +1370,7 @@ public:
      * to have equal x-coordinates, thus only the y-coordinates are compared.
      */
     class Compare_xy_2 :
-          public std::binary_function<Algebraic_real_2, Algebraic_real_2, 
+          public CGAL::binary_function<Algebraic_real_2, Algebraic_real_2,
                 Comparison_result > {
 
     public:
@@ -1500,7 +1501,7 @@ public:
      * the polynomial \c p is square free.
      */
     class Has_finite_number_of_self_intersections_2 :
-            public std::unary_function< Polynomial_2, bool > {
+            public CGAL::unary_function< Polynomial_2, bool > {
         
     public:
 
@@ -1529,7 +1530,7 @@ public:
      * the two polynomials \c f and \c g are coprime.
      */ 
     class Has_finite_number_of_intersections_2 :
-        public std::binary_function< Polynomial_2, Polynomial_2, bool > {
+        public CGAL::binary_function< Polynomial_2, Polynomial_2, bool > {
          
     public:
 
@@ -1713,7 +1714,7 @@ public:
     //! Non-Algebraic name
     typedef Algebraic_real_2 Coordinate_2;
 
-    class Is_square_free_2 : public std::unary_function<Polynomial_2,bool> {
+    class Is_square_free_2 : public CGAL::unary_function<Polynomial_2,bool> {
 
     public:
 
@@ -1735,7 +1736,7 @@ public:
     typedef Has_finite_number_of_intersections_2 Is_coprime_2;
     CGAL_Algebraic_Kernel_cons(Is_coprime_2, is_coprime_2_object);
 
-    class Make_square_free_2 : public std::unary_function<Polynomial_2,
+    class Make_square_free_2 : public CGAL::unary_function<Polynomial_2,
                                                           Polynomial_2> {
 
     public:
@@ -1800,7 +1801,7 @@ public:
      * In pariticular, each singular point is x-critical.
      */
     class X_critical_points_2 : 
-        public std::binary_function< Curve_analysis_2, 
+        public CGAL::binary_function< Curve_analysis_2,
             std::iterator<std::output_iterator_tag, Algebraic_real_2>,
             std::iterator<std::output_iterator_tag, Algebraic_real_2> > {
        
@@ -1879,7 +1880,7 @@ public:
      * In pariticular, each singular point is y-critical.
      */
     class Y_critical_points_2 :
-        public std::binary_function< Curve_analysis_2, 
+        public CGAL::binary_function< Curve_analysis_2,
             std::iterator<std::output_iterator_tag, Algebraic_real_2>,
             std::iterator<std::output_iterator_tag, Algebraic_real_2> > {
         
@@ -1974,7 +1975,7 @@ public:
     // Overload the Sign_at_1 functor, to enable filter steps in the
     // Curve analysis in a coherent way
     class Sign_at_1 
-      : public::std::binary_function<Polynomial_1,Algebraic_real_1,Sign> {
+      : public::CGAL::binary_function<Polynomial_1,Algebraic_real_1,Sign> {
 
       
     public:
@@ -2051,7 +2052,7 @@ public:
      * curve. Returns a value convertible to \c CGAL::Sign
      */
     class Sign_at_2 :
-        public std::binary_function<Polynomial_2, Algebraic_real_2, Sign > {
+        public CGAL::binary_function<Polynomial_2, Algebraic_real_2, Sign > {
 
     public:
         
@@ -2147,7 +2148,7 @@ public:
     CGAL_Algebraic_Kernel_pred(Sign_at_2, sign_at_2_object);
 
     class Is_zero_at_2 
-      : public std::binary_function<Polynomial_2,Algebraic_real_2,bool> {
+      : public CGAL::binary_function<Polynomial_2,Algebraic_real_2,bool> {
     
     public:
       
@@ -2491,7 +2492,7 @@ public:
     CGAL_Algebraic_Kernel_cons(Solve_2, solve_2_object);
 
     class Number_of_solutions_2 
-      : public std::binary_function<Polynomial_2,Polynomial_2,size_type> {
+      : public CGAL::binary_function<Polynomial_2,Polynomial_2,size_type> {
     
     public:
       
@@ -2517,7 +2518,7 @@ public:
     // Functor used to evaluate a Polynomial_2 in a Bound, up to a
     // constant factor
     class Evaluate_utcf_2 
-      : public std::binary_function<Polynomial_2,Bound,Polynomial_1> {
+      : public CGAL::binary_function<Polynomial_2,Bound,Polynomial_1> {
     
     public:
       
@@ -2593,7 +2594,7 @@ public:
 
     //! Refines the x-coordinate of an Algebraic_real_2 object
     class Refine_x_2 :
-        public std::unary_function<Algebraic_real_2, void> {
+        public CGAL::unary_function<Algebraic_real_2, void> {
 
     public:
         
@@ -2617,7 +2618,7 @@ public:
     CGAL_Algebraic_Kernel_pred(Refine_x_2, refine_x_2_object);
     
     class Refine_y_2 :
-        public std::unary_function<Algebraic_real_2, void> {
+        public CGAL::unary_function<Algebraic_real_2, void> {
 
     public:
 

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_d_1.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     :  Michael Hemmer <hemmer@mpi-inf.mpg.de> 
@@ -384,7 +385,7 @@ public:
   typedef internal::Algebraic_real_d_1< Coefficient, Rational, HandlePolicy, RepClass > Type;
 
   class Compare
-    : public std::binary_function< Type, Type, CGAL::Comparison_result > {
+    : public CGAL::binary_function< Type, Type, CGAL::Comparison_result > {
   public:
     CGAL::Comparison_result operator()( const Type& a, const Type& b ) const
     { return a.compare( b ); }
@@ -413,7 +414,7 @@ public:
   };
 
   class Sgn
-    : public std::unary_function< Type, CGAL::Sign > {
+    : public CGAL::unary_function< Type, CGAL::Sign > {
   public:
     CGAL::Sign operator()( const Type& a ) const {
       return a.compare( Rational(0) );
@@ -421,7 +422,7 @@ public:
   };
 
   class To_double
-    : public std::unary_function< Type, double > {
+    : public CGAL::unary_function< Type, double > {
   public:
     double operator()(const Type& a) const {
       return a.to_double();
@@ -429,7 +430,7 @@ public:
   };
 
   class To_interval
-    : public std::unary_function< Type, std::pair<double, double> > {
+    : public CGAL::unary_function< Type, std::pair<double, double> > {
   public:
     typename std::pair<double, double> operator()(const Type& a) const {
       return a.to_interval();

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_quadratic_refinement_rep_bfi.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     :  Michael Hemmer <hemmer@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     :  Michael Hemmer <hemmer@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep_bfi.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     :  Michael Hemmer <hemmer@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_coefficient_kernel.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Kerber <mkerber@mpi-inf.mpg.de>
@@ -49,7 +50,7 @@ template <typename Coefficient_> struct Bitstream_coefficient_kernel {
         return Is_zero();
     }
 
-    struct Convert_to_bfi : public std::unary_function
+    struct Convert_to_bfi : public CGAL::unary_function
         <Coefficient,Bigfloat_interval> {
         
         Bigfloat_interval operator() (Coefficient c) const {

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_coefficient_kernel_at_alpha.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Kerber  <mkerber@mpi-inf.mpg.de>
@@ -117,7 +118,7 @@ public:
     //! \name Functors
     //! @{
 
-    struct Is_zero : public std::unary_function<Coefficient,bool> {
+    struct Is_zero : public CGAL::unary_function<Coefficient,bool> {
         
         Is_zero(Algebraic_kernel_d_1* kernel,Algebraic_real_1 alpha) 
             : _m_kernel(kernel),_m_alpha(alpha) {}
@@ -137,7 +138,7 @@ public:
     }
 
     struct Convert_to_bfi 
-        : public std::unary_function<Coefficient,Bigfloat_interval> {
+        : public CGAL::unary_function<Coefficient,Bigfloat_interval> {
         
         Convert_to_bfi(Algebraic_kernel_d_1* kernel,
 		       Algebraic_real_1 alpha) 

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Kerber <mkerber@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_E08_tree.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Arno Eigenwillig <arno@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Arno Eigenwillig <arno@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree_traits.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Kerber <mkerber@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Curve_analysis_2.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Kerber <mkerber@mpi-inf.mpg.de>
@@ -111,7 +112,7 @@ template<typename Comparable>
 };
 
 template<typename Comparable> struct Compare_for_vert_line_map
-  : public std::binary_function<Comparable,Comparable,bool> {
+  : public CGAL::binary_function<Comparable,Comparable,bool> {
     
   BOOST_MPL_HAS_XXX_TRAIT_DEF(T)
   BOOST_MPL_HAS_XXX_TRAIT_DEF(Handle_policy)

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Curve_pair_analysis_2.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Eric Berberich <eric@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Descartes.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     :  Michael Hemmer <hemmer@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Event_line_builder.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Kerber <mkerber@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Float_traits.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Hemmer <hemmer@mpi-inf.mpg.de>
@@ -65,7 +66,7 @@ template<>
 class Float_traits< leda_bigfloat > {
 public:
   struct Get_mantissa
-    : public std::unary_function< leda_bigfloat, leda_integer > {
+    : public CGAL::unary_function< leda_bigfloat, leda_integer > {
     leda_integer operator()( const leda_bigfloat& x ) const {
       //std::cout << x.get_significant() << std::endl;
       return x.get_significant();                
@@ -73,14 +74,14 @@ public:
   };
         
   struct Get_exponent
-    : public std::unary_function< leda_bigfloat, long > {
+    : public CGAL::unary_function< leda_bigfloat, long > {
     long operator()( const leda_bigfloat& x ) const {
       return x.get_exponent().to_long();                
     }
   };
 
   struct Mul_by_pow_of_2
-    : public std::binary_function< leda_bigfloat, long, leda_bigfloat> {
+    : public CGAL::binary_function< leda_bigfloat, long, leda_bigfloat> {
     leda_bigfloat operator()( const leda_bigfloat& a, long e ) const {
       return leda_bigfloat(a.get_significant(), a.get_exponent()+e);
     }
@@ -97,21 +98,21 @@ class Float_traits< CORE::BigFloat > {
 public:
       
   struct Get_mantissa
-    : public std::unary_function< CORE::BigFloat, CORE::BigInt > {
+    : public CGAL::unary_function< CORE::BigFloat, CORE::BigInt > {
     CORE::BigInt operator()( const CORE::BigFloat& x ) const { 
       return x.m();
     }
   };
         
   struct Get_exponent
-    : public std::unary_function< CORE::BigFloat, long > {
+    : public CGAL::unary_function< CORE::BigFloat, long > {
     long operator()( const CORE::BigFloat& x ) const {
       return CORE::CHUNK_BIT*x.exp(); // The basis is 2^CORE::CHUNK_BIT
     }
   };
 
   struct Mul_by_pow_of_2
-    : public std::binary_function
+    : public CGAL::binary_function
     < CORE::BigFloat, long , CORE::BigFloat> {
     CORE::BigFloat operator()( const CORE::BigFloat& a, long e ) const {
       return a*CORE::BigFloat::exp2(e);
@@ -126,7 +127,7 @@ public:
 template<> class Float_traits< Gmpfr > {
   
   struct Get_mantissa_exponent
-    : public std::unary_function< Gmpfr, std::pair<Gmpz,long> > {
+    : public CGAL::unary_function< Gmpfr, std::pair<Gmpz,long> > {
     
     std::pair<Gmpz,long> operator()( const Gmpfr& x ) const {
       return x.to_integer_exp(); 
@@ -134,21 +135,21 @@ template<> class Float_traits< Gmpfr > {
   };
 public:  
   struct Get_mantissa
-    : public std::unary_function< Gmpfr, Gmpz > {
+    : public CGAL::unary_function< Gmpfr, Gmpz > {
     Gmpz operator()( const Gmpfr& x ) const {
       return Get_mantissa_exponent()(x).first;      
     }
   };
   
   struct Get_exponent
-    : public std::unary_function< Gmpfr, long > {
+    : public CGAL::unary_function< Gmpfr, long > {
     long operator()( const Gmpfr& x ) const { 
       return Get_mantissa_exponent()(x).second;      
     }
   };
     
 struct Mul_by_pow_of_2
-  : public std::binary_function< Gmpfr, Gmpz, Gmpfr> {
+  : public CGAL::binary_function< Gmpfr, Gmpz, Gmpfr> {
   Gmpfr operator()( const Gmpfr& a, long e ) const {
     Gmpfr result(0,a.get_precision()); // just to get the prec of a 
     if (e >= 0 ){

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_1.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Kerber <mkerber@mpi-inf.mpg.de>
@@ -38,7 +39,7 @@ namespace CGAL {
 namespace internal {
 
 template<typename Polynomial_1, typename Bound>
-struct Interval_evaluate_1 : public std::binary_function
+struct Interval_evaluate_1 : public CGAL::binary_function
 <Polynomial_1,std::pair<Bound,Bound>,
   std::pair<typename CGAL::Coercion_traits<typename 
      CGAL::Polynomial_traits_d<Polynomial_1>::Coefficient_type,Bound>::Type,

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_2.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Kerber <mkerber@mpi-inf.mpg.de>
@@ -39,7 +40,7 @@ namespace CGAL {
 namespace internal {
 
 template<typename Polynomial_2, typename Bound>
-struct Interval_evaluate_2 : public std::binary_function
+struct Interval_evaluate_2 : public CGAL::binary_function
 <Polynomial_2,CGAL::cpp11::array<Bound,4>,
       std::pair<typename CGAL::Coercion_traits<typename CGAL::Polynomial_traits_d<Polynomial_2>::Innermost_coefficient_type,Bound>::Type,
                 typename CGAL::Coercion_traits<typename CGAL::Polynomial_traits_d<Polynomial_2>::Innermost_coefficient_type,Bound>::Type> > {

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/LRU_hashed_map.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Pavel Emeliyanenko <asm@mpi-sb.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_embeddable_extension.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Hemmer <hemmer@mpi-inf.mpg.de>
@@ -102,7 +103,7 @@ template<>
 class Real_embeddable_extension< long > {            
 public:      
   struct Ceil_log2_abs
-    : public std::unary_function< long, long > {
+    : public CGAL::unary_function< long, long > {
     long operator()( long x ) {
       if (x < 0) x = -x;
       CGAL_precondition(x > 0);
@@ -112,7 +113,7 @@ public:
   };
 
   struct Floor_log2_abs
-    : public std::unary_function< long, long > {
+    : public CGAL::unary_function< long, long > {
   private:          
     signed char floor_log2_4bit[16];
   public:
@@ -148,11 +149,11 @@ public:
   };
 
   struct Floor
-    : public std::unary_function< long, long > {
+    : public CGAL::unary_function< long, long > {
     long operator() (long x) { return x;}
   };
   struct Ceil
-    : public std::unary_function< long, long > {
+    : public CGAL::unary_function< long, long > {
     long operator() (long x) { return x;}
   };
 };
@@ -167,7 +168,7 @@ public:
   typedef leda_integer Type;
 
   struct Ceil_log2_abs
-    : public std::unary_function< leda_integer, long > {
+    : public CGAL::unary_function< leda_integer, long > {
     long operator()( const leda_integer& x ) const {
       CGAL_precondition(x != leda_integer(0));
       ::leda::digit_sz ldgzeros = ::leda::digLeadingZeros(x.highword());
@@ -187,7 +188,7 @@ public:
   };
 
   struct Floor_log2_abs
-    : public std::unary_function< leda_integer, long > {
+    : public CGAL::unary_function< leda_integer, long > {
     long operator()( const leda_integer& x ) const {
       CGAL_precondition(x != leda_integer(0));
       ::leda::digit_sz ldgzeros 
@@ -199,11 +200,11 @@ public:
   };
 
   struct Floor
-    : public std::unary_function< leda_integer, leda_integer > {
+    : public CGAL::unary_function< leda_integer, leda_integer > {
     leda_integer operator() (const leda_integer& x) const { return x;}
   };
   struct Ceil
-    : public std::unary_function< leda_integer, leda_integer > {
+    : public CGAL::unary_function< leda_integer, leda_integer > {
     leda_integer operator() (const leda_integer& x) const { return x;}
   };
 };
@@ -215,7 +216,7 @@ public:
   typedef leda_bigfloat Type;
 
   struct Floor_log2_abs
-    : public std::unary_function< leda_bigfloat, long > {
+    : public CGAL::unary_function< leda_bigfloat, long > {
     long operator()( const leda_bigfloat& x ) const {
       CGAL_precondition(CGAL::sign(x) != CGAL::ZERO);
       ::leda::integer abs_sign = abs(x.get_significant());
@@ -225,7 +226,7 @@ public:
   };
         
   struct Ceil_log2_abs
-    : public std::unary_function< leda_bigfloat, long > {
+    : public CGAL::unary_function< leda_bigfloat, long > {
     long operator()( const leda_bigfloat& x ) const {
       CGAL_precondition(CGAL::sign(x) != CGAL::ZERO);
       return ::leda::ilog2(x).to_long();                
@@ -233,14 +234,14 @@ public:
   };
 
   struct Floor
-    : public std::unary_function< leda_bigfloat, leda_integer > {
+    : public CGAL::unary_function< leda_bigfloat, leda_integer > {
     leda_integer operator() ( const leda_bigfloat& x ) const { 
       return leda::to_integer( x, leda::TO_N_INF );
     }
   };
         
   struct Ceil
-    : public std::unary_function< leda_bigfloat, leda_integer > {
+    : public CGAL::unary_function< leda_bigfloat, leda_integer > {
     leda_integer operator() ( const leda_bigfloat& x ) const { 
       return leda::to_integer( x, leda::TO_P_INF );
     }
@@ -254,7 +255,7 @@ public:
   typedef leda_bigfloat_interval Type;
 
   struct Floor_log2_abs
-    : public std::unary_function< leda_bigfloat_interval, long > {
+    : public CGAL::unary_function< leda_bigfloat_interval, long > {
               
     result_type operator() (const argument_type& x) const {
       CGAL_precondition(! ::boost::numeric::in_zero(x));
@@ -263,7 +264,7 @@ public:
   };
         
   struct Ceil_log2_abs
-    : public std::unary_function< leda_bigfloat_interval, long > {
+    : public CGAL::unary_function< leda_bigfloat_interval, long > {
     long operator()( const leda_bigfloat_interval& x ) const {
       CGAL_precondition(!(::boost::numeric::in_zero(x) && 
               ::boost::numeric::singleton(x)));
@@ -272,7 +273,7 @@ public:
   };
 
   struct Floor
-    : public std::unary_function< leda_bigfloat_interval, leda_integer > {
+    : public CGAL::unary_function< leda_bigfloat_interval, leda_integer > {
     leda_integer operator() ( const leda_bigfloat_interval& x ) 
       const { 
       return internal::floor( x.lower() );
@@ -280,7 +281,7 @@ public:
   };
         
   struct Ceil
-    : public std::unary_function< leda_bigfloat_interval, leda_integer > {
+    : public CGAL::unary_function< leda_bigfloat_interval, leda_integer > {
     leda_integer operator() ( const leda_bigfloat_interval& x ) 
       const { 
       return internal::ceil( x.upper() );
@@ -298,27 +299,27 @@ class Real_embeddable_extension< CORE::BigInt > {
 public:
   typedef CORE::BigInt Type;
   struct Floor_log2_abs
-    : public std::unary_function< CORE::BigInt, long > {
+    : public CGAL::unary_function< CORE::BigInt, long > {
     long operator()( const CORE::BigInt& x ) const {
       return CORE::floorLg(x);
     }            
   };
         
   struct Ceil_log2_abs
-    : public std::unary_function< CORE::BigInt, long > {
+    : public CGAL::unary_function< CORE::BigInt, long > {
     long operator()( const CORE::BigInt& x ) const {
       return CORE::ceilLg(x);
     }
   };
 
   struct Floor
-    : public std::unary_function< CORE::BigInt, CORE::BigInt > {
+    : public CGAL::unary_function< CORE::BigInt, CORE::BigInt > {
     CORE::BigInt operator() (const CORE::BigInt& x) const { 
       return x;
     }
   };
   struct Ceil
-    : public std::unary_function< CORE::BigInt, CORE::BigInt > {
+    : public CGAL::unary_function< CORE::BigInt, CORE::BigInt > {
     CORE::BigInt operator() (const CORE::BigInt& x) const { 
       return x;
     }
@@ -331,7 +332,7 @@ class Real_embeddable_extension< CORE::BigFloat > {
 public:
   typedef CORE::BigFloat Type;
   struct Floor_log2_abs
-    : public std::unary_function< CORE::BigFloat, long > {
+    : public CGAL::unary_function< CORE::BigFloat, long > {
     long operator()( CORE::BigFloat x ) const {
       CGAL_precondition(!CGAL::zero_in(x));
       x = CGAL::abs(x);
@@ -340,7 +341,7 @@ public:
   };
         
   struct Ceil_log2_abs
-    : public std::unary_function< CORE::BigFloat, long > {
+    : public CGAL::unary_function< CORE::BigFloat, long > {
     long operator()( CORE::BigFloat x ) const {
       // (already commented out in EXACUS)...
       //   NiX_precond(!(NiX::in_zero(x) && NiX::singleton(x)));
@@ -350,7 +351,7 @@ public:
   };
 
   struct Floor
-    : public std::unary_function< CORE::BigFloat, CORE::BigInt > {
+    : public CGAL::unary_function< CORE::BigFloat, CORE::BigInt > {
     CORE::BigInt operator() ( const CORE::BigFloat& x ) const { 
       CORE::BigInt xi = x.BigIntValue();
       if(x.sign() < 0 && x.cmp(xi)!=0) {
@@ -361,7 +362,7 @@ public:
   };
         
   struct Ceil
-    : public std::unary_function< CORE::BigFloat, CORE::BigInt > {
+    : public CGAL::unary_function< CORE::BigFloat, CORE::BigInt > {
     CORE::BigInt operator() ( const CORE::BigFloat& x ) const { 
       CORE::BigInt xi = x.BigIntValue();
       if(x.sign() >0 && x.cmp(xi)!=0) {
@@ -384,7 +385,7 @@ public:
   typedef Gmpz Type;
 
   struct Floor_log2_abs
-    : public std::unary_function< Gmpz, long > {
+    : public CGAL::unary_function< Gmpz, long > {
     long operator()( const Gmpz& x ) const {
       CGAL_precondition(!CGAL::is_zero(x));
       return mpz_sizeinbase(x.mpz(),2)-1;
@@ -392,7 +393,7 @@ public:
   };
         
   struct Ceil_log2_abs
-    : public std::unary_function< Gmpz, long > {
+    : public CGAL::unary_function< Gmpz, long > {
     long operator()( const Gmpz& x ) const {
       long pos  = mpz_scan1(x.mpz(),0);
       long size = mpz_sizeinbase(x.mpz(),2);
@@ -404,13 +405,13 @@ public:
   };
 
   struct Floor
-    : public std::unary_function< Gmpz, Gmpz > {
+    : public CGAL::unary_function< Gmpz, Gmpz > {
     Gmpz operator() (const Gmpz& x) const { 
       return x;
     }
   };
   struct Ceil
-    : public std::unary_function< Gmpz, Gmpz > {
+    : public CGAL::unary_function< Gmpz, Gmpz > {
     Gmpz operator() (const Gmpz& x) const { 
       return x;
     }
@@ -426,7 +427,7 @@ public:
   typedef Gmpfr Type;
 
   struct Floor_log2_abs
-    : public std::unary_function< Gmpfr, long > {
+    : public CGAL::unary_function< Gmpfr, long > {
     long operator()( const Gmpfr& x ) const {
       Float_traits<Gmpfr>::Get_mantissa get_mantissa; 
       Float_traits<Gmpfr>::Get_exponent get_exponent; 
@@ -437,7 +438,7 @@ public:
   };
         
   struct Ceil_log2_abs
-    : public std::unary_function< Gmpfr, long > {
+    : public CGAL::unary_function< Gmpfr, long > {
     long operator()( const Gmpfr& x ) const {
       Float_traits<Gmpfr>::Get_mantissa get_mantissa; 
       Float_traits<Gmpfr>::Get_exponent get_exponent; 
@@ -448,7 +449,7 @@ public:
   };
 
   struct Floor
-    : public std::unary_function< Gmpfr, Gmpz > {
+    : public CGAL::unary_function< Gmpfr, Gmpz > {
     Gmpz operator() ( const Gmpfr& x ) const {  
       Gmpz result; 
       mpfr_get_z (result.mpz(),x.fr(),GMP_RNDD);
@@ -457,7 +458,7 @@ public:
   };
         
   struct Ceil
-    : public std::unary_function< Gmpfr, Gmpz > {
+    : public CGAL::unary_function< Gmpfr, Gmpz > {
     Gmpz operator() ( const Gmpfr& x ) const { 
       Gmpz result; 
       mpfr_get_z (result.mpz(),x.fr(),GMP_RNDU);
@@ -475,7 +476,7 @@ public:
   typedef Gmpfi Type;
 
   struct Floor_log2_abs
-    : public std::unary_function< Gmpfi, long > {
+    : public CGAL::unary_function< Gmpfi, long > {
     result_type operator() (const argument_type& x) const {
       CGAL_precondition(!x.is_zero());
       return internal::floor_log2_abs(x.abs().inf());
@@ -483,7 +484,7 @@ public:
   };
         
   struct Ceil_log2_abs
-    : public std::unary_function< Gmpfi, long > {
+    : public CGAL::unary_function< Gmpfi, long > {
     long operator()( const Gmpfi& x ) const {
       CGAL_precondition(!x.inf().is_zero() || !x.sup().is_zero());
       return internal::ceil_log2_abs(x.abs().sup());                    
@@ -491,7 +492,7 @@ public:
   };
 
   struct Floor
-    : public std::unary_function< Gmpfi, Gmpz > {
+    : public CGAL::unary_function< Gmpfi, Gmpz > {
     Gmpz operator() ( const Gmpfi& x ) 
       const { 
       return internal::floor( x.inf() );
@@ -499,7 +500,7 @@ public:
   };
         
   struct Ceil
-    : public std::unary_function< Gmpfi, Gmpz > {
+    : public CGAL::unary_function< Gmpfi, Gmpz > {
     Gmpz operator() ( const Gmpfi& x ) 
       const { 
       return internal::ceil( x.sup() );

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_roots.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     :  Michael Hemmer <hemmer@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Shear_controller.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Kerber <mkerber@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Shear_transformation.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Kerber <mkerber@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Status_line_CA_1.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Pavel Emeliyanenko <asm@mpi-sb.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Status_line_CPA_1.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Pavel Emeliyanenko <asm@mpi-sb.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Xy_coordinate_2.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Eric Berberich <eric@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/algebraic_curve_kernel_2_tools.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Kerber <mkerber@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/bound_between_1.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 //

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/construct_binary.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     :  Michael Hemmer <hemmer@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/enums.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Kerber <mkerber@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/exceptions.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Kerber <mkerber@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/flags.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Kerber <mkerber@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/macros.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Eric Berberich <eric@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/refine_zero_against.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     :  Michael Hemmer <hemmer@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/shear.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Kerber <mkerber@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/univariate_polynomial_utils.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     :  Michael Hemmer <hemmer@mpi-inf.mpg.de>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d_1.h

@@ -14,6 +14,7 @@
 //
 // $URL$
 // $Id$
+// SPDX-License-Identifier: LGPL-3.0+
 // 
 //
 // Author(s)     : Michael Hemmer <hemmer@mpi-inf.mpg.de>    
@@ -68,12 +69,12 @@ protected:
 
   // Some functors used for STL calls
   template<typename A,typename B>
-    struct Pair_first : public std::unary_function<std::pair<A,B>,A> {
+    struct Pair_first : public CGAL::unary_function<std::pair<A,B>,A> {
       A operator() (std::pair<A,B> pair) const { return pair.first; }
   };
 
   template<typename A,typename B>
-    struct Pair_second : public std::unary_function<std::pair<A,B>,B> {
+    struct Pair_second : public CGAL::unary_function<std::pair<A,B>,B> {
       B operator() (std::pair<A,B> pair) const { return pair.second; }
   };
   
@@ -83,7 +84,7 @@ public:
     typedef Algebraic_real_1                      Type;
     
     struct Bound_between 
-      : public std::binary_function< Type, Type, Bound > {
+      : public CGAL::binary_function< Type, Type, Bound > {
       Bound operator()( const Type& t1, 
           const Type& t2 ) const {
 #if CGAL_AK_DONT_USE_SIMPLE_BOUND_BETWEEN
@@ -96,21 +97,21 @@ public:
     };
                                 
     struct Lower_bound
-      : public std::unary_function< Type, Bound > {
+      : public CGAL::unary_function< Type, Bound > {
       Bound operator()( const Type& t ) const {
         return t.low();
       }
     };
                 
     struct Upper_bound
-      : public std::unary_function< Type, Bound > {
+      : public CGAL::unary_function< Type, Bound > {
       Bound operator()( const Type& t ) const {
         return t.high();
       }
     };
                 
     struct Refine
-      : public std::unary_function< Type, void > {
+      : public CGAL::unary_function< Type, void > {
       void operator()( const Type& t ) const {
         t.refine();
       }
@@ -148,7 +149,7 @@ public:
     };              
     
     struct Approximate_absolute_1:
-      public std::binary_function<Algebraic_real_1,int,std::pair<Bound,Bound> >{
+      public CGAL::binary_function<Algebraic_real_1,int,std::pair<Bound,Bound> >{
       std::pair<Bound,Bound> 
       operator()(const Algebraic_real_1& x, int prec) const {
         Lower_bound lower; 
@@ -167,7 +168,7 @@ public:
     }; 
     
     struct Approximate_relative_1:
-      public std::binary_function<Algebraic_real_1,int,std::pair<Bound,Bound> >{
+      public CGAL::binary_function<Algebraic_real_1,int,std::pair<Bound,Bound> >{
       std::pair<Bound,Bound> 
       operator()(const Algebraic_real_1& x, int prec) const {
         
@@ -275,7 +276,7 @@ public:
     /*
     // TODO: Can we avoid to use this?
     struct Greater_compare : 
-      public std::binary_function<Algebraic_real_1,Algebraic_real_1,bool> {
+      public CGAL::binary_function<Algebraic_real_1,Algebraic_real_1,bool> {
       
       bool operator() (const Algebraic_real_1& a, const Algebraic_real_1& b)
 	const {
@@ -333,7 +334,7 @@ public:
   };
 
   class Number_of_solutions_1 
-      : public std::unary_function<Polynomial_1,size_type> {
+      : public CGAL::unary_function<Polynomial_1,size_type> {
     
     public:
 	
@@ -349,7 +350,7 @@ public:
 
             
   struct Sign_at_1 
-    : public std::binary_function< Polynomial_1, Algebraic_real_1, CGAL::Sign > {
+    : public CGAL::binary_function< Polynomial_1, Algebraic_real_1, CGAL::Sign > {
     CGAL::Sign operator()( const Polynomial_1& p, const Algebraic_real_1& ar ) const {
       if(CGAL::is_zero(p)) return ZERO; 
       if(CGAL::degree(p)==0) return p.sign_at(0);
@@ -372,7 +373,7 @@ public:
     }
   };                
   struct Is_zero_at_1 
-    : public std::binary_function< Polynomial_1, Algebraic_real_1, bool > {
+    : public CGAL::binary_function< Polynomial_1, Algebraic_real_1, bool > {
     bool operator()( const Polynomial_1& p, const Algebraic_real_1& ar ) const {
       if(CGAL::is_zero(p)) return true; 
       if( ar.low() == ar.high() ) return p.sign_at( ar.low() ) == ZERO;
@@ -382,7 +383,7 @@ public:
   };                
                    
   struct Is_square_free_1 
-    : public std::unary_function< Polynomial_1, bool > {
+    : public CGAL::unary_function< Polynomial_1, bool > {
     bool operator()( const Polynomial_1& p ) const {
       typename CGAL::Polynomial_traits_d< Polynomial_1 >::Is_square_free isf;
       return isf(p);
@@ -390,7 +391,7 @@ public:
   };
             
   struct Is_coprime_1
-    : public std::binary_function< Polynomial_1, Polynomial_1, bool > {
+    : public CGAL::binary_function< Polynomial_1, Polynomial_1, bool > {
     bool operator()( const Polynomial_1& p1, const Polynomial_1& p2 ) const {
       typename CGAL::Polynomial_traits_d< Polynomial_1 >::Total_degree total_degree;
                         
@@ -400,7 +401,7 @@ public:
   }; 
             
   struct Make_square_free_1
-    : public std::unary_function< Polynomial_1, Polynomial_1 > {
+    : public CGAL::unary_function< Polynomial_1, Polynomial_1 > {
     Polynomial_1 operator()( const Polynomial_1& p ) const {
       return typename CGAL::Polynomial_traits_d< Polynomial_1 >::Make_square_free()( p );
     }
@@ -435,7 +436,7 @@ public:
     } 
   };
 
-  struct Compute_polynomial_1 : public std::unary_function<Algebraic_real_1,
+  struct Compute_polynomial_1 : public CGAL::unary_function<Algebraic_real_1,
                                                            Polynomial_1> {
     Polynomial_1 operator()(const Algebraic_real_1& x) const {
       return x.polynomial();
@@ -485,7 +486,7 @@ public:
   };
 
   struct Compare_1
-    : public std::binary_function<Algebraic_real_1,
+    : public CGAL::binary_function<Algebraic_real_1,
 	                          Algebraic_real_1,
                                   CGAL::Comparison_result>{
     
@@ -530,7 +531,7 @@ public:
 
  public:
 
-  struct Isolate_1 : public std::binary_function
+  struct Isolate_1 : public CGAL::binary_function
     < Algebraic_real_1,Polynomial_1,std::pair<Bound,Bound> > {
     
     public: