From 0f8c681de9d7d9d5cd997b585982df4e761f714f Mon Sep 17 00:00:00 2001
From: Marc Glisse <marc.glisse@inria.fr>
Date: Wed, 2 Jul 2014 19:19:42 +0200
Subject: [PATCH] Rename 2 header files that Laurent doesn't like.

---
 NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_functors.h    | 2 +-
 NewKernel_d/include/CGAL/NewKernel_d/Dimension_base.h           | 2 +-
 NewKernel_d/include/CGAL/NewKernel_d/Kernel_2_interface.h       | 2 +-
 NewKernel_d/include/CGAL/NewKernel_d/Kernel_3_interface.h       | 2 +-
 NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h       | 2 +-
 NewKernel_d/include/CGAL/NewKernel_d/Kernel_object_converter.h  | 2 +-
 NewKernel_d/include/CGAL/NewKernel_d/LA_eigen/constructors.h    | 2 +-
 NewKernel_d/include/CGAL/NewKernel_d/Vector/array.h             | 2 +-
 NewKernel_d/include/CGAL/NewKernel_d/Vector/vector.h            | 2 +-
 .../include/CGAL/NewKernel_d/function_objects_cartesian.h       | 2 +-
 NewKernel_d/include/CGAL/NewKernel_d/functor_tags.h             | 2 +-
 NewKernel_d/include/CGAL/{ => NewKernel_d}/static_int.h         | 0
 NewKernel_d/include/CGAL/{marcutils.h => NewKernel_d/utils.h}   | 0
 13 files changed, 11 insertions(+), 11 deletions(-)
 rename NewKernel_d/include/CGAL/{ => NewKernel_d}/static_int.h (100%)
 rename NewKernel_d/include/CGAL/{marcutils.h => NewKernel_d/utils.h} (100%)

diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_functors.h b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_functors.h
index 68acdd27001..871c463ac77 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_functors.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_functors.h
@@ -20,7 +20,7 @@
 #ifndef CGAL_CARTESIAN_LA_FUNCTORS_H
 #define CGAL_CARTESIAN_LA_FUNCTORS_H
 
-#include <CGAL/marcutils.h>
+#include <CGAL/NewKernel_d/utils.h>
 #include <CGAL/is_iterator.h>
 #include <CGAL/argument_swaps.h>
 #include <CGAL/Kernel/Return_base_tag.h>
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Dimension_base.h b/NewKernel_d/include/CGAL/NewKernel_d/Dimension_base.h
index f99d9d6ba6b..be875e63255 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Dimension_base.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Dimension_base.h
@@ -21,7 +21,7 @@
 #define CGAL_KD_DIMENSION_BASE_h
 #include <CGAL/Dimension.h>
 #include <CGAL/assertions.h>
-#include <CGAL/marcutils.h>
+#include <CGAL/NewKernel_d/utils.h>
 namespace CGAL {
 struct Store_dimension_base {
 	//TODO: add some assertions
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Kernel_2_interface.h b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_2_interface.h
index f963845ddbb..fa30dff0cc9 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Kernel_2_interface.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_2_interface.h
@@ -22,7 +22,7 @@
 
 #include <CGAL/NewKernel_d/functor_tags.h>
 #include <CGAL/transforming_iterator.h>
-#include <CGAL/marcutils.h>
+#include <CGAL/NewKernel_d/utils.h>
 #include <CGAL/tuple.h>
 
 
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Kernel_3_interface.h b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_3_interface.h
index d02508157b7..96076aa8459 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Kernel_3_interface.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_3_interface.h
@@ -22,7 +22,7 @@
 
 #include <CGAL/NewKernel_d/functor_tags.h>
 #include <CGAL/transforming_iterator.h>
-#include <CGAL/marcutils.h>
+#include <CGAL/NewKernel_d/utils.h>
 #include <CGAL/tuple.h>
 
 
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h
index af0438eb4a4..5691da363e8 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h
@@ -22,7 +22,7 @@
 
 #include <CGAL/NewKernel_d/functor_tags.h>
 #include <CGAL/transforming_iterator.h>
-#include <CGAL/marcutils.h>
+#include <CGAL/NewKernel_d/utils.h>
 #include <CGAL/tuple.h>
 
 
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Kernel_object_converter.h b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_object_converter.h
index b13303fa24c..ec4cd2147ee 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Kernel_object_converter.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_object_converter.h
@@ -19,7 +19,7 @@
 
 #ifndef CGAL_KD_KO_CONVERTER_H
 #define CGAL_KD_KO_CONVERTER_H
-#include <CGAL/marcutils.h>
+#include <CGAL/NewKernel_d/utils.h>
 #include <CGAL/NewKernel_d/functor_tags.h>
 #include <CGAL/Kernel/mpl.h> // First_if_different
 namespace CGAL {
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/LA_eigen/constructors.h b/NewKernel_d/include/CGAL/NewKernel_d/LA_eigen/constructors.h
index 0825f3bfaf3..848aae5e5d3 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/LA_eigen/constructors.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/LA_eigen/constructors.h
@@ -28,7 +28,7 @@
 #include <CGAL/Dimension.h>
 #include <Eigen/Dense>
 #include <CGAL/iterator_from_indices.h>
-#include <CGAL/marcutils.h>
+#include <CGAL/NewKernel_d/utils.h>
 #include <boost/preprocessor/repetition.hpp>
 #include <boost/preprocessor/repetition/enum.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Vector/array.h b/NewKernel_d/include/CGAL/NewKernel_d/Vector/array.h
index 2f2b1ba6e52..8e9b77f01d6 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Vector/array.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Vector/array.h
@@ -22,7 +22,7 @@
 #include <boost/type_traits/is_arithmetic.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <CGAL/Dimension.h>
-#include <CGAL/marcutils.h>
+#include <CGAL/NewKernel_d/utils.h>
 #include <CGAL/array.h>
 #include <boost/preprocessor/repetition.hpp>
 #include <boost/preprocessor/repetition/enum.hpp>
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Vector/vector.h b/NewKernel_d/include/CGAL/NewKernel_d/Vector/vector.h
index 7f4fd2c38d1..370bbad7c72 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Vector/vector.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Vector/vector.h
@@ -22,7 +22,7 @@
 #include <boost/type_traits/is_arithmetic.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <CGAL/Dimension.h>
-#include <CGAL/marcutils.h>
+#include <CGAL/NewKernel_d/utils.h>
 #include <vector>
 #include <boost/preprocessor/repetition.hpp>
 #include <boost/preprocessor/repetition/enum.hpp>
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h b/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h
index e7e6be1bf1e..cbb8d980d17 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h
@@ -20,7 +20,7 @@
 #ifndef CGAL_KERNEL_D_FUNCTION_OBJECTS_CARTESIAN_H
 #define CGAL_KERNEL_D_FUNCTION_OBJECTS_CARTESIAN_H
 
-#include <CGAL/marcutils.h>
+#include <CGAL/NewKernel_d/utils.h>
 #include <CGAL/Dimension.h>
 #include <CGAL/Uncertain.h>
 #include <CGAL/NewKernel_d/store_kernel.h>
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/functor_tags.h b/NewKernel_d/include/CGAL/NewKernel_d/functor_tags.h
index 02798ad519f..9affac77a2e 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/functor_tags.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/functor_tags.h
@@ -20,7 +20,7 @@
 #ifndef CGAL_FUNCTOR_TAGS_H
 #define CGAL_FUNCTOR_TAGS_H
 #include <CGAL/tags.h> // for Null_tag
-#include <CGAL/marcutils.h>
+#include <CGAL/NewKernel_d/utils.h>
 #ifdef CGAL_CXX11
 #include <type_traits>
 #include <utility>
diff --git a/NewKernel_d/include/CGAL/static_int.h b/NewKernel_d/include/CGAL/NewKernel_d/static_int.h
similarity index 100%
rename from NewKernel_d/include/CGAL/static_int.h
rename to NewKernel_d/include/CGAL/NewKernel_d/static_int.h
diff --git a/NewKernel_d/include/CGAL/marcutils.h b/NewKernel_d/include/CGAL/NewKernel_d/utils.h
similarity index 100%
rename from NewKernel_d/include/CGAL/marcutils.h
rename to NewKernel_d/include/CGAL/NewKernel_d/utils.h