From 271debb4ac28eb331bc1d4cd400dc39846e5c4e4 Mon Sep 17 00:00:00 2001 From: Marc Glisse Date: Wed, 12 Mar 2014 11:35:12 +0100 Subject: [PATCH] Kernel_d/ -> NewKernel_d/ to avoid conflicts. The whole content is currently private. --- NewKernel_d/include/CGAL/Epick_d.h | 10 +++++----- .../include/CGAL/Kernel_d/Cartesian_complete.h | 14 -------------- .../{Kernel_d => NewKernel_d}/Cartesian_LA_base.h | 12 ++++++------ .../Cartesian_LA_functors.h | 2 +- .../{Kernel_d => NewKernel_d}/Cartesian_base.h | 4 ++-- .../Cartesian_change_FT.h | 2 +- .../include/CGAL/NewKernel_d/Cartesian_complete.h | 14 ++++++++++++++ .../{Kernel_d => NewKernel_d}/Cartesian_filter_K.h | 4 ++-- .../Cartesian_filter_NT.h | 2 +- .../Cartesian_per_dimension.h | 2 +- .../Cartesian_static_filters.h | 2 +- .../CGAL/{Kernel_d => NewKernel_d}/Coaffine.h | 2 +- .../Define_kernel_types.h | 2 +- .../{Kernel_d => NewKernel_d}/Dimension_base.h | 0 .../Filtered_predicate2.h | 2 +- .../{Kernel_d => NewKernel_d}/KernelD_converter.h | 6 +++--- .../{Kernel_d => NewKernel_d}/Kernel_2_interface.h | 2 +- .../{Kernel_d => NewKernel_d}/Kernel_3_interface.h | 2 +- .../{Kernel_d => NewKernel_d}/Kernel_d_interface.h | 2 +- .../Kernel_object_converter.h | 2 +- .../CGAL/{Kernel_d => NewKernel_d}/LA_eigen/LA.h | 2 +- .../LA_eigen/constructors.h | 0 .../{Kernel_d => NewKernel_d}/Lazy_cartesian.h | 4 ++-- .../Types/Aff_transformation.h | 2 +- .../{Kernel_d => NewKernel_d}/Types/Hyperplane.h | 2 +- .../CGAL/{Kernel_d => NewKernel_d}/Types/Iso_box.h | 2 +- .../CGAL/{Kernel_d => NewKernel_d}/Types/Line.h | 2 +- .../CGAL/{Kernel_d => NewKernel_d}/Types/Ray.h | 2 +- .../CGAL/{Kernel_d => NewKernel_d}/Types/Segment.h | 2 +- .../CGAL/{Kernel_d => NewKernel_d}/Types/Sphere.h | 2 +- .../CGAL/{Kernel_d => NewKernel_d}/Vector/array.h | 10 +++++----- .../CGAL/{Kernel_d => NewKernel_d}/Vector/avx4.h | 2 +- ...f_iterator_to_points_from_iterator_to_vectors.h | 2 +- ...determinant_of_iterator_to_points_from_points.h | 2 +- ...terminant_of_iterator_to_vectors_from_vectors.h | 2 +- .../Vector/determinant_of_points_from_vectors.h | 2 +- .../Vector/determinant_of_vectors_small_dim.h | 6 +++--- .../determinant_of_vectors_small_dim_internal.h | 0 .../CGAL/{Kernel_d => NewKernel_d}/Vector/sse2.h | 2 +- .../CGAL/{Kernel_d => NewKernel_d}/Vector/v2int.h | 2 +- .../CGAL/{Kernel_d => NewKernel_d}/Vector/vector.h | 0 .../Wrapper/Cartesian_wrap.h | 10 +++++----- .../{Kernel_d => NewKernel_d}/Wrapper/Point_d.h | 0 .../Wrapper/Ref_count_obj.h | 0 .../{Kernel_d => NewKernel_d}/Wrapper/Segment_d.h | 0 .../{Kernel_d => NewKernel_d}/Wrapper/Sphere_d.h | 0 .../{Kernel_d => NewKernel_d}/Wrapper/Vector_d.h | 0 .../function_objects_cartesian.h | 8 ++++---- .../{Kernel_d => NewKernel_d}/functor_properties.h | 0 .../CGAL/{Kernel_d => NewKernel_d}/functor_tags.h | 0 .../{Kernel_d => NewKernel_d}/interface_macros.h | 0 .../CGAL/{Kernel_d => NewKernel_d}/store_kernel.h | 0 NewKernel_d/test/NewKernel_d/test.cpp | 14 +++++++------- 53 files changed, 85 insertions(+), 85 deletions(-) delete mode 100644 NewKernel_d/include/CGAL/Kernel_d/Cartesian_complete.h rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Cartesian_LA_base.h (95%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Cartesian_LA_functors.h (99%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Cartesian_base.h (82%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Cartesian_change_FT.h (98%) create mode 100644 NewKernel_d/include/CGAL/NewKernel_d/Cartesian_complete.h rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Cartesian_filter_K.h (95%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Cartesian_filter_NT.h (98%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Cartesian_per_dimension.h (87%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Cartesian_static_filters.h (98%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Coaffine.h (99%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Define_kernel_types.h (96%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Dimension_base.h (100%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Filtered_predicate2.h (98%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/KernelD_converter.h (97%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Kernel_2_interface.h (98%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Kernel_3_interface.h (98%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Kernel_d_interface.h (99%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Kernel_object_converter.h (98%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/LA_eigen/LA.h (98%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/LA_eigen/constructors.h (100%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Lazy_cartesian.h (98%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Types/Aff_transformation.h (96%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Types/Hyperplane.h (99%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Types/Iso_box.h (97%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Types/Line.h (97%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Types/Ray.h (97%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Types/Segment.h (98%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Types/Sphere.h (99%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Vector/array.h (89%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Vector/avx4.h (99%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Vector/determinant_of_iterator_to_points_from_iterator_to_vectors.h (98%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Vector/determinant_of_iterator_to_points_from_points.h (99%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Vector/determinant_of_iterator_to_vectors_from_vectors.h (99%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Vector/determinant_of_points_from_vectors.h (99%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Vector/determinant_of_vectors_small_dim.h (81%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Vector/determinant_of_vectors_small_dim_internal.h (100%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Vector/sse2.h (98%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Vector/v2int.h (99%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Vector/vector.h (100%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Wrapper/Cartesian_wrap.h (97%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Wrapper/Point_d.h (100%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Wrapper/Ref_count_obj.h (100%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Wrapper/Segment_d.h (100%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Wrapper/Sphere_d.h (100%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/Wrapper/Vector_d.h (100%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/function_objects_cartesian.h (99%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/functor_properties.h (100%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/functor_tags.h (100%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/interface_macros.h (100%) rename NewKernel_d/include/CGAL/{Kernel_d => NewKernel_d}/store_kernel.h (100%) diff --git a/NewKernel_d/include/CGAL/Epick_d.h b/NewKernel_d/include/CGAL/Epick_d.h index 38b20bafc1a..56f3787c64d 100644 --- a/NewKernel_d/include/CGAL/Epick_d.h +++ b/NewKernel_d/include/CGAL/Epick_d.h @@ -1,10 +1,10 @@ #ifndef CGAL_EPICK_D_H #define CGAL_EPICK_D_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_complete.h b/NewKernel_d/include/CGAL/Kernel_d/Cartesian_complete.h deleted file mode 100644 index b78a96a0e7c..00000000000 --- a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_complete.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef CGAL_KERNEL_D_CARTESIAN_COMPLETE_H -#define CGAL_KERNEL_D_CARTESIAN_COMPLETE_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif // CGAL_KERNEL_D_CARTESIAN_COMPLETE_H diff --git a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_LA_base.h b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_base.h similarity index 95% rename from NewKernel_d/include/CGAL/Kernel_d/Cartesian_LA_base.h rename to NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_base.h index 9e3b4dede22..037dc18214e 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_LA_base.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_base.h @@ -5,16 +5,16 @@ #include #include -#include +#include #include #include -#include -#include -#include +#include +#include +#include #ifdef CGAL_EIGEN3_ENABLED -#include +#include #else -#include +#include #endif namespace CGAL { diff --git a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_LA_functors.h b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_functors.h similarity index 99% rename from NewKernel_d/include/CGAL/Kernel_d/Cartesian_LA_functors.h rename to NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_functors.h index 87e49b58e28..6ee0c4cabdc 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_LA_functors.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_functors.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace CGAL { namespace CartesianDVectorBase { diff --git a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_base.h b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_base.h similarity index 82% rename from NewKernel_d/include/CGAL/Kernel_d/Cartesian_base.h rename to NewKernel_d/include/CGAL/NewKernel_d/Cartesian_base.h index f5ef884ac76..e5fcfd57e8b 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_base.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_base.h @@ -2,8 +2,8 @@ #define CGAL_KERNEL_D_CARTESIAN_BASE_H #include -#include -#include +#include +#include namespace CGAL { #define CGAL_BASE \ diff --git a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_change_FT.h b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_change_FT.h similarity index 98% rename from NewKernel_d/include/CGAL/Kernel_d/Cartesian_change_FT.h rename to NewKernel_d/include/CGAL/NewKernel_d/Cartesian_change_FT.h index ba2d44dc904..0959233bf3d 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_change_FT.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_change_FT.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include namespace CGAL { diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_complete.h b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_complete.h new file mode 100644 index 00000000000..cf5b876cc39 --- /dev/null +++ b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_complete.h @@ -0,0 +1,14 @@ +#ifndef CGAL_KERNEL_D_CARTESIAN_COMPLETE_H +#define CGAL_KERNEL_D_CARTESIAN_COMPLETE_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#endif // CGAL_KERNEL_D_CARTESIAN_COMPLETE_H diff --git a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_filter_K.h b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_filter_K.h similarity index 95% rename from NewKernel_d/include/CGAL/Kernel_d/Cartesian_filter_K.h rename to NewKernel_d/include/CGAL/NewKernel_d/Cartesian_filter_K.h index d1f5d5ad91d..0d72499b5b1 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_filter_K.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_filter_K.h @@ -2,8 +2,8 @@ #define CGAL_KERNEL_D_CARTESIAN_FILTER_K_H #include -#include -#include +#include +#include #include namespace CGAL { diff --git a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_filter_NT.h b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_filter_NT.h similarity index 98% rename from NewKernel_d/include/CGAL/Kernel_d/Cartesian_filter_NT.h rename to NewKernel_d/include/CGAL/NewKernel_d/Cartesian_filter_NT.h index 33b136a5385..563d21c11f2 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_filter_NT.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_filter_NT.h @@ -2,7 +2,7 @@ #define CGAL_KERNEL_D_CARTESIAN_FILTER_NT_H #include -#include +#include #include namespace CGAL { diff --git a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_per_dimension.h b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_per_dimension.h similarity index 87% rename from NewKernel_d/include/CGAL/Kernel_d/Cartesian_per_dimension.h rename to NewKernel_d/include/CGAL/NewKernel_d/Cartesian_per_dimension.h index b46196bb412..d1d40898a99 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_per_dimension.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_per_dimension.h @@ -1,6 +1,6 @@ #ifndef CGAL_KD_CARTESIAN_PER_DIM_H #define CGAL_KD_CARTESIAN_PER_DIM_H -#include +#include #include #include diff --git a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_static_filters.h b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_static_filters.h similarity index 98% rename from NewKernel_d/include/CGAL/Kernel_d/Cartesian_static_filters.h rename to NewKernel_d/include/CGAL/NewKernel_d/Cartesian_static_filters.h index 2e19bd5299e..a73bb3477e8 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Cartesian_static_filters.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_static_filters.h @@ -1,6 +1,6 @@ #ifndef CGAL_KD_CARTESIAN_STATIC_FILTERS_H #define CGAL_KD_CARTESIAN_STATIC_FILTERS_H -#include +#include #include #include // bug, should be included by the next one #include diff --git a/NewKernel_d/include/CGAL/Kernel_d/Coaffine.h b/NewKernel_d/include/CGAL/NewKernel_d/Coaffine.h similarity index 99% rename from NewKernel_d/include/CGAL/Kernel_d/Coaffine.h rename to NewKernel_d/include/CGAL/NewKernel_d/Coaffine.h index 2d6a6b8e430..932b3c665b0 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Coaffine.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Coaffine.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include namespace CGAL { namespace CartesianDKernelFunctors { diff --git a/NewKernel_d/include/CGAL/Kernel_d/Define_kernel_types.h b/NewKernel_d/include/CGAL/NewKernel_d/Define_kernel_types.h similarity index 96% rename from NewKernel_d/include/CGAL/Kernel_d/Define_kernel_types.h rename to NewKernel_d/include/CGAL/NewKernel_d/Define_kernel_types.h index cfe3ae5dce9..76b31db680a 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Define_kernel_types.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Define_kernel_types.h @@ -1,6 +1,6 @@ #ifndef CGAL_DEFINE_KERNEL_TYPES_H #define CGAL_DEFINE_KERNEL_TYPES_H -#include +#include #include #ifdef CGAL_CXX0X #include diff --git a/NewKernel_d/include/CGAL/Kernel_d/Dimension_base.h b/NewKernel_d/include/CGAL/NewKernel_d/Dimension_base.h similarity index 100% rename from NewKernel_d/include/CGAL/Kernel_d/Dimension_base.h rename to NewKernel_d/include/CGAL/NewKernel_d/Dimension_base.h diff --git a/NewKernel_d/include/CGAL/Kernel_d/Filtered_predicate2.h b/NewKernel_d/include/CGAL/NewKernel_d/Filtered_predicate2.h similarity index 98% rename from NewKernel_d/include/CGAL/Kernel_d/Filtered_predicate2.h rename to NewKernel_d/include/CGAL/NewKernel_d/Filtered_predicate2.h index bedf8c4bc8c..3f1e15410a5 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Filtered_predicate2.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Filtered_predicate2.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include namespace CGAL { diff --git a/NewKernel_d/include/CGAL/Kernel_d/KernelD_converter.h b/NewKernel_d/include/CGAL/NewKernel_d/KernelD_converter.h similarity index 97% rename from NewKernel_d/include/CGAL/Kernel_d/KernelD_converter.h rename to NewKernel_d/include/CGAL/NewKernel_d/KernelD_converter.h index 1c7a0f57326..b53754e1ec6 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/KernelD_converter.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/KernelD_converter.h @@ -6,13 +6,13 @@ #include #include #include -#include +#include #include #include #include #include -#include -#include +#include +#include namespace CGAL { namespace internal { diff --git a/NewKernel_d/include/CGAL/Kernel_d/Kernel_2_interface.h b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_2_interface.h similarity index 98% rename from NewKernel_d/include/CGAL/Kernel_d/Kernel_2_interface.h rename to NewKernel_d/include/CGAL/NewKernel_d/Kernel_2_interface.h index 9eee7d5fceb..11c8bbc2341 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Kernel_2_interface.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_2_interface.h @@ -1,7 +1,7 @@ #ifndef CGAL_KD_KERNEL_2_INTERFACE_H #define CGAL_KD_KERNEL_2_INTERFACE_H -#include +#include #include #include #include diff --git a/NewKernel_d/include/CGAL/Kernel_d/Kernel_3_interface.h b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_3_interface.h similarity index 98% rename from NewKernel_d/include/CGAL/Kernel_d/Kernel_3_interface.h rename to NewKernel_d/include/CGAL/NewKernel_d/Kernel_3_interface.h index 719fe6d9ade..beba5ae8947 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Kernel_3_interface.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_3_interface.h @@ -1,7 +1,7 @@ #ifndef CGAL_KD_KERNEL_3_INTERFACE_H #define CGAL_KD_KERNEL_3_INTERFACE_H -#include +#include #include #include #include diff --git a/NewKernel_d/include/CGAL/Kernel_d/Kernel_d_interface.h b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h similarity index 99% rename from NewKernel_d/include/CGAL/Kernel_d/Kernel_d_interface.h rename to NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h index 16d85b7edad..4b02e962a71 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Kernel_d_interface.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h @@ -1,7 +1,7 @@ #ifndef CGAL_KD_KERNEL_D_INTERFACE_H #define CGAL_KD_KERNEL_D_INTERFACE_H -#include +#include #include #include #include diff --git a/NewKernel_d/include/CGAL/Kernel_d/Kernel_object_converter.h b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_object_converter.h similarity index 98% rename from NewKernel_d/include/CGAL/Kernel_d/Kernel_object_converter.h rename to NewKernel_d/include/CGAL/NewKernel_d/Kernel_object_converter.h index 9ba3f5d5726..081b76c1224 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Kernel_object_converter.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_object_converter.h @@ -1,7 +1,7 @@ #ifndef CGAL_KD_KO_CONVERTER_H #define CGAL_KD_KO_CONVERTER_H #include -#include +#include #include // First_if_different namespace CGAL { template struct KO_converter; diff --git a/NewKernel_d/include/CGAL/Kernel_d/LA_eigen/LA.h b/NewKernel_d/include/CGAL/NewKernel_d/LA_eigen/LA.h similarity index 98% rename from NewKernel_d/include/CGAL/Kernel_d/LA_eigen/LA.h rename to NewKernel_d/include/CGAL/NewKernel_d/LA_eigen/LA.h index 8409499eb87..c5282d71173 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/LA_eigen/LA.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/LA_eigen/LA.h @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include namespace CGAL { diff --git a/NewKernel_d/include/CGAL/Kernel_d/LA_eigen/constructors.h b/NewKernel_d/include/CGAL/NewKernel_d/LA_eigen/constructors.h similarity index 100% rename from NewKernel_d/include/CGAL/Kernel_d/LA_eigen/constructors.h rename to NewKernel_d/include/CGAL/NewKernel_d/LA_eigen/constructors.h diff --git a/NewKernel_d/include/CGAL/Kernel_d/Lazy_cartesian.h b/NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h similarity index 98% rename from NewKernel_d/include/CGAL/Kernel_d/Lazy_cartesian.h rename to NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h index fe27d1855ce..4c4de6359a7 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Lazy_cartesian.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h @@ -5,9 +5,9 @@ #include #include #include -#include +#include #include -#include +#include namespace CGAL { diff --git a/NewKernel_d/include/CGAL/Kernel_d/Types/Aff_transformation.h b/NewKernel_d/include/CGAL/NewKernel_d/Types/Aff_transformation.h similarity index 96% rename from NewKernel_d/include/CGAL/Kernel_d/Types/Aff_transformation.h rename to NewKernel_d/include/CGAL/NewKernel_d/Types/Aff_transformation.h index 51ec978f108..22be23e50d1 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Types/Aff_transformation.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Types/Aff_transformation.h @@ -1,6 +1,6 @@ #ifndef CGAL_KD_TYPE_AFF_TRANSFORMATION_H #define CGAL_KD_TYPE_AFF_TRANSFORMATION_H -#include +#include #include // Dummy, that's all the Kernel_d concept requires, so a useful class will wait. diff --git a/NewKernel_d/include/CGAL/Kernel_d/Types/Hyperplane.h b/NewKernel_d/include/CGAL/NewKernel_d/Types/Hyperplane.h similarity index 99% rename from NewKernel_d/include/CGAL/Kernel_d/Types/Hyperplane.h rename to NewKernel_d/include/CGAL/NewKernel_d/Types/Hyperplane.h index e36e2fe4c81..2cd1e7387b7 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Types/Hyperplane.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Types/Hyperplane.h @@ -1,6 +1,6 @@ #ifndef CGAL_KD_TYPE_HYPERPLANE_H #define CGAL_KD_TYPE_HYPERPLANE_H -#include +#include #include #include namespace CGAL { diff --git a/NewKernel_d/include/CGAL/Kernel_d/Types/Iso_box.h b/NewKernel_d/include/CGAL/NewKernel_d/Types/Iso_box.h similarity index 97% rename from NewKernel_d/include/CGAL/Kernel_d/Types/Iso_box.h rename to NewKernel_d/include/CGAL/NewKernel_d/Types/Iso_box.h index 73591c07ef0..f94c905f88a 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Types/Iso_box.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Types/Iso_box.h @@ -2,7 +2,7 @@ #define CGAL_KERNELD_TYPES_ISO_BOX_H #include #include -#include +#include #include #include namespace CGAL { diff --git a/NewKernel_d/include/CGAL/Kernel_d/Types/Line.h b/NewKernel_d/include/CGAL/NewKernel_d/Types/Line.h similarity index 97% rename from NewKernel_d/include/CGAL/Kernel_d/Types/Line.h rename to NewKernel_d/include/CGAL/NewKernel_d/Types/Line.h index 24661c00f00..66673985452 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Types/Line.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Types/Line.h @@ -1,7 +1,7 @@ #ifndef CGAL_KERNELD_TYPES_LINE_H #define CGAL_KERNELD_TYPES_LINE_H #include -#include +#include #include namespace CGAL { template class Line { diff --git a/NewKernel_d/include/CGAL/Kernel_d/Types/Ray.h b/NewKernel_d/include/CGAL/NewKernel_d/Types/Ray.h similarity index 97% rename from NewKernel_d/include/CGAL/Kernel_d/Types/Ray.h rename to NewKernel_d/include/CGAL/NewKernel_d/Types/Ray.h index 6428223bf19..f6f03f38922 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Types/Ray.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Types/Ray.h @@ -1,7 +1,7 @@ #ifndef CGAL_KERNELD_TYPES_RAY_H #define CGAL_KERNELD_TYPES_RAY_H #include -#include +#include #include namespace CGAL { template class Ray { diff --git a/NewKernel_d/include/CGAL/Kernel_d/Types/Segment.h b/NewKernel_d/include/CGAL/NewKernel_d/Types/Segment.h similarity index 98% rename from NewKernel_d/include/CGAL/Kernel_d/Types/Segment.h rename to NewKernel_d/include/CGAL/NewKernel_d/Types/Segment.h index 0bda25e04be..bcb5e045a65 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Types/Segment.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Types/Segment.h @@ -1,7 +1,7 @@ #ifndef CGAL_KERNELD_SEGMENTD_H #define CGAL_KERNELD_SEGMENTD_H #include -#include +#include namespace CGAL { template class Segment { typedef typename Get_type::type FT_; diff --git a/NewKernel_d/include/CGAL/Kernel_d/Types/Sphere.h b/NewKernel_d/include/CGAL/NewKernel_d/Types/Sphere.h similarity index 99% rename from NewKernel_d/include/CGAL/Kernel_d/Types/Sphere.h rename to NewKernel_d/include/CGAL/NewKernel_d/Types/Sphere.h index 8e4724c9777..eb14c06e8b3 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Types/Sphere.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Types/Sphere.h @@ -1,6 +1,6 @@ #ifndef CGAL_KD_TYPE_SPHERE_H #define CGAL_KD_TYPE_SPHERE_H -#include +#include #include namespace CGAL { template class Sphere { diff --git a/NewKernel_d/include/CGAL/Kernel_d/Vector/array.h b/NewKernel_d/include/CGAL/NewKernel_d/Vector/array.h similarity index 89% rename from NewKernel_d/include/CGAL/Kernel_d/Vector/array.h rename to NewKernel_d/include/CGAL/NewKernel_d/Vector/array.h index 786ce63279a..0e9c332869f 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Vector/array.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Vector/array.h @@ -8,11 +8,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include diff --git a/NewKernel_d/include/CGAL/Kernel_d/Vector/avx4.h b/NewKernel_d/include/CGAL/NewKernel_d/Vector/avx4.h similarity index 99% rename from NewKernel_d/include/CGAL/Kernel_d/Vector/avx4.h rename to NewKernel_d/include/CGAL/NewKernel_d/Vector/avx4.h index 12f75806858..247a3243230 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Vector/avx4.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Vector/avx4.h @@ -6,7 +6,7 @@ #endif #include -#include +#include #include #include // CGAL::Sign #include // CGAL::sign diff --git a/NewKernel_d/include/CGAL/Kernel_d/Vector/determinant_of_iterator_to_points_from_iterator_to_vectors.h b/NewKernel_d/include/CGAL/NewKernel_d/Vector/determinant_of_iterator_to_points_from_iterator_to_vectors.h similarity index 98% rename from NewKernel_d/include/CGAL/Kernel_d/Vector/determinant_of_iterator_to_points_from_iterator_to_vectors.h rename to NewKernel_d/include/CGAL/NewKernel_d/Vector/determinant_of_iterator_to_points_from_iterator_to_vectors.h index 80001309659..b2d35b29d4a 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Vector/determinant_of_iterator_to_points_from_iterator_to_vectors.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Vector/determinant_of_iterator_to_points_from_iterator_to_vectors.h @@ -2,7 +2,7 @@ #define CGAL_VECTOR_DET_ITER_PTS_ITER_VEC_H #include #include -#include +#include #include namespace CGAL { diff --git a/NewKernel_d/include/CGAL/Kernel_d/Vector/determinant_of_iterator_to_points_from_points.h b/NewKernel_d/include/CGAL/NewKernel_d/Vector/determinant_of_iterator_to_points_from_points.h similarity index 99% rename from NewKernel_d/include/CGAL/Kernel_d/Vector/determinant_of_iterator_to_points_from_points.h rename to NewKernel_d/include/CGAL/NewKernel_d/Vector/determinant_of_iterator_to_points_from_points.h index ce7e85d2ae1..9b48116cb22 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Vector/determinant_of_iterator_to_points_from_points.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Vector/determinant_of_iterator_to_points_from_points.h @@ -1,6 +1,6 @@ #ifndef CGAL_VECTOR_DET_ITER_PTS_PTS_H #define CGAL_VECTOR_DET_ITER_PTS_PTS_H -#include +#include #include namespace CGAL { diff --git a/NewKernel_d/include/CGAL/Kernel_d/Vector/determinant_of_iterator_to_vectors_from_vectors.h b/NewKernel_d/include/CGAL/NewKernel_d/Vector/determinant_of_iterator_to_vectors_from_vectors.h similarity index 99% rename from NewKernel_d/include/CGAL/Kernel_d/Vector/determinant_of_iterator_to_vectors_from_vectors.h rename to NewKernel_d/include/CGAL/NewKernel_d/Vector/determinant_of_iterator_to_vectors_from_vectors.h index 1a4a524db82..edbe5f7a462 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Vector/determinant_of_iterator_to_vectors_from_vectors.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Vector/determinant_of_iterator_to_vectors_from_vectors.h @@ -1,6 +1,6 @@ #ifndef CGAL_VECTOR_DET_ITER_VEC_VEC_H #define CGAL_VECTOR_DET_ITER_VEC_VEC_H -#include +#include #include namespace CGAL { diff --git a/NewKernel_d/include/CGAL/Kernel_d/Vector/determinant_of_points_from_vectors.h b/NewKernel_d/include/CGAL/NewKernel_d/Vector/determinant_of_points_from_vectors.h similarity index 99% rename from NewKernel_d/include/CGAL/Kernel_d/Vector/determinant_of_points_from_vectors.h rename to NewKernel_d/include/CGAL/NewKernel_d/Vector/determinant_of_points_from_vectors.h index 0cddfec444c..6f38c4aed7a 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Vector/determinant_of_points_from_vectors.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Vector/determinant_of_points_from_vectors.h @@ -1,6 +1,6 @@ #ifndef CGAL_VECTOR_DETPTS_H #define CGAL_VECTOR_DETPTS_H -#include +#include #include namespace CGAL { diff --git a/NewKernel_d/include/CGAL/Kernel_d/Vector/determinant_of_vectors_small_dim.h b/NewKernel_d/include/CGAL/NewKernel_d/Vector/determinant_of_vectors_small_dim.h similarity index 81% rename from NewKernel_d/include/CGAL/Kernel_d/Vector/determinant_of_vectors_small_dim.h rename to NewKernel_d/include/CGAL/NewKernel_d/Vector/determinant_of_vectors_small_dim.h index aac1bbf7f13..0d0b6be6dca 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Vector/determinant_of_vectors_small_dim.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Vector/determinant_of_vectors_small_dim.h @@ -1,6 +1,6 @@ #ifndef CGAL_VECTOR_DETVEC_SMALL_H #define CGAL_VECTOR_DETVEC_SMALL_H -#include +#include #include #include @@ -12,7 +12,7 @@ #define CGAL_SIGN_FUNC sign_of_determinant_of_vectors #define CGAL_SHIFT 0 -#include +#include #undef CGAL_CLASS #undef CGAL_TAG @@ -26,7 +26,7 @@ #define CGAL_SIGN_FUNC sign_of_determinant_of_vectors_omit_last #define CGAL_SHIFT 1 -#include +#include #undef CGAL_CLASS #undef CGAL_TAG diff --git a/NewKernel_d/include/CGAL/Kernel_d/Vector/determinant_of_vectors_small_dim_internal.h b/NewKernel_d/include/CGAL/NewKernel_d/Vector/determinant_of_vectors_small_dim_internal.h similarity index 100% rename from NewKernel_d/include/CGAL/Kernel_d/Vector/determinant_of_vectors_small_dim_internal.h rename to NewKernel_d/include/CGAL/NewKernel_d/Vector/determinant_of_vectors_small_dim_internal.h diff --git a/NewKernel_d/include/CGAL/Kernel_d/Vector/sse2.h b/NewKernel_d/include/CGAL/NewKernel_d/Vector/sse2.h similarity index 98% rename from NewKernel_d/include/CGAL/Kernel_d/Vector/sse2.h rename to NewKernel_d/include/CGAL/NewKernel_d/Vector/sse2.h index 130bb410723..97a93856bd6 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Vector/sse2.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Vector/sse2.h @@ -7,7 +7,7 @@ #endif #include // FIXME: other platforms call it differently -#include +#include #include #include // CGAL::Sign #include // CGAL::sign diff --git a/NewKernel_d/include/CGAL/Kernel_d/Vector/v2int.h b/NewKernel_d/include/CGAL/NewKernel_d/Vector/v2int.h similarity index 99% rename from NewKernel_d/include/CGAL/Kernel_d/Vector/v2int.h rename to NewKernel_d/include/CGAL/NewKernel_d/Vector/v2int.h index 06ae5c59403..90ee027157a 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Vector/v2int.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Vector/v2int.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include // What are the pros and cons of having NT be int vs double? diff --git a/NewKernel_d/include/CGAL/Kernel_d/Vector/vector.h b/NewKernel_d/include/CGAL/NewKernel_d/Vector/vector.h similarity index 100% rename from NewKernel_d/include/CGAL/Kernel_d/Vector/vector.h rename to NewKernel_d/include/CGAL/NewKernel_d/Vector/vector.h diff --git a/NewKernel_d/include/CGAL/Kernel_d/Wrapper/Cartesian_wrap.h b/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Cartesian_wrap.h similarity index 97% rename from NewKernel_d/include/CGAL/Kernel_d/Wrapper/Cartesian_wrap.h rename to NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Cartesian_wrap.h index b9f457cd51d..65cfc2f1f64 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Wrapper/Cartesian_wrap.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Cartesian_wrap.h @@ -4,12 +4,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #include #include diff --git a/NewKernel_d/include/CGAL/Kernel_d/Wrapper/Point_d.h b/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Point_d.h similarity index 100% rename from NewKernel_d/include/CGAL/Kernel_d/Wrapper/Point_d.h rename to NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Point_d.h diff --git a/NewKernel_d/include/CGAL/Kernel_d/Wrapper/Ref_count_obj.h b/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Ref_count_obj.h similarity index 100% rename from NewKernel_d/include/CGAL/Kernel_d/Wrapper/Ref_count_obj.h rename to NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Ref_count_obj.h diff --git a/NewKernel_d/include/CGAL/Kernel_d/Wrapper/Segment_d.h b/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Segment_d.h similarity index 100% rename from NewKernel_d/include/CGAL/Kernel_d/Wrapper/Segment_d.h rename to NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Segment_d.h diff --git a/NewKernel_d/include/CGAL/Kernel_d/Wrapper/Sphere_d.h b/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Sphere_d.h similarity index 100% rename from NewKernel_d/include/CGAL/Kernel_d/Wrapper/Sphere_d.h rename to NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Sphere_d.h diff --git a/NewKernel_d/include/CGAL/Kernel_d/Wrapper/Vector_d.h b/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Vector_d.h similarity index 100% rename from NewKernel_d/include/CGAL/Kernel_d/Wrapper/Vector_d.h rename to NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Vector_d.h diff --git a/NewKernel_d/include/CGAL/Kernel_d/function_objects_cartesian.h b/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h similarity index 99% rename from NewKernel_d/include/CGAL/Kernel_d/function_objects_cartesian.h rename to NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h index 1332abb904d..1ad00b5bcde 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/function_objects_cartesian.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h @@ -4,15 +4,15 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include -#include +#include +#include #include #include #ifdef CGAL_CXX0X @@ -1091,5 +1091,5 @@ template struct Has_on_positive_side : private Store_kernel { CGAL_KD_DEFAULT_FUNCTOR(Has_on_positive_side_tag,(CartesianDKernelFunctors::Has_on_positive_side),(),(Oriented_side_tag)); } -#include +#include #endif // CGAL_KERNEL_D_FUNCTION_OBJECTS_CARTESIAN_H diff --git a/NewKernel_d/include/CGAL/Kernel_d/functor_properties.h b/NewKernel_d/include/CGAL/NewKernel_d/functor_properties.h similarity index 100% rename from NewKernel_d/include/CGAL/Kernel_d/functor_properties.h rename to NewKernel_d/include/CGAL/NewKernel_d/functor_properties.h diff --git a/NewKernel_d/include/CGAL/Kernel_d/functor_tags.h b/NewKernel_d/include/CGAL/NewKernel_d/functor_tags.h similarity index 100% rename from NewKernel_d/include/CGAL/Kernel_d/functor_tags.h rename to NewKernel_d/include/CGAL/NewKernel_d/functor_tags.h diff --git a/NewKernel_d/include/CGAL/Kernel_d/interface_macros.h b/NewKernel_d/include/CGAL/NewKernel_d/interface_macros.h similarity index 100% rename from NewKernel_d/include/CGAL/Kernel_d/interface_macros.h rename to NewKernel_d/include/CGAL/NewKernel_d/interface_macros.h diff --git a/NewKernel_d/include/CGAL/Kernel_d/store_kernel.h b/NewKernel_d/include/CGAL/NewKernel_d/store_kernel.h similarity index 100% rename from NewKernel_d/include/CGAL/Kernel_d/store_kernel.h rename to NewKernel_d/include/CGAL/NewKernel_d/store_kernel.h diff --git a/NewKernel_d/test/NewKernel_d/test.cpp b/NewKernel_d/test/NewKernel_d/test.cpp index 9b97ddd0f2f..4ec6b9918ca 100644 --- a/NewKernel_d/test/NewKernel_d/test.cpp +++ b/NewKernel_d/test/NewKernel_d/test.cpp @@ -1,13 +1,13 @@ //#define BOOST_RESULT_OF_USE_DECLTYPE 1 #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include