From 5945e48a3edf52c16b28f5bd3a2c1e87c835b31b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Fri, 17 Sep 2021 08:14:06 +0200 Subject: [PATCH] restore sub-directories accidently removed in 98e471849bd436594aa6c54fb55794321bde2898 --- .../benchmark/Filtered_kernel/Orientation_3.h | 4 +- .../include/CGAL/Filtered_kernel.h | 2 +- .../internal/{ => Static_filters}/Angle_3.h | 4 +- .../{ => Static_filters}/Collinear_3.h | 4 +- .../{ => Static_filters}/Compare_distance_3.h | 2 +- .../Compare_squared_radius_3.h | 2 +- .../Compare_weighted_squared_radius_3.h | 4 +- .../{ => Static_filters}/Compare_x_2.h | 2 +- .../{ => Static_filters}/Compare_y_2.h | 2 +- .../{ => Static_filters}/Compare_y_at_x_2.h | 2 +- .../{ => Static_filters}/Coplanar_3.h | 0 .../Coplanar_orientation_3.h | 0 .../Coplanar_side_of_bounded_circle_3.h | 2 +- .../{ => Static_filters}/Do_intersect_2.h | 0 .../{ => Static_filters}/Do_intersect_3.h | 4 +- .../internal/{ => Static_filters}/Equal_2.h | 2 +- .../internal/{ => Static_filters}/Equal_3.h | 2 +- .../{ => Static_filters}/Is_degenerate_3.h | 0 .../{ => Static_filters}/Orientation_2.h | 2 +- .../{ => Static_filters}/Orientation_3.h | 2 +- .../Power_side_of_oriented_power_sphere_3.h | 4 +- .../Side_of_oriented_circle_2.h | 2 +- .../Side_of_oriented_sphere_3.h | 2 +- .../Static_filter_error.h | 0 .../{ => Static_filters}/Static_filters.h | 44 +++++++++---------- .../internal/{ => Static_filters}/tools.h | 0 Filtered_kernel/include/CGAL/Lazy_kernel.h | 2 +- Mesh_3/benchmark/Mesh_3/StdAfx.h | 8 ++-- .../Mesh_3/Robust_intersection_traits_3.h | 2 +- Nef_3/include/CGAL/Nef_3/Nef_box.h | 2 +- .../NewKernel_d/Cartesian_static_filters.h | 6 +-- ...iangulation_statically_filtered_traits_2.h | 2 +- ...iangulation_statically_filtered_traits_2.h | 2 +- .../Periodic_2_orientation_2.h | 4 +- .../Periodic_2_side_of_oriented_circle_2.h | 6 +-- .../include/CGAL/Periodic_3_triangulation_3.h | 2 +- ...iangulation_statically_filtered_traits_3.h | 2 +- ...iangulation_statically_filtered_traits_3.h | 2 +- ...iangulation_statically_filtered_traits_3.h | 2 +- .../Periodic_3_orientation_3.h | 4 +- ..._3_power_side_of_oriented_power_sphere_3.h | 4 +- .../Periodic_3_side_of_oriented_sphere_3.h | 4 +- .../internal/{ => auxiliary}/graph.h | 0 .../boost/graph/Alpha_expansion_MaxFlow_tag.h | 2 +- .../include/CGAL/Triangulation_2.h | 2 +- .../include/CGAL/Triangulation_3.h | 2 +- 46 files changed, 77 insertions(+), 77 deletions(-) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Angle_3.h (96%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Collinear_3.h (96%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Compare_distance_3.h (98%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Compare_squared_radius_3.h (99%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Compare_weighted_squared_radius_3.h (99%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Compare_x_2.h (96%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Compare_y_2.h (96%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Compare_y_at_x_2.h (96%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Coplanar_3.h (100%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Coplanar_orientation_3.h (100%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Coplanar_side_of_bounded_circle_3.h (97%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Do_intersect_2.h (100%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Do_intersect_3.h (98%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Equal_2.h (97%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Equal_3.h (98%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Is_degenerate_3.h (100%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Orientation_2.h (97%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Orientation_3.h (98%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Power_side_of_oriented_power_sphere_3.h (99%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Side_of_oriented_circle_2.h (98%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Side_of_oriented_sphere_3.h (98%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Static_filter_error.h (100%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/Static_filters.h (85%) rename Filtered_kernel/include/CGAL/Filtered_kernel/internal/{ => Static_filters}/tools.h (100%) rename Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/{ => Static_filters}/Periodic_2_orientation_2.h (98%) rename Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/{ => Static_filters}/Periodic_2_side_of_oriented_circle_2.h (97%) rename Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/{ => Static_filters}/Periodic_3_orientation_3.h (98%) rename Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/{ => Static_filters}/Periodic_3_power_side_of_oriented_power_sphere_3.h (88%) rename Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/{ => Static_filters}/Periodic_3_side_of_oriented_sphere_3.h (98%) rename Surface_mesh_segmentation/include/CGAL/Surface_mesh_segmentation/internal/{ => auxiliary}/graph.h (100%) diff --git a/Filtered_kernel/benchmark/Filtered_kernel/Orientation_3.h b/Filtered_kernel/benchmark/Filtered_kernel/Orientation_3.h index e21ea6d4981..b1ec9224787 100644 --- a/Filtered_kernel/benchmark/Filtered_kernel/Orientation_3.h +++ b/Filtered_kernel/benchmark/Filtered_kernel/Orientation_3.h @@ -12,8 +12,8 @@ #include -#include -#include +#include +#include #include namespace CGAL { namespace internal { namespace Static_filters_predicates { diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel.h b/Filtered_kernel/include/CGAL/Filtered_kernel.h index f412d781922..81b8bd4d07d 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include // This file contains the definition of a generic kernel filter. diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Angle_3.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Angle_3.h similarity index 96% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Angle_3.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Angle_3.h index 15e69d0801a..ac57decb63e 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Angle_3.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Angle_3.h @@ -16,8 +16,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Collinear_3.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Collinear_3.h similarity index 96% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Collinear_3.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Collinear_3.h index 40d32e5c0f0..2be2b768389 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Collinear_3.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Collinear_3.h @@ -14,8 +14,8 @@ #define CGAL_INTERNAL_STATIC_FILTERS_COLLINEAR_3_H #include -#include -#include +#include +#include #include namespace CGAL { namespace internal { namespace Static_filters_predicates { diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Compare_distance_3.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Compare_distance_3.h similarity index 98% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Compare_distance_3.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Compare_distance_3.h index 9655772b136..f3880b3f0e2 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Compare_distance_3.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Compare_distance_3.h @@ -15,7 +15,7 @@ #define CGAL_INTERNAL_STATIC_FILTERS_COMPARE_DISTANCE_3_H #include -#include +#include #include #include diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Compare_squared_radius_3.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Compare_squared_radius_3.h similarity index 99% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Compare_squared_radius_3.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Compare_squared_radius_3.h index a2e35572f9a..8e0683677aa 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Compare_squared_radius_3.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Compare_squared_radius_3.h @@ -15,7 +15,7 @@ #define CGAL_INTERNAL_STATIC_FILTERS_COMPARE_SQUARED_RADIUS_3_H #include -#include +#include #include namespace CGAL { namespace internal { namespace Static_filters_predicates { diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Compare_weighted_squared_radius_3.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Compare_weighted_squared_radius_3.h similarity index 99% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Compare_weighted_squared_radius_3.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Compare_weighted_squared_radius_3.h index b332ac9c4a5..41b9f1b9e77 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Compare_weighted_squared_radius_3.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Compare_weighted_squared_radius_3.h @@ -15,8 +15,8 @@ #define CGAL_INTERNAL_STATIC_FILTERS_COMPARE_WEIGHTED_SQUARED_RADIUS_3_H #include -#include -#include +#include +#include #include diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Compare_x_2.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Compare_x_2.h similarity index 96% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Compare_x_2.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Compare_x_2.h index 8df13f7de1b..29c6d291051 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Compare_x_2.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Compare_x_2.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Compare_y_2.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Compare_y_2.h similarity index 96% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Compare_y_2.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Compare_y_2.h index 8aa302fb504..da9b97215a8 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Compare_y_2.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Compare_y_2.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Compare_y_at_x_2.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Compare_y_at_x_2.h similarity index 96% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Compare_y_at_x_2.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Compare_y_at_x_2.h index 6c3e3e4c687..5de1af9d7b2 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Compare_y_at_x_2.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Compare_y_at_x_2.h @@ -13,7 +13,7 @@ #define CGAL_INTERNAL_STATIC_FILTERS_COMPARE_Y_AT_X_2_H #include -#include +#include #include namespace CGAL { namespace internal { namespace Static_filters_predicates { diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Coplanar_3.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Coplanar_3.h similarity index 100% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Coplanar_3.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Coplanar_3.h diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Coplanar_orientation_3.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Coplanar_orientation_3.h similarity index 100% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Coplanar_orientation_3.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Coplanar_orientation_3.h diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Coplanar_side_of_bounded_circle_3.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Coplanar_side_of_bounded_circle_3.h similarity index 97% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Coplanar_side_of_bounded_circle_3.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Coplanar_side_of_bounded_circle_3.h index 378f1763cc0..48c96ec886c 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Coplanar_side_of_bounded_circle_3.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Coplanar_side_of_bounded_circle_3.h @@ -17,7 +17,7 @@ #include #include #include -// #include // Only used to precompute constants +// #include // Only used to precompute constants namespace CGAL { namespace internal { namespace Static_filters_predicates { diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Do_intersect_2.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Do_intersect_2.h similarity index 100% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Do_intersect_2.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Do_intersect_2.h diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Do_intersect_3.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Do_intersect_3.h similarity index 98% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Do_intersect_3.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Do_intersect_3.h index 8744c8bbf3c..31f71e86b58 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Do_intersect_3.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Do_intersect_3.h @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #include // for CGAL::internal::do_intersect_bbox_segment_aux diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Equal_2.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Equal_2.h similarity index 97% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Equal_2.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Equal_2.h index 4ac61d5d926..60b2360a939 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Equal_2.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Equal_2.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Equal_3.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Equal_3.h similarity index 98% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Equal_3.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Equal_3.h index ecea5750446..10c44051ae2 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Equal_3.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Equal_3.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Is_degenerate_3.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Is_degenerate_3.h similarity index 100% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Is_degenerate_3.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Is_degenerate_3.h diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Orientation_2.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Orientation_2.h similarity index 97% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Orientation_2.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Orientation_2.h index 8f39ebc994f..cbb4494e7cd 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Orientation_2.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Orientation_2.h @@ -15,7 +15,7 @@ #include #include -#include +#include #include diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Orientation_3.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Orientation_3.h similarity index 98% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Orientation_3.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Orientation_3.h index 8852525eb9a..2fdffde6fda 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Orientation_3.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Orientation_3.h @@ -14,7 +14,7 @@ #define CGAL_INTERNAL_STATIC_FILTERS_ORIENTATION_3_H #include -#include +#include #include namespace CGAL { namespace internal { namespace Static_filters_predicates { diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Power_side_of_oriented_power_sphere_3.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Power_side_of_oriented_power_sphere_3.h similarity index 99% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Power_side_of_oriented_power_sphere_3.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Power_side_of_oriented_power_sphere_3.h index 5efa4b115f9..d4621b756a5 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Power_side_of_oriented_power_sphere_3.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Power_side_of_oriented_power_sphere_3.h @@ -15,8 +15,8 @@ #define CGAL_INTERNAL_STATIC_FILTERS_POWER_TEST_3_H #include -#include -#include +#include +#include #include diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Side_of_oriented_circle_2.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Side_of_oriented_circle_2.h similarity index 98% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Side_of_oriented_circle_2.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Side_of_oriented_circle_2.h index 05bdd3f30de..3b59fed08db 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Side_of_oriented_circle_2.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Side_of_oriented_circle_2.h @@ -14,7 +14,7 @@ #define CGAL_INTERNAL_STATIC_FILTERS_SIDE_OF_ORIENTED_CIRCLE_2_H #include -#include +#include #include namespace CGAL { namespace internal { namespace Static_filters_predicates { diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Side_of_oriented_sphere_3.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Side_of_oriented_sphere_3.h similarity index 98% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Side_of_oriented_sphere_3.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Side_of_oriented_sphere_3.h index af3fd6084eb..41a54d33012 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Side_of_oriented_sphere_3.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Side_of_oriented_sphere_3.h @@ -14,7 +14,7 @@ #define CGAL_INTERNAL_STATIC_FILTERS_SIDE_OF_ORIENTED_SPHERE_3_H #include -#include +#include namespace CGAL { namespace internal { namespace Static_filters_predicates { diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filter_error.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Static_filter_error.h similarity index 100% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filter_error.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Static_filter_error.h diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Static_filters.h similarity index 85% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Static_filters.h index 0768f98ed30..72f4d220c09 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Static_filters.h @@ -26,10 +26,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include // for static filters added nov./dec. 2011 #ifdef CGAL_DISABLE_STATIC_FILTERS_ADDED_2011 @@ -42,39 +42,39 @@ #endif // CGAL_DISABLE_STATIC_FILTERS_ADDED_2011 #ifndef CGAL_NO_EQUAL_3_STATIC_FILTERS -# include -# include +# include +# include #endif // NOT CGAL_NO_EQUAL_3_STATIC_FILTERS #ifndef CGAL_NO_COMPARE_X_2_STATIC_FILTERS -# include -# include +# include +# include #endif // NOT CGAL_NO_COMPARE_X_2_STATIC_FILTERS #ifndef CGAL_NO_IS_DEGENERATE_3_STATIC_FILTERS -# include +# include #endif // NOT CGAL_NO_IS_DEGENERATE_3_STATIC_FILTERS #ifndef CGAL_NO_ANGLE_3_STATIC_FILTERS -# include +# include #endif // NOT CGAL_NO_ANGLE_3_STATIC_FILTERS #ifndef CGAL_NO_DO_INTERSECT_STATIC_FILTERS -# include -# include +# include +# include #endif // NOT NOT CGAL_NO_DO_INTERSECT_STATIC_FILTERS -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -// #include -// #include +// #include +// #include // TODO : // - add more predicates : diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/tools.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/tools.h similarity index 100% rename from Filtered_kernel/include/CGAL/Filtered_kernel/internal/tools.h rename to Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/tools.h diff --git a/Filtered_kernel/include/CGAL/Lazy_kernel.h b/Filtered_kernel/include/CGAL/Lazy_kernel.h index e0d89075a1c..b0d0f9707b8 100644 --- a/Filtered_kernel/include/CGAL/Lazy_kernel.h +++ b/Filtered_kernel/include/CGAL/Lazy_kernel.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Mesh_3/benchmark/Mesh_3/StdAfx.h b/Mesh_3/benchmark/Mesh_3/StdAfx.h index 8587b921602..1eb3927c644 100644 --- a/Mesh_3/benchmark/Mesh_3/StdAfx.h +++ b/Mesh_3/benchmark/Mesh_3/StdAfx.h @@ -189,11 +189,11 @@ #include #include //#include -#include -#include +#include +#include //#include -#include -#include +#include +#include //#include //#include #include diff --git a/Mesh_3/include/CGAL/Mesh_3/Robust_intersection_traits_3.h b/Mesh_3/include/CGAL/Mesh_3/Robust_intersection_traits_3.h index 60f1a10b4af..944916523a0 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Robust_intersection_traits_3.h +++ b/Mesh_3/include/CGAL/Mesh_3/Robust_intersection_traits_3.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include namespace CGAL { diff --git a/Nef_3/include/CGAL/Nef_3/Nef_box.h b/Nef_3/include/CGAL/Nef_3/Nef_box.h index 4d1c4e167b0..03a3a883ba8 100644 --- a/Nef_3/include/CGAL/Nef_3/Nef_box.h +++ b/Nef_3/include/CGAL/Nef_3/Nef_box.h @@ -16,7 +16,7 @@ #include #include -#include +#include namespace CGAL { diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_static_filters.h b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_static_filters.h index 7f1cd13d5f7..243b4e756aa 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_static_filters.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_static_filters.h @@ -13,9 +13,9 @@ #define CGAL_KD_CARTESIAN_STATIC_FILTERS_H #include #include -#include // bug, should be included by the next one -#include -#include +#include // bug, should be included by the next one +#include +#include #include namespace CGAL { diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Periodic_2_Delaunay_triangulation_statically_filtered_traits_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Periodic_2_Delaunay_triangulation_statically_filtered_traits_2.h index 9f7ed54424b..180d39e207c 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Periodic_2_Delaunay_triangulation_statically_filtered_traits_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Periodic_2_Delaunay_triangulation_statically_filtered_traits_2.h @@ -14,7 +14,7 @@ #include -#include +#include #include namespace CGAL { diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Periodic_2_triangulation_statically_filtered_traits_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Periodic_2_triangulation_statically_filtered_traits_2.h index 9994f09807d..500df4e46b5 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Periodic_2_triangulation_statically_filtered_traits_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Periodic_2_triangulation_statically_filtered_traits_2.h @@ -24,7 +24,7 @@ #include #include -#include +#include namespace CGAL { diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Periodic_2_orientation_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Static_filters/Periodic_2_orientation_2.h similarity index 98% rename from Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Periodic_2_orientation_2.h rename to Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Static_filters/Periodic_2_orientation_2.h index d55918e6930..255f72b4e63 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Periodic_2_orientation_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Static_filters/Periodic_2_orientation_2.h @@ -15,8 +15,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Periodic_2_side_of_oriented_circle_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Static_filters/Periodic_2_side_of_oriented_circle_2.h similarity index 97% rename from Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Periodic_2_side_of_oriented_circle_2.h rename to Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Static_filters/Periodic_2_side_of_oriented_circle_2.h index d5b7dcd99df..996db9f975a 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Periodic_2_side_of_oriented_circle_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2/internal/Static_filters/Periodic_2_side_of_oriented_circle_2.h @@ -16,10 +16,10 @@ #include -#include +#include #include -#include -#include +#include +#include #include diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h index 97cf5cd0363..a80c3995d5c 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h @@ -38,7 +38,7 @@ #include #ifndef CGAL_NO_STRUCTURAL_FILTERING -#include +#include #include #include #endif // no CGAL_NO_STRUCTURAL_FILTERING diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_Delaunay_triangulation_statically_filtered_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_Delaunay_triangulation_statically_filtered_traits_3.h index 2ae5c6e3dc5..b2a2a8b7e39 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_Delaunay_triangulation_statically_filtered_traits_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_Delaunay_triangulation_statically_filtered_traits_3.h @@ -16,7 +16,7 @@ #include -#include +#include #include namespace CGAL { diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_regular_triangulation_statically_filtered_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_regular_triangulation_statically_filtered_traits_3.h index bc3eb8b6cb2..1dccfa50e5c 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_regular_triangulation_statically_filtered_traits_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_regular_triangulation_statically_filtered_traits_3.h @@ -15,7 +15,7 @@ #include -#include +#include #include namespace CGAL { diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_triangulation_statically_filtered_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_triangulation_statically_filtered_traits_3.h index b21a612935a..34865a17af2 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_triangulation_statically_filtered_traits_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_triangulation_statically_filtered_traits_3.h @@ -15,7 +15,7 @@ #include -#include +#include #include namespace CGAL { diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_orientation_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Static_filters/Periodic_3_orientation_3.h similarity index 98% rename from Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_orientation_3.h rename to Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Static_filters/Periodic_3_orientation_3.h index 172b69628a0..9b19c03f511 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_orientation_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Static_filters/Periodic_3_orientation_3.h @@ -17,8 +17,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_power_side_of_oriented_power_sphere_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Static_filters/Periodic_3_power_side_of_oriented_power_sphere_3.h similarity index 88% rename from Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_power_side_of_oriented_power_sphere_3.h rename to Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Static_filters/Periodic_3_power_side_of_oriented_power_sphere_3.h index e680a7976de..fa8288872a1 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_power_side_of_oriented_power_sphere_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Static_filters/Periodic_3_power_side_of_oriented_power_sphere_3.h @@ -13,8 +13,8 @@ #define CGAL_INTERNAL_STATIC_FILTERS_PERIODIC_3_POWER_TEST_3_H #include -#include -#include +#include +#include #include diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_side_of_oriented_sphere_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Static_filters/Periodic_3_side_of_oriented_sphere_3.h similarity index 98% rename from Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_side_of_oriented_sphere_3.h rename to Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Static_filters/Periodic_3_side_of_oriented_sphere_3.h index 5271e1eaa25..992e60d1ee0 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_side_of_oriented_sphere_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Static_filters/Periodic_3_side_of_oriented_sphere_3.h @@ -17,8 +17,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/Surface_mesh_segmentation/include/CGAL/Surface_mesh_segmentation/internal/graph.h b/Surface_mesh_segmentation/include/CGAL/Surface_mesh_segmentation/internal/auxiliary/graph.h similarity index 100% rename from Surface_mesh_segmentation/include/CGAL/Surface_mesh_segmentation/internal/graph.h rename to Surface_mesh_segmentation/include/CGAL/Surface_mesh_segmentation/internal/auxiliary/graph.h diff --git a/Surface_mesh_segmentation/include/CGAL/boost/graph/Alpha_expansion_MaxFlow_tag.h b/Surface_mesh_segmentation/include/CGAL/boost/graph/Alpha_expansion_MaxFlow_tag.h index beab78dfce9..3b311b70191 100644 --- a/Surface_mesh_segmentation/include/CGAL/boost/graph/Alpha_expansion_MaxFlow_tag.h +++ b/Surface_mesh_segmentation/include/CGAL/boost/graph/Alpha_expansion_MaxFlow_tag.h @@ -20,7 +20,7 @@ namespace MaxFlow { -#include +#include } diff --git a/Triangulation_2/include/CGAL/Triangulation_2.h b/Triangulation_2/include/CGAL/Triangulation_2.h index c4a9db15ce0..75ebfb45a09 100644 --- a/Triangulation_2/include/CGAL/Triangulation_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_2.h @@ -51,7 +51,7 @@ #endif #ifndef CGAL_NO_STRUCTURAL_FILTERING -#include +#include #include #include #endif // no CGAL_NO_STRUCTURAL_FILTERING diff --git a/Triangulation_3/include/CGAL/Triangulation_3.h b/Triangulation_3/include/CGAL/Triangulation_3.h index 0b6ca42d466..3b5509add2b 100644 --- a/Triangulation_3/include/CGAL/Triangulation_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_3.h @@ -68,7 +68,7 @@ #endif #ifndef CGAL_NO_STRUCTURAL_FILTERING -#include +#include #include #include #endif // no CGAL_NO_STRUCTURAL_FILTERING