diff --git a/Algebraic_foundations/include/CGAL/Scalar_factor_traits.h b/Algebraic_foundations/include/CGAL/Scalar_factor_traits.h index afd75f37b71..a1e4dc4e3ab 100644 --- a/Algebraic_foundations/include/CGAL/Scalar_factor_traits.h +++ b/Algebraic_foundations/include/CGAL/Scalar_factor_traits.h @@ -27,6 +27,7 @@ #ifndef CGAL_SCALAR_FACTOR_TRAITS_H #define CGAL_SCALAR_FACTOR_TRAITS_H +#include #include /*! \file NiX/Scalar_factor_traits.h diff --git a/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h b/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h index c88c5d2aa72..1a7649fe88f 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h @@ -28,10 +28,10 @@ // within this file AS ^= Type -#include #include //#include +#include #include #include #include diff --git a/Algebraic_foundations/include/CGAL/Test/_test_fraction_traits.h b/Algebraic_foundations/include/CGAL/Test/_test_fraction_traits.h index d0ad1169d75..5fc863f3505 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_fraction_traits.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_fraction_traits.h @@ -24,7 +24,6 @@ // within this file FT ^= Fraction_traits -#include #include #include #include diff --git a/Algebraic_foundations/include/CGAL/Test/_test_rational_traits.h b/Algebraic_foundations/include/CGAL/Test/_test_rational_traits.h index 46fe242c08e..0e36149a4f4 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_rational_traits.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_rational_traits.h @@ -24,7 +24,6 @@ // within this file FT ^= Fraction_traits -#include #include #include diff --git a/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h b/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h index 961dc0e13a8..3047b8bc08b 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h @@ -24,8 +24,6 @@ // \brief provides test functions for the \c RealEmbeddable concept of // number types. -#include - #include #include #include diff --git a/Algebraic_foundations/test/Algebraic_foundations/Algebraic_extension_traits.cpp b/Algebraic_foundations/test/Algebraic_foundations/Algebraic_extension_traits.cpp index f938c90e6d8..f974955819a 100644 --- a/Algebraic_foundations/test/Algebraic_foundations/Algebraic_extension_traits.cpp +++ b/Algebraic_foundations/test/Algebraic_foundations/Algebraic_extension_traits.cpp @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/Algebraic_foundations/test/Algebraic_foundations/Algebraic_structure_traits.cpp b/Algebraic_foundations/test/Algebraic_foundations/Algebraic_structure_traits.cpp index 9d87938c82b..28f3d1f19e4 100644 --- a/Algebraic_foundations/test/Algebraic_foundations/Algebraic_structure_traits.cpp +++ b/Algebraic_foundations/test/Algebraic_foundations/Algebraic_structure_traits.cpp @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/Algebraic_foundations/test/Algebraic_foundations/Chinese_remainder_traits.cpp b/Algebraic_foundations/test/Algebraic_foundations/Chinese_remainder_traits.cpp index 1e6121f8c91..af39871d95f 100644 --- a/Algebraic_foundations/test/Algebraic_foundations/Chinese_remainder_traits.cpp +++ b/Algebraic_foundations/test/Algebraic_foundations/Chinese_remainder_traits.cpp @@ -29,7 +29,6 @@ // ============================================================================ #undef NDEBUG -#include #include #include #include diff --git a/Algebraic_foundations/test/Algebraic_foundations/Coercion_traits.cpp b/Algebraic_foundations/test/Algebraic_foundations/Coercion_traits.cpp index e125f25d5f0..f9d27b8640b 100644 --- a/Algebraic_foundations/test/Algebraic_foundations/Coercion_traits.cpp +++ b/Algebraic_foundations/test/Algebraic_foundations/Coercion_traits.cpp @@ -1,5 +1,5 @@ -#include #include +#include #include #include int main(){ diff --git a/Algebraic_foundations/test/Algebraic_foundations/Real_embeddable_traits.cpp b/Algebraic_foundations/test/Algebraic_foundations/Real_embeddable_traits.cpp index 28d7a490cc4..721b6cb81c7 100644 --- a/Algebraic_foundations/test/Algebraic_foundations/Real_embeddable_traits.cpp +++ b/Algebraic_foundations/test/Algebraic_foundations/Real_embeddable_traits.cpp @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/Algebraic_foundations/test/Algebraic_foundations/Scalar_factor_traits.cpp b/Algebraic_foundations/test/Algebraic_foundations/Scalar_factor_traits.cpp index f55719e9a78..a67651684e8 100644 --- a/Algebraic_foundations/test/Algebraic_foundations/Scalar_factor_traits.cpp +++ b/Algebraic_foundations/test/Algebraic_foundations/Scalar_factor_traits.cpp @@ -1,5 +1,5 @@ -#include #include +#include #include #include diff --git a/Algebraic_foundations/test/Algebraic_foundations/extended_euclidean_algorithm.cpp b/Algebraic_foundations/test/Algebraic_foundations/extended_euclidean_algorithm.cpp index ef3aebbef16..dac663be466 100644 --- a/Algebraic_foundations/test/Algebraic_foundations/extended_euclidean_algorithm.cpp +++ b/Algebraic_foundations/test/Algebraic_foundations/extended_euclidean_algorithm.cpp @@ -20,7 +20,6 @@ // // ============================================================================ -#include #include #include #include diff --git a/Algebraic_foundations/test/Algebraic_foundations/ipower.cpp b/Algebraic_foundations/test/Algebraic_foundations/ipower.cpp index 18569a161fb..4759ec30f78 100644 --- a/Algebraic_foundations/test/Algebraic_foundations/ipower.cpp +++ b/Algebraic_foundations/test/Algebraic_foundations/ipower.cpp @@ -21,7 +21,6 @@ // // ============================================================================ -#include #include #include diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_curve_kernel_2.cpp b/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_curve_kernel_2.cpp index 8b0301a451d..b44ed894399 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_curve_kernel_2.cpp +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_curve_kernel_2.cpp @@ -18,7 +18,6 @@ #define CGAL_AK_ENABLE_DEPRECATED_INTERFACE 1 #include -#include #include diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_kernel_d_1.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_kernel_d_1.h index a1987a44ca1..e12bfc06b14 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_kernel_d_1.h +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_kernel_d_1.h @@ -16,7 +16,6 @@ #define CGAL_TEST_ALL_AK_VARIANTS 1 -#include #include #include #include diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_kernel_d_2.cpp b/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_kernel_d_2.cpp index f075abe0212..4421850d42a 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_kernel_d_2.cpp +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_kernel_d_2.cpp @@ -18,7 +18,6 @@ //#define CGAL_AK_ENABLE_DEPRECATED_INTERFACE 1 #include -#include #include diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_real_d_1.cpp b/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_real_d_1.cpp index 81d28a9f107..226d06d8527 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_real_d_1.cpp +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/Algebraic_real_d_1.cpp @@ -18,8 +18,6 @@ This is the test file for the class NiX::Algebraic_real_d_1. */ -#include - #include #include diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/Bitstream_descartes.cpp b/Algebraic_kernel_d/test/Algebraic_kernel_d/Bitstream_descartes.cpp index 64b62dca7ab..09a572c18cb 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/Bitstream_descartes.cpp +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/Bitstream_descartes.cpp @@ -19,7 +19,6 @@ */ -#include #include // include these traits here by 'hand', since not in release 3.3 diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/Curve_pair_analysis_2.cpp b/Algebraic_kernel_d/test/Algebraic_kernel_d/Curve_pair_analysis_2.cpp index 40daac26aa1..7b13743ffbd 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/Curve_pair_analysis_2.cpp +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/Curve_pair_analysis_2.cpp @@ -21,7 +21,6 @@ #endif #endif -#include #include diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/Descartes.cpp b/Algebraic_kernel_d/test/Algebraic_kernel_d/Descartes.cpp index 3f9435b38cc..96d42c984b8 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/Descartes.cpp +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/Descartes.cpp @@ -19,8 +19,6 @@ */ -#include - // include these traits here by 'hand', since not in release 3.3 #include #include diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/Real_embeddable_traits_extension.cpp b/Algebraic_kernel_d/test/Algebraic_kernel_d/Real_embeddable_traits_extension.cpp index 40bea31f5bc..fc3a48cdc4c 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/Real_embeddable_traits_extension.cpp +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/Real_embeddable_traits_extension.cpp @@ -24,7 +24,6 @@ -#include #include #include diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/algebraic_curve_kernel_2_tools.cpp b/Algebraic_kernel_d/test/Algebraic_kernel_d/algebraic_curve_kernel_2_tools.cpp index cd3695355cc..a25ea770526 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/algebraic_curve_kernel_2_tools.cpp +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/algebraic_curve_kernel_2_tools.cpp @@ -13,8 +13,6 @@ #include -#include - #include #include diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/cyclic.cpp b/Algebraic_kernel_d/test/Algebraic_kernel_d/cyclic.cpp index dad7e3fd0a1..4d9bdbdf806 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/cyclic.cpp +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/cyclic.cpp @@ -1,5 +1,5 @@ -#include +#include #include #ifdef CGAL_HAS_CORE_ARITHMETIC_KERNEL diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_curve_kernel_2.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_curve_kernel_2.h index c5e242e57a2..919c4b7fe1c 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_curve_kernel_2.h +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_curve_kernel_2.h @@ -21,10 +21,12 @@ // // ============================================================================ -#include -#include +#include +#include + +#include +#include -//#include #ifndef CGAL_TEST_ALGEBRAIC_CURVE_KERNEL_2_H #define CGAL_TEST_ALGEBRAIC_CURVE_KERNEL_2_H diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_1.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_1.h index b84293b0c69..250e6f11934 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_1.h +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_1.h @@ -21,7 +21,6 @@ // // ============================================================================ -#include #include #include #include diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_2.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_2.h index 1de44826604..eb1643d06ea 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_2.h +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_2.h @@ -20,7 +20,6 @@ // // ============================================================================ -#include #include #include diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_bitstream_descartes.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_bitstream_descartes.h index 944abeab5e3..bacc94179fd 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_bitstream_descartes.h +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_bitstream_descartes.h @@ -24,8 +24,6 @@ // #include -#include - #include #include #include diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_comparable.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_comparable.h index c51798e124f..4811dc2d882 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_comparable.h +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_comparable.h @@ -31,12 +31,8 @@ #ifndef CGAL_TEST_REAL_COMPARABLE_H #define CGAL_TEST_REAL_COMPARABLE_H -#include #include #include -/*#include -#include -#include */ #include #include #include diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_root_isolator.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_root_isolator.h index 9c0693b5535..1004ef75c75 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_root_isolator.h +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_root_isolator.h @@ -23,7 +23,6 @@ // TODO: The comments are all original EXACUS comments and aren't adapted. So // they may be wrong now. -#include #include #include diff --git a/Apollonius_graph_2/test/Apollonius_graph_2/include/IO/Null_output_stream.h b/Apollonius_graph_2/test/Apollonius_graph_2/include/IO/Null_output_stream.h index d5d2210f060..2caa189aa95 100644 --- a/Apollonius_graph_2/test/Apollonius_graph_2/include/IO/Null_output_stream.h +++ b/Apollonius_graph_2/test/Apollonius_graph_2/include/IO/Null_output_stream.h @@ -26,8 +26,6 @@ #ifndef CGAL_NULL_OUTPUT_STREAM_H #define CGAL_NULL_OUTPUT_STREAM_H -#include - namespace CGAL { diff --git a/Apollonius_graph_2/test/Apollonius_graph_2/include/test.h b/Apollonius_graph_2/test/Apollonius_graph_2/include/test.h index a87f00f5a17..666f5e13166 100644 --- a/Apollonius_graph_2/test/Apollonius_graph_2/include/test.h +++ b/Apollonius_graph_2/test/Apollonius_graph_2/include/test.h @@ -1,7 +1,6 @@ #ifndef CGAL_APOLLONIUS_GRAPH_2_TEST_H #define CGAL_APOLLONIUS_GRAPH_2_TEST_H -#include #include #include #include diff --git a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag2.cpp b/Apollonius_graph_2/test/Apollonius_graph_2/test_ag2.cpp index 1fc81aaa1ba..22c23e75145 100644 --- a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag2.cpp +++ b/Apollonius_graph_2/test/Apollonius_graph_2/test_ag2.cpp @@ -1,4 +1,3 @@ -#include #include #include diff --git a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_hierarchy_2.cpp b/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_hierarchy_2.cpp index 7546bd42bed..51baa1a0cab 100644 --- a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_hierarchy_2.cpp +++ b/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_hierarchy_2.cpp @@ -1,4 +1,3 @@ -#include #include #include diff --git a/Arithmetic_kernel/test/Arithmetic_kernel/Arithmetic_kernel.cpp b/Arithmetic_kernel/test/Arithmetic_kernel/Arithmetic_kernel.cpp index 890467c3f73..1bb1400beea 100644 --- a/Arithmetic_kernel/test/Arithmetic_kernel/Arithmetic_kernel.cpp +++ b/Arithmetic_kernel/test/Arithmetic_kernel/Arithmetic_kernel.cpp @@ -1,5 +1,5 @@ #include -#include + #include #if defined(CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL) diff --git a/Arithmetic_kernel/test/Arithmetic_kernel/CORE_arithmetic_kernel.cpp b/Arithmetic_kernel/test/Arithmetic_kernel/CORE_arithmetic_kernel.cpp index 4a20d786ec2..8b874751511 100644 --- a/Arithmetic_kernel/test/Arithmetic_kernel/CORE_arithmetic_kernel.cpp +++ b/Arithmetic_kernel/test/Arithmetic_kernel/CORE_arithmetic_kernel.cpp @@ -1,5 +1,4 @@ #include -#include #include diff --git a/Arithmetic_kernel/test/Arithmetic_kernel/GMPXX_arithmetic_kernel.cpp b/Arithmetic_kernel/test/Arithmetic_kernel/GMPXX_arithmetic_kernel.cpp index b51a5d6de00..adf5508caa9 100644 --- a/Arithmetic_kernel/test/Arithmetic_kernel/GMPXX_arithmetic_kernel.cpp +++ b/Arithmetic_kernel/test/Arithmetic_kernel/GMPXX_arithmetic_kernel.cpp @@ -1,5 +1,5 @@ #include -#include + #include #ifdef CGAL_USE_GMPXX diff --git a/Arithmetic_kernel/test/Arithmetic_kernel/GMP_arithmetic_kernel.cpp b/Arithmetic_kernel/test/Arithmetic_kernel/GMP_arithmetic_kernel.cpp index 26320a91047..a9334033d0c 100644 --- a/Arithmetic_kernel/test/Arithmetic_kernel/GMP_arithmetic_kernel.cpp +++ b/Arithmetic_kernel/test/Arithmetic_kernel/GMP_arithmetic_kernel.cpp @@ -1,5 +1,5 @@ #include -#include + #include #ifdef CGAL_HAS_GMP_ARITHMETIC_KERNEL diff --git a/Arithmetic_kernel/test/Arithmetic_kernel/Get_arithmetic_kernel.cpp b/Arithmetic_kernel/test/Arithmetic_kernel/Get_arithmetic_kernel.cpp index 5a563839d4f..0dacebfcb77 100644 --- a/Arithmetic_kernel/test/Arithmetic_kernel/Get_arithmetic_kernel.cpp +++ b/Arithmetic_kernel/test/Arithmetic_kernel/Get_arithmetic_kernel.cpp @@ -1,6 +1,6 @@ #include -#include + #include #include #include diff --git a/Arithmetic_kernel/test/Arithmetic_kernel/LEDA_arithmetic_kernel.cpp b/Arithmetic_kernel/test/Arithmetic_kernel/LEDA_arithmetic_kernel.cpp index 74ae1f33dfe..a17df95e767 100644 --- a/Arithmetic_kernel/test/Arithmetic_kernel/LEDA_arithmetic_kernel.cpp +++ b/Arithmetic_kernel/test/Arithmetic_kernel/LEDA_arithmetic_kernel.cpp @@ -1,5 +1,5 @@ #include -#include + #include #ifdef CGAL_HAS_LEDA_ARITHMETIC_KERNEL diff --git a/Arithmetic_kernel/test/Arithmetic_kernel/include/CGAL/Test/_test_arithmetic_kernel.h b/Arithmetic_kernel/test/Arithmetic_kernel/include/CGAL/Test/_test_arithmetic_kernel.h index ea092512083..5f9525e86ca 100644 --- a/Arithmetic_kernel/test/Arithmetic_kernel/include/CGAL/Test/_test_arithmetic_kernel.h +++ b/Arithmetic_kernel/test/Arithmetic_kernel/include/CGAL/Test/_test_arithmetic_kernel.h @@ -26,7 +26,7 @@ #ifndef CGAL_TEST_ARITHMETIC_KERNEL_H #define CGAL_TEST_ARITHMETIC_KERNEL_H -#include + #include namespace CGAL { diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_circular_line_arc_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_circular_line_arc_traits_2.h index 463588b9b1f..9d6967e4b46 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_circular_line_arc_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_circular_line_arc_traits_2.h @@ -43,6 +43,8 @@ #include #include +#include + namespace CGAL { namespace VariantFunctors{ diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Batched_point_location_test.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Batched_point_location_test.h index 18d16894804..963f4cdc8f1 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Batched_point_location_test.h +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Batched_point_location_test.h @@ -5,7 +5,6 @@ #include #include -#include #include #include diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Construction_test.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Construction_test.h index 9aae6a62e83..f0cb8b30e63 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Construction_test.h +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Construction_test.h @@ -6,7 +6,7 @@ #include #include -#include + #include #include #include diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Overlay_test.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Overlay_test.h index 211169fe288..6a45618aeb9 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Overlay_test.h +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Overlay_test.h @@ -6,7 +6,7 @@ #include #include -#include + #include #include #include diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_dynamic_test.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_dynamic_test.h index 4c851cb0e72..0c23728c5bb 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_dynamic_test.h +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_dynamic_test.h @@ -1,7 +1,6 @@ #ifndef CGAL_POINT_LOCATION_DYNAMIC_TEST_H #define CGAL_POINT_LOCATION_DYNAMIC_TEST_H -#include #include "Point_location_test.h" diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_test.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_test.h index d18fdc47f67..28c69831a9e 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_test.h +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_test.h @@ -16,7 +16,6 @@ #include -#include #include #include #include diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Segment_reader.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Segment_reader.h index cf8a81bd108..7fb5476ace5 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Segment_reader.h +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Segment_reader.h @@ -1,7 +1,6 @@ #ifndef SEGMENT_READER_H #define SEGMENT_READER_H -#include #include #include #include diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_base_test.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_base_test.h index 0457ad0504f..1d95d3eefef 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_base_test.h +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_base_test.h @@ -1,7 +1,6 @@ #ifndef CGAL_TRAITS_BASE_TEST_H #define CGAL_TRAITS_BASE_TEST_H -#include #include #include diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_test.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_test.h index b035ef73c33..b69443c205d 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_test.h +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_test.h @@ -1,7 +1,6 @@ #ifndef CGAL_TRAITS_TEST_H #define CGAL_TRAITS_TEST_H -#include #include #include diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Vertical_decomposition_test.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Vertical_decomposition_test.h index adcc6533c06..dbe744c9fdd 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Vertical_decomposition_test.h +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Vertical_decomposition_test.h @@ -5,7 +5,7 @@ #include #include -#include + #include #include diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_arc_polycurve.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_arc_polycurve.cpp index e8075d66b95..56ff34ec53b 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_arc_polycurve.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_arc_polycurve.cpp @@ -1,7 +1,7 @@ // Constructing an arrangement of polycurves. -#include +#include #ifndef CGAL_USE_CORE #include int main() diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_batched_point_location.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_batched_point_location.cpp index 2983da5a445..ad3e9e86dae 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_batched_point_location.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_batched_point_location.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include "test_configuration.h" diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_bezier_polycurve.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_bezier_polycurve.cpp index c19425ba93e..4dec1318a6d 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_bezier_polycurve.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_bezier_polycurve.cpp @@ -1,4 +1,4 @@ -#include +#include #ifndef CGAL_USE_CORE #include diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_circular_arc_polycurve.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_circular_arc_polycurve.cpp index 84a86f283e0..1cf5a0e06f8 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_circular_arc_polycurve.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_circular_arc_polycurve.cpp @@ -1,7 +1,7 @@ // Constructing an arrangement of polycurves. -#include +#include #ifndef CGAL_USE_CORE #include int main () diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_conic_polycurve.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_conic_polycurve.cpp index 086e6e834a2..eab53350ab6 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_conic_polycurve.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_conic_polycurve.cpp @@ -1,6 +1,6 @@ // Testing the do_equal function -#include +#include #ifndef CGAL_USE_CORE #include int main() diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_construction.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_construction.cpp index 94bdea197ff..00d885fdb7f 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_construction.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_construction.cpp @@ -5,7 +5,7 @@ #include "test_configuration.h" -#include +#include #if ((TEST_GEOM_TRAITS == CORE_CONIC_GEOM_TRAITS) || \ (TEST_GEOM_TRAITS == BEZIER_GEOM_TRAITS) || \ diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_overlay.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_overlay.cpp index 2274bbbf97a..6077f7efa35 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_overlay.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_overlay.cpp @@ -32,7 +32,7 @@ #include "test_configuration.h" -#include +#include #if ((TEST_GEOM_TRAITS == CORE_CONIC_GEOM_TRAITS) || \ (TEST_GEOM_TRAITS == BEZIER_GEOM_TRAITS) || \ diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location.cpp index cba42a891eb..4bb7a0e0b1d 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location.cpp @@ -2,7 +2,7 @@ #include "test_configuration.h" -#include +#include #if ((TEST_GEOM_TRAITS == CORE_CONIC_GEOM_TRAITS) || \ (TEST_GEOM_TRAITS == BEZIER_GEOM_TRAITS) || \ diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location_dynamic.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location_dynamic.cpp index eb15bcb32cf..4ecd96f4ddb 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location_dynamic.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location_dynamic.cpp @@ -2,7 +2,7 @@ #include "test_configuration.h" -#include +#include #if ((TEST_GEOM_TRAITS == CORE_CONIC_GEOM_TRAITS) || \ (TEST_GEOM_TRAITS == BEZIER_GEOM_TRAITS) || \ diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_rational_function_traits_2.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_rational_function_traits_2.cpp index 407d5e27016..f695982c1fb 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_rational_function_traits_2.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_rational_function_traits_2.cpp @@ -1,6 +1,6 @@ #include -#include +#include #if !defined(CGAL_USE_CORE) int main() diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_tags.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_tags.cpp index 3da4a0d70ec..167a5be79e6 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_tags.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_tags.cpp @@ -1,4 +1,4 @@ -#include + #include #include diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_traits.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_traits.cpp index 3d876196d87..9b7958c5700 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_traits.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_traits.cpp @@ -1,4 +1,4 @@ -#include + #include "test_configuration.h" #include diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_traits_adaptor.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_traits_adaptor.cpp index 8f0e88de89b..36127580b9d 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_traits_adaptor.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_traits_adaptor.cpp @@ -1,4 +1,4 @@ -#include + #include "test_configuration.h" #include diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_traits_dispatching.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_traits_dispatching.cpp index 94595c96a80..4c3f2391be1 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_traits_dispatching.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_traits_dispatching.cpp @@ -1,4 +1,3 @@ -#include #include #include diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_unbounded_rational_direct_insertion.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_unbounded_rational_direct_insertion.cpp index dd3d5db1936..191eb1bd367 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_unbounded_rational_direct_insertion.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_unbounded_rational_direct_insertion.cpp @@ -17,7 +17,7 @@ * Thus, a special treatment is required. */ -#include +#include #ifndef CGAL_USE_CORE #include diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_unbounded_rational_insertion.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_unbounded_rational_insertion.cpp index 227b37602b3..05c6bafb58f 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_unbounded_rational_insertion.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_unbounded_rational_insertion.cpp @@ -17,7 +17,7 @@ * Thus, a special treatment is required. */ -#include +#include #ifndef CGAL_USE_CORE #include diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_vertical_decomposition.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_vertical_decomposition.cpp index da447b2b993..3eae7596c98 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_vertical_decomposition.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_vertical_decomposition.cpp @@ -1,7 +1,6 @@ #include #include -#include #include "test_configuration.h" diff --git a/Boolean_set_operations_2/test/Boolean_set_operations_2/test_polygon_validation.cpp b/Boolean_set_operations_2/test/Boolean_set_operations_2/test_polygon_validation.cpp index 7af2ffb9625..c613c2884fc 100644 --- a/Boolean_set_operations_2/test/Boolean_set_operations_2/test_polygon_validation.cpp +++ b/Boolean_set_operations_2/test/Boolean_set_operations_2/test_polygon_validation.cpp @@ -2,7 +2,6 @@ * defined at Gps_polygon_validation.h */ -#include #include #include diff --git a/Bounding_volumes/test/Bounding_volumes/interface_check.cpp b/Bounding_volumes/test/Bounding_volumes/interface_check.cpp index fefcf068f80..da89a420364 100644 --- a/Bounding_volumes/test/Bounding_volumes/interface_check.cpp +++ b/Bounding_volumes/test/Bounding_volumes/interface_check.cpp @@ -3,7 +3,6 @@ // // Compatibility: works with or without CGAL -#include #include #include diff --git a/Bounding_volumes/test/Bounding_volumes/lp-alg-double.cpp b/Bounding_volumes/test/Bounding_volumes/lp-alg-double.cpp index 2a859e6f5fe..e2d7e56fec6 100644 --- a/Bounding_volumes/test/Bounding_volumes/lp-alg-double.cpp +++ b/Bounding_volumes/test/Bounding_volumes/lp-alg-double.cpp @@ -11,7 +11,6 @@ // // Compatibility: works with or without CGAL -#include #include #include diff --git a/Bounding_volumes/test/Bounding_volumes/lp-alg-exact.cpp b/Bounding_volumes/test/Bounding_volumes/lp-alg-exact.cpp index 9afcda4e4bd..963a7a6d023 100644 --- a/Bounding_volumes/test/Bounding_volumes/lp-alg-exact.cpp +++ b/Bounding_volumes/test/Bounding_volumes/lp-alg-exact.cpp @@ -7,7 +7,6 @@ // // Compatibility: works with or without CGAL -#include #include #include #include diff --git a/Bounding_volumes/test/Bounding_volumes/min_sphere_test.cpp b/Bounding_volumes/test/Bounding_volumes/min_sphere_test.cpp index c7295dfd70a..a90021606cb 100644 --- a/Bounding_volumes/test/Bounding_volumes/min_sphere_test.cpp +++ b/Bounding_volumes/test/Bounding_volumes/min_sphere_test.cpp @@ -28,7 +28,6 @@ // hack to overcome external linkage conflict warning in MIPS #define __SGI_STL_INTERNAL_RELOPS -#include #include #include diff --git a/Bounding_volumes/test/Bounding_volumes/min_sphere_traits_2_test.cpp b/Bounding_volumes/test/Bounding_volumes/min_sphere_traits_2_test.cpp index 08e0df4fe09..0f137fd20ff 100644 --- a/Bounding_volumes/test/Bounding_volumes/min_sphere_traits_2_test.cpp +++ b/Bounding_volumes/test/Bounding_volumes/min_sphere_traits_2_test.cpp @@ -29,9 +29,6 @@ // hack to overcome external linkage conflict warning in MIPS #define __SGI_STL_INTERNAL_RELOPS -#include - - #include #include #include diff --git a/Bounding_volumes/test/Bounding_volumes/min_sphere_traits_3_test.cpp b/Bounding_volumes/test/Bounding_volumes/min_sphere_traits_3_test.cpp index 1c5aff7f33a..efb0bed98c8 100644 --- a/Bounding_volumes/test/Bounding_volumes/min_sphere_traits_3_test.cpp +++ b/Bounding_volumes/test/Bounding_volumes/min_sphere_traits_3_test.cpp @@ -25,7 +25,6 @@ // implementation: dD Smallest Enclosing Sphere // ============================================================================ -#include #include #include #include diff --git a/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circular_arc_point_3.h b/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circular_arc_point_3.h index 3d5008954a0..ef5c1c0cc5e 100644 --- a/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circular_arc_point_3.h +++ b/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circular_arc_point_3.h @@ -27,7 +27,7 @@ #define CGAL_SPHERICAL_KERNEL_PREDICATES_ON_CIRCULAR_ARC_POINT_3_H #include - +#include namespace CGAL { namespace SphericalFunctors { diff --git a/Circulator/include/CGAL/circulator.h b/Circulator/include/CGAL/circulator.h index a90474aef4c..aa70e9785ed 100644 --- a/Circulator/include/CGAL/circulator.h +++ b/Circulator/include/CGAL/circulator.h @@ -30,6 +30,7 @@ #include #include #include +#include #include #include diff --git a/Circulator/package_info/Circulator/dependencies b/Circulator/package_info/Circulator/dependencies index 0e9ae985590..570e3cdf474 100644 --- a/Circulator/package_info/Circulator/dependencies +++ b/Circulator/package_info/Circulator/dependencies @@ -3,3 +3,4 @@ Installation Kernel_23 Profiling_tools STL_Extension +Stream_support diff --git a/Circulator/test/Circulator/test_circ1.cpp b/Circulator/test/Circulator/test_circ1.cpp index 6f9bdb26b06..894bb4d4fc2 100644 --- a/Circulator/test/Circulator/test_circ1.cpp +++ b/Circulator/test/Circulator/test_circ1.cpp @@ -25,7 +25,6 @@ // ============================================================================ -#include #include #include #include diff --git a/Circulator/test/Circulator/test_circ2.cpp b/Circulator/test/Circulator/test_circ2.cpp index 5be80c44cb3..6e4ae25caa7 100644 --- a/Circulator/test/Circulator/test_circ2.cpp +++ b/Circulator/test/Circulator/test_circ2.cpp @@ -25,7 +25,6 @@ // ============================================================================ -#include #include #include #include diff --git a/Classification/include/CGAL/Classification/Feature/Vertical_dispersion.h b/Classification/include/CGAL/Classification/Feature/Vertical_dispersion.h index 2c23f4046f1..13713b414dc 100644 --- a/Classification/include/CGAL/Classification/Feature/Vertical_dispersion.h +++ b/Classification/include/CGAL/Classification/Feature/Vertical_dispersion.h @@ -32,6 +32,7 @@ #include #include #include +#include #include namespace CGAL { diff --git a/Convex_hull_d/test/Convex_hull_d/chull_d-test.cpp b/Convex_hull_d/test/Convex_hull_d/chull_d-test.cpp index 16efa8310b1..1b88e25ab76 100644 --- a/Convex_hull_d/test/Convex_hull_d/chull_d-test.cpp +++ b/Convex_hull_d/test/Convex_hull_d/chull_d-test.cpp @@ -1,6 +1,5 @@ #include -#include #include #include #include diff --git a/Convex_hull_d/test/Convex_hull_d/delaunay_d-test.cpp b/Convex_hull_d/test/Convex_hull_d/delaunay_d-test.cpp index 72bfb288c6c..5815e5affc5 100644 --- a/Convex_hull_d/test/Convex_hull_d/delaunay_d-test.cpp +++ b/Convex_hull_d/test/Convex_hull_d/delaunay_d-test.cpp @@ -1,6 +1,5 @@ #include -#include #include #include #include diff --git a/Convex_hull_d/test/Convex_hull_d/include/CGAL/test_macros.h b/Convex_hull_d/test/Convex_hull_d/include/CGAL/test_macros.h index 7cede2731f8..7c20753f5ea 100644 --- a/Convex_hull_d/test/Convex_hull_d/include/CGAL/test_macros.h +++ b/Convex_hull_d/test/Convex_hull_d/include/CGAL/test_macros.h @@ -1,7 +1,7 @@ #ifndef CGAL_TEST_MACROS_H #define CGAL_TEST_MACROS_H -#include +#include #include #include #include diff --git a/Envelope_3/test/Envelope_3/spheres_test.cpp b/Envelope_3/test/Envelope_3/spheres_test.cpp index bb7d91d54a1..e015b0e71db 100644 --- a/Envelope_3/test/Envelope_3/spheres_test.cpp +++ b/Envelope_3/test/Envelope_3/spheres_test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #if !defined(CGAL_USE_CORE) diff --git a/Generator/include/CGAL/point_generators_d.h b/Generator/include/CGAL/point_generators_d.h index c7f40cbf5a7..2016eacc4dd 100644 --- a/Generator/include/CGAL/point_generators_d.h +++ b/Generator/include/CGAL/point_generators_d.h @@ -28,6 +28,7 @@ #include #include #include +#include namespace CGAL { diff --git a/Geomview/test/Geomview/kernel_objects.cpp b/Geomview/test/Geomview/kernel_objects.cpp index a73a3962164..13adb554f65 100644 --- a/Geomview/test/Geomview/kernel_objects.cpp +++ b/Geomview/test/Geomview/kernel_objects.cpp @@ -3,7 +3,7 @@ // // Sylvain Pion, 2000. -#include +#include #ifndef CGAL_USE_GEOMVIEW #include diff --git a/Hash_map/test/Hash_map/include/CGAL/test_macros.h b/Hash_map/test/Hash_map/include/CGAL/test_macros.h index 7cede2731f8..7c20753f5ea 100644 --- a/Hash_map/test/Hash_map/include/CGAL/test_macros.h +++ b/Hash_map/test/Hash_map/include/CGAL/test_macros.h @@ -1,7 +1,7 @@ #ifndef CGAL_TEST_MACROS_H #define CGAL_TEST_MACROS_H -#include +#include #include #include #include diff --git a/Interpolation/test/Interpolation/test_regular_neighbors_2.cpp b/Interpolation/test/Interpolation/test_regular_neighbors_2.cpp index aea65b1b575..8d7464ec42d 100644 --- a/Interpolation/test/Interpolation/test_regular_neighbors_2.cpp +++ b/Interpolation/test/Interpolation/test_regular_neighbors_2.cpp @@ -20,7 +20,6 @@ #include -#include #include #include diff --git a/Interval_support/test/Interval_support/Bigfloat_interval_traits.cpp b/Interval_support/test/Interval_support/Bigfloat_interval_traits.cpp index f9aea1db714..8a356df0b86 100644 --- a/Interval_support/test/Interval_support/Bigfloat_interval_traits.cpp +++ b/Interval_support/test/Interval_support/Bigfloat_interval_traits.cpp @@ -1,5 +1,4 @@ -#include #include #include diff --git a/Interval_support/test/Interval_support/Interval_traits.cpp b/Interval_support/test/Interval_support/Interval_traits.cpp index a749bf68e9a..db8728c0bb7 100644 --- a/Interval_support/test/Interval_support/Interval_traits.cpp +++ b/Interval_support/test/Interval_support/Interval_traits.cpp @@ -1,5 +1,4 @@ -#include #include #include #include diff --git a/Interval_support/test/Interval_support/convert_to_bfi.cpp b/Interval_support/test/Interval_support/convert_to_bfi.cpp index f3b9040b156..d62f9b2207a 100644 --- a/Interval_support/test/Interval_support/convert_to_bfi.cpp +++ b/Interval_support/test/Interval_support/convert_to_bfi.cpp @@ -1,9 +1,7 @@ -#include -#include #include #include - +#include int main(){ diff --git a/Kernel_d/test/Kernel_d/Linear_algebra-test.cpp b/Kernel_d/test/Kernel_d/Linear_algebra-test.cpp index af5a3cad1be..543de175b53 100644 --- a/Kernel_d/test/Kernel_d/Linear_algebra-test.cpp +++ b/Kernel_d/test/Kernel_d/Linear_algebra-test.cpp @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/Kernel_d/test/Kernel_d/afftrafo-test.cpp b/Kernel_d/test/Kernel_d/afftrafo-test.cpp index b4d67772542..3680fa81a69 100644 --- a/Kernel_d/test/Kernel_d/afftrafo-test.cpp +++ b/Kernel_d/test/Kernel_d/afftrafo-test.cpp @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/Kernel_d/test/Kernel_d/include/CGAL/test_macros.h b/Kernel_d/test/Kernel_d/include/CGAL/test_macros.h index 981dd9e5c1c..d675fe6ff5a 100644 --- a/Kernel_d/test/Kernel_d/include/CGAL/test_macros.h +++ b/Kernel_d/test/Kernel_d/include/CGAL/test_macros.h @@ -1,7 +1,6 @@ #ifndef CGAL_TEST_MACROS_H #define CGAL_TEST_MACROS_H -#include #include #include #include diff --git a/Kernel_d/test/Kernel_d/interface-test.cpp b/Kernel_d/test/Kernel_d/interface-test.cpp index f1ecab8c178..7c609afba2a 100644 --- a/Kernel_d/test/Kernel_d/interface-test.cpp +++ b/Kernel_d/test/Kernel_d/interface-test.cpp @@ -1,10 +1,3 @@ -//--------------------------------------------------------------------- -// file generated by notangle from noweb/Kernel_d-tests.lw -// please debug or modify noweb file -// coding: M. Seel -//--------------------------------------------------------------------- - -#include #include #include #include diff --git a/Kernel_d/test/Kernel_d/intersection-test.cpp b/Kernel_d/test/Kernel_d/intersection-test.cpp index e5af6c223b8..c54c275f588 100644 --- a/Kernel_d/test/Kernel_d/intersection-test.cpp +++ b/Kernel_d/test/Kernel_d/intersection-test.cpp @@ -1,10 +1,3 @@ -//--------------------------------------------------------------------- -// file generated by notangle from noweb/Kernel_d-tests.lw -// please debug or modify noweb file -// coding: M. Seel -//--------------------------------------------------------------------- - -#include #include #include #include diff --git a/Mesh_2/test/Mesh_2/test_double_map.cpp b/Mesh_2/test/Mesh_2/test_double_map.cpp index 7d05a3f7cfc..9dd086b2e30 100644 --- a/Mesh_2/test/Mesh_2/test_double_map.cpp +++ b/Mesh_2/test/Mesh_2/test_double_map.cpp @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/Mesh_2/test/Mesh_2/test_filtred_container.cpp b/Mesh_2/test/Mesh_2/test_filtred_container.cpp index 3d8a199beba..fed5c3c2967 100644 --- a/Mesh_2/test/Mesh_2/test_filtred_container.cpp +++ b/Mesh_2/test/Mesh_2/test_filtred_container.cpp @@ -1,4 +1,3 @@ -#include #include #include diff --git a/Minkowski_sum_2/test/Minkowski_sum_2/test_exact_offset.cpp b/Minkowski_sum_2/test/Minkowski_sum_2/test_exact_offset.cpp index b2eef25b687..9675a95ff54 100644 --- a/Minkowski_sum_2/test/Minkowski_sum_2/test_exact_offset.cpp +++ b/Minkowski_sum_2/test/Minkowski_sum_2/test_exact_offset.cpp @@ -1,4 +1,4 @@ -#include +#include #ifndef CGAL_USE_CORE diff --git a/Minkowski_sum_2/test/Minkowski_sum_2/test_minkowski_sum.cpp b/Minkowski_sum_2/test/Minkowski_sum_2/test_minkowski_sum.cpp index 5792752dabb..09c0ad4b089 100644 --- a/Minkowski_sum_2/test/Minkowski_sum_2/test_minkowski_sum.cpp +++ b/Minkowski_sum_2/test/Minkowski_sum_2/test_minkowski_sum.cpp @@ -1,5 +1,3 @@ -#include - #include #include #include diff --git a/Minkowski_sum_2/test/Minkowski_sum_2/test_minkowski_sum_with_holes.cpp b/Minkowski_sum_2/test/Minkowski_sum_2/test_minkowski_sum_with_holes.cpp index c887fef70e5..6a3fe2917b1 100644 --- a/Minkowski_sum_2/test/Minkowski_sum_2/test_minkowski_sum_with_holes.cpp +++ b/Minkowski_sum_2/test/Minkowski_sum_2/test_minkowski_sum_with_holes.cpp @@ -1,5 +1,3 @@ -#include - #include #include #include diff --git a/Modifier/test/Modifier/test_modifier.cpp b/Modifier/test/Modifier/test_modifier.cpp index a1ce5e2b616..b247c524476 100644 --- a/Modifier/test/Modifier/test_modifier.cpp +++ b/Modifier/test/Modifier/test_modifier.cpp @@ -11,7 +11,7 @@ // release : $CGAL_Revision: $ // release_date : $CGAL_Date: $ // -// file : test_modifier.C +// file : test_modifier.cpp // chapter : $CGAL_Chapter: Protected access to the internal repr.$ // package : $CGAL_Package: Modifier 1.2 (07 Apr 1999) $ // source : modifier.fw @@ -24,8 +24,7 @@ // Protected access to the internal representation. // ============================================================================ - -#include +#include #include #include diff --git a/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h b/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h index d2ddb6a8dcc..ebf593071a9 100644 --- a/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h +++ b/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h @@ -22,10 +22,14 @@ #ifndef CGAL_RESIDUE_TYPE_H #define CGAL_RESIDUE_TYPE_H -#include #include +#include +#include +#include +#include #include +#include #include diff --git a/Modular_arithmetic/include/CGAL/Modular_traits.h b/Modular_arithmetic/include/CGAL/Modular_traits.h index 6eca13370e1..a663e6daaa9 100644 --- a/Modular_arithmetic/include/CGAL/Modular_traits.h +++ b/Modular_arithmetic/include/CGAL/Modular_traits.h @@ -21,11 +21,7 @@ #ifndef CGAL_MODULAR_TRAITS_H #define CGAL_MODULAR_TRAITS_H 1 -#include -#include -#include -#include - +#include namespace CGAL { diff --git a/Modular_arithmetic/include/CGAL/Residue.h b/Modular_arithmetic/include/CGAL/Residue.h index 549b6c14886..234d4bdd7e9 100644 --- a/Modular_arithmetic/include/CGAL/Residue.h +++ b/Modular_arithmetic/include/CGAL/Residue.h @@ -28,9 +28,10 @@ #ifndef CGAL_RESIDUE_H #define CGAL_RESIDUE_H 1 -#include #include #include +#include +#include namespace CGAL { diff --git a/Modular_arithmetic/test/Modular_arithmetic/Residue.cpp b/Modular_arithmetic/test/Modular_arithmetic/Residue.cpp index 1fdadfd0888..9d33b2c45b2 100644 --- a/Modular_arithmetic/test/Modular_arithmetic/Residue.cpp +++ b/Modular_arithmetic/test/Modular_arithmetic/Residue.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include diff --git a/Nef_2/test/Nef_2/Nef_polyhedron_2-test.cpp b/Nef_2/test/Nef_2/Nef_polyhedron_2-test.cpp index 17f80e626af..ce11dcb479a 100644 --- a/Nef_2/test/Nef_2/Nef_polyhedron_2-test.cpp +++ b/Nef_2/test/Nef_2/Nef_polyhedron_2-test.cpp @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/Nef_2/test/Nef_2/Polynomial-test.cpp b/Nef_2/test/Nef_2/Polynomial-test.cpp index 72ea8e7f00e..7beae66f4af 100644 --- a/Nef_2/test/Nef_2/Polynomial-test.cpp +++ b/Nef_2/test/Nef_2/Polynomial-test.cpp @@ -1,4 +1,4 @@ -#include +#include #include diff --git a/Nef_2/test/Nef_2/include/CGAL/test_macros.h b/Nef_2/test/Nef_2/include/CGAL/test_macros.h index 5feb9974b52..d7e437f47e7 100644 --- a/Nef_2/test/Nef_2/include/CGAL/test_macros.h +++ b/Nef_2/test/Nef_2/include/CGAL/test_macros.h @@ -1,7 +1,6 @@ #ifndef CGAL_TEST_MACROS_H #define CGAL_TEST_MACROS_H -#include #include #include #include diff --git a/Nef_S2/test/Nef_S2/include/CGAL/test_macros.h b/Nef_S2/test/Nef_S2/include/CGAL/test_macros.h index ed43a0684b0..f1c827c5636 100644 --- a/Nef_S2/test/Nef_S2/include/CGAL/test_macros.h +++ b/Nef_S2/test/Nef_S2/include/CGAL/test_macros.h @@ -1,7 +1,6 @@ #ifndef CGAL_TEST_MACROS_H #define CGAL_TEST_MACROS_H -#include #include #include #include diff --git a/Number_types/include/CGAL/Lazy_exact_nt.h b/Number_types/include/CGAL/Lazy_exact_nt.h index 44aed45d06d..2444d8e12a1 100644 --- a/Number_types/include/CGAL/Lazy_exact_nt.h +++ b/Number_types/include/CGAL/Lazy_exact_nt.h @@ -22,11 +22,6 @@ #ifndef CGAL_LAZY_EXACT_NT_H #define CGAL_LAZY_EXACT_NT_H -#define CGAL_int(T) typename First_if_different::Type -#define CGAL_double(T) typename First_if_different::Type -#define CGAL_To_interval(T) To_interval - - #include #include @@ -53,6 +48,9 @@ #include +#define CGAL_int(T) typename First_if_different::Type +#define CGAL_double(T) typename First_if_different::Type +#define CGAL_To_interval(T) To_interval /* * This file contains the definition of the number type Lazy_exact_nt, diff --git a/Number_types/include/CGAL/Quotient.h b/Number_types/include/CGAL/Quotient.h index 1a0bc36fd12..4e122fe7238 100644 --- a/Number_types/include/CGAL/Quotient.h +++ b/Number_types/include/CGAL/Quotient.h @@ -32,8 +32,6 @@ // The include is done before the protect macro on purpose, because // of a cyclic dependency. -#include - #ifndef CGAL_QUOTIENT_H #define CGAL_QUOTIENT_H diff --git a/Number_types/include/CGAL/gmpxx.h b/Number_types/include/CGAL/gmpxx.h index 8dda7655099..09cde667238 100644 --- a/Number_types/include/CGAL/gmpxx.h +++ b/Number_types/include/CGAL/gmpxx.h @@ -39,8 +39,6 @@ #ifndef CGAL_GMPXX_H #define CGAL_GMPXX_H -#include - #include // needed by GMP 4.1.4 since misses it. #include #include diff --git a/Number_types/include/CGAL/gmpxx_coercion_traits.h b/Number_types/include/CGAL/gmpxx_coercion_traits.h index 82790ff8d93..dc60e0e4232 100644 --- a/Number_types/include/CGAL/gmpxx_coercion_traits.h +++ b/Number_types/include/CGAL/gmpxx_coercion_traits.h @@ -28,7 +28,6 @@ #ifndef CGAL_GMPXX_COERCION_TRAITS_H #define CGAL_GMPXX_COERCION_TRAITS_H 1 -#include #include #include // needed by GMP 4.1.4 since misses it. diff --git a/Number_types/include/CGAL/mpq_class.h b/Number_types/include/CGAL/mpq_class.h index ec3dbc9cdfd..f3d214892a6 100644 --- a/Number_types/include/CGAL/mpq_class.h +++ b/Number_types/include/CGAL/mpq_class.h @@ -26,10 +26,13 @@ #ifndef CGAL_MPQ_CLASS_H #define CGAL_MPQ_CLASS_H -#include -#include -#include // for GCD in Type traits +#include +#include +#include +#include #include +#include +#include // This file gathers the necessary adaptors so that the following // C++ number types that come with GMP can be used by CGAL : @@ -40,7 +43,7 @@ // Reading gmpxx.h shows that ::__gmp_expr is the mp[zqf]_class proper, // while ::__gmp_expr is the others "expressions". -#define CGAL_CHECK_GMP_EXPR \ +#define CGAL_CHECK_GMP_EXPR_MPQ_CLASS \ CGAL_static_assertion( \ (::boost::is_same< ::__gmp_expr< T , T >,Type>::value )); @@ -60,7 +63,7 @@ class Algebraic_structure_traits< mpq_class > struct Is_zero: public CGAL::cpp98::unary_function< mpq_class , bool > { template bool operator()( const ::__gmp_expr< T , U >& x) const { - CGAL_CHECK_GMP_EXPR; + CGAL_CHECK_GMP_EXPR_MPQ_CLASS; return ::sgn(x) == 0; } }; @@ -68,7 +71,7 @@ class Algebraic_structure_traits< mpq_class > struct Is_one: public CGAL::cpp98::unary_function< mpq_class , bool > { template bool operator()( const ::__gmp_expr< T , U >& x) const { - CGAL_CHECK_GMP_EXPR; + CGAL_CHECK_GMP_EXPR_MPQ_CLASS; return x == 1; } }; @@ -98,7 +101,7 @@ class Algebraic_structure_traits< mpq_class > mpq_class operator()( const ::__gmp_expr< T , U1 >& x, const ::__gmp_expr< T , U2 > & y) const { - CGAL_CHECK_GMP_EXPR; + CGAL_CHECK_GMP_EXPR_MPQ_CLASS; mpq_class result = x / y; CGAL_precondition_msg( result * y == x, "'x' must be divisible by 'y' in " @@ -134,14 +137,14 @@ class Real_embeddable_traits< mpq_class > struct Is_zero: public CGAL::cpp98::unary_function< mpq_class , bool > { template bool operator()( const ::__gmp_expr< T , U >& x) const { - CGAL_CHECK_GMP_EXPR; + CGAL_CHECK_GMP_EXPR_MPQ_CLASS; return ::sgn(x) == 0; } }; struct Is_finite: public CGAL::cpp98::unary_function { template bool operator()( const ::__gmp_expr< T , U >&) const { - CGAL_CHECK_GMP_EXPR; + CGAL_CHECK_GMP_EXPR_MPQ_CLASS; return true; } }; @@ -149,7 +152,7 @@ class Real_embeddable_traits< mpq_class > struct Is_positive: public CGAL::cpp98::unary_function< mpq_class , bool > { template bool operator()( const ::__gmp_expr< T , U >& x) const { - CGAL_CHECK_GMP_EXPR; + CGAL_CHECK_GMP_EXPR_MPQ_CLASS; return ::sgn(x) > 0; } }; @@ -157,7 +160,7 @@ class Real_embeddable_traits< mpq_class > struct Is_negative: public CGAL::cpp98::unary_function< mpq_class , bool > { template bool operator()( const ::__gmp_expr< T , U >& x) const { - CGAL_CHECK_GMP_EXPR; + CGAL_CHECK_GMP_EXPR_MPQ_CLASS; return ::sgn(x) < 0; } }; @@ -165,7 +168,7 @@ class Real_embeddable_traits< mpq_class > struct Abs: public CGAL::cpp98::unary_function< mpq_class , mpq_class > { template mpq_class operator()( const ::__gmp_expr< T , U >& x) const { - CGAL_CHECK_GMP_EXPR; + CGAL_CHECK_GMP_EXPR_MPQ_CLASS; return ::abs(x); } }; @@ -176,7 +179,7 @@ class Real_embeddable_traits< mpq_class > template ::CGAL::Sign operator()( const ::__gmp_expr< T , U >& x ) const { - CGAL_CHECK_GMP_EXPR; + CGAL_CHECK_GMP_EXPR_MPQ_CLASS; return (::CGAL::Sign) ::sgn( x ); } }; @@ -188,7 +191,7 @@ class Real_embeddable_traits< mpq_class > Comparison_result operator()( const ::__gmp_expr< T , U1 >& x, const ::__gmp_expr< T , U2 >& y ) const { - CGAL_CHECK_GMP_EXPR; + CGAL_CHECK_GMP_EXPR_MPQ_CLASS; // cmp returns any int value, not just -1/0/1... return (Comparison_result) CGAL_NTS sign( ::cmp(x, y) ); } @@ -241,6 +244,14 @@ class Real_embeddable_traits< mpq_class > }; }; +} // namespace CGAL + +#include +#include // for GCD in Type traits +#include + +namespace CGAL { + /*! \ingroup NiX_Fraction_traits_spec * \brief Specialization of Fraction_traits for mpq_class */ @@ -310,6 +321,6 @@ namespace internal { } //namespace CGAL -#undef CGAL_CHECK_GMP_EXPR +#undef CGAL_CHECK_GMP_EXPR_MPQ_CLASS #endif // CGAL_MPQ_CLASS_H diff --git a/Number_types/include/CGAL/mpz_class.h b/Number_types/include/CGAL/mpz_class.h index 21aa543903a..dc229c02f50 100644 --- a/Number_types/include/CGAL/mpz_class.h +++ b/Number_types/include/CGAL/mpz_class.h @@ -26,11 +26,6 @@ #ifndef CGAL_MPZ_CLASS_H #define CGAL_MPZ_CLASS_H -#include -#include -#include - - // This file gathers the necessary adaptors so that the following // C++ number types that come with GMP can be used by CGAL : // - mpz_class @@ -40,6 +35,15 @@ // Reading gmpxx.h shows that ::__gmp_expr is the mp[zqf]_class proper, // while ::__gmp_expr is the others "expressions". +#include +#include +#include +#include +#include +#include +#include +#include +#include #define CGAL_CHECK_GMP_EXPR \ CGAL_static_assertion( \ @@ -52,6 +56,7 @@ namespace CGAL { template<> class Algebraic_structure_traits< mpz_class > :public Algebraic_structure_traits_base< mpz_class , Euclidean_ring_tag > { + public: typedef mpz_class Type; typedef Euclidean_ring_tag Algebraic_category; @@ -191,6 +196,12 @@ public: };*/ }; +} //namespace CGAL + +#include // for `sign( ::cmp(x, y) )`, below + +namespace CGAL { + // RET for mpz_class template<> class Real_embeddable_traits< mpz_class > @@ -300,10 +311,20 @@ public: }; }; +} //namespace CGAL + +#include +#include +#include +#include + +namespace CGAL { + /*! \ingroup NiX_Modular_traits_spec * \brief a model of concept ModularTraits, * specialization of NiX::Modular_traits. */ + template<> class Modular_traits< mpz_class > { public: @@ -323,8 +344,11 @@ public: } }; }; +} //namespace CGAL +#include +namespace CGAL { template <> struct Split_double { diff --git a/Number_types/test/Number_types/CORE_BigFloat.cpp b/Number_types/test/Number_types/CORE_BigFloat.cpp index 74b17b06807..884422805d1 100644 --- a/Number_types/test/Number_types/CORE_BigFloat.cpp +++ b/Number_types/test/Number_types/CORE_BigFloat.cpp @@ -1,6 +1,6 @@ #include -#include +#include #ifdef CGAL_USE_CORE #include diff --git a/Number_types/test/Number_types/CORE_BigInt.cpp b/Number_types/test/Number_types/CORE_BigInt.cpp index 52ee9bf9577..08f64a2b106 100644 --- a/Number_types/test/Number_types/CORE_BigInt.cpp +++ b/Number_types/test/Number_types/CORE_BigInt.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include #ifdef CGAL_USE_CORE diff --git a/Number_types/test/Number_types/CORE_BigRat.cpp b/Number_types/test/Number_types/CORE_BigRat.cpp index 175100d3d6a..5125adb7e29 100644 --- a/Number_types/test/Number_types/CORE_BigRat.cpp +++ b/Number_types/test/Number_types/CORE_BigRat.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #ifdef CGAL_USE_CORE diff --git a/Number_types/test/Number_types/CORE_Expr.cpp b/Number_types/test/Number_types/CORE_Expr.cpp index 2c5668df68b..046c66a582a 100644 --- a/Number_types/test/Number_types/CORE_Expr.cpp +++ b/Number_types/test/Number_types/CORE_Expr.cpp @@ -1,5 +1,5 @@ #include -#include +#include #ifdef CGAL_USE_CORE #include #include @@ -140,8 +140,6 @@ int main() { #if 0 -#include - #include #include diff --git a/Number_types/test/Number_types/Counted_number.cpp b/Number_types/test/Number_types/Counted_number.cpp index c825cd0d06c..fdbd62b3e42 100644 --- a/Number_types/test/Number_types/Counted_number.cpp +++ b/Number_types/test/Number_types/Counted_number.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/Number_types/test/Number_types/Gmpfr.cpp b/Number_types/test/Number_types/Gmpfr.cpp index 1e5928edccc..c9dfe1ec7b4 100644 --- a/Number_types/test/Number_types/Gmpfr.cpp +++ b/Number_types/test/Number_types/Gmpfr.cpp @@ -17,7 +17,7 @@ // // Author: Luis Peñaranda -#include +#include #ifdef CGAL_USE_GMP #include diff --git a/Number_types/test/Number_types/Gmpfr_bug.cpp b/Number_types/test/Number_types/Gmpfr_bug.cpp index 8b7d320327d..8fb6ddbb7d6 100644 --- a/Number_types/test/Number_types/Gmpfr_bug.cpp +++ b/Number_types/test/Number_types/Gmpfr_bug.cpp @@ -14,7 +14,7 @@ // It seems that this does not matter. However, I keep it for further testing // #define CGAL_GMPFR_NO_REFCOUNT -#include +#include #ifdef CGAL_USE_MPFI diff --git a/Number_types/test/Number_types/Gmpq.cpp b/Number_types/test/Number_types/Gmpq.cpp index f4d84e490d7..52d7d3cca68 100644 --- a/Number_types/test/Number_types/Gmpq.cpp +++ b/Number_types/test/Number_types/Gmpq.cpp @@ -1,4 +1,4 @@ -#include +#include #ifdef CGAL_USE_GMP diff --git a/Number_types/test/Number_types/Gmpq_new.cpp b/Number_types/test/Number_types/Gmpq_new.cpp index 8010415c8b7..7e911b4a4ad 100644 --- a/Number_types/test/Number_types/Gmpq_new.cpp +++ b/Number_types/test/Number_types/Gmpq_new.cpp @@ -1,5 +1,5 @@ -#include +#include #ifdef CGAL_USE_GMP #include diff --git a/Number_types/test/Number_types/Interval_nt.cpp b/Number_types/test/Number_types/Interval_nt.cpp index 9d6ff105124..bd335ad2638 100644 --- a/Number_types/test/Number_types/Interval_nt.cpp +++ b/Number_types/test/Number_types/Interval_nt.cpp @@ -1,7 +1,7 @@ // Test file for the Interval_nt class. // Sylvain Pion, 1997-2005. -#include +#include #include #include diff --git a/Number_types/test/Number_types/Interval_nt_new.cpp b/Number_types/test/Number_types/Interval_nt_new.cpp index 2d25aea2f33..eee594ce126 100644 --- a/Number_types/test/Number_types/Interval_nt_new.cpp +++ b/Number_types/test/Number_types/Interval_nt_new.cpp @@ -1,5 +1,6 @@ #include -#include +#include +#include #include #include #include diff --git a/Number_types/test/Number_types/Lazy_exact_nt_new.cpp b/Number_types/test/Number_types/Lazy_exact_nt_new.cpp index 9d8649b7a4e..1a4f3b284ed 100644 --- a/Number_types/test/Number_types/Lazy_exact_nt_new.cpp +++ b/Number_types/test/Number_types/Lazy_exact_nt_new.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include #include #include diff --git a/Number_types/test/Number_types/MP_Float.cpp b/Number_types/test/Number_types/MP_Float.cpp index a32503e5e48..4468d7d2619 100644 --- a/Number_types/test/Number_types/MP_Float.cpp +++ b/Number_types/test/Number_types/MP_Float.cpp @@ -1,7 +1,7 @@ // Test program for the MP_Float class. // Sylvain Pion. -#include +#include #include #include #include diff --git a/Number_types/test/Number_types/MP_Float_exact.cpp b/Number_types/test/Number_types/MP_Float_exact.cpp index 51cfc72488b..58650ac00eb 100644 --- a/Number_types/test/Number_types/MP_Float_exact.cpp +++ b/Number_types/test/Number_types/MP_Float_exact.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/Number_types/test/Number_types/Mpzf.cpp b/Number_types/test/Number_types/Mpzf.cpp index c0e10795751..04a56ec39e7 100644 --- a/Number_types/test/Number_types/Mpzf.cpp +++ b/Number_types/test/Number_types/Mpzf.cpp @@ -1,4 +1,4 @@ -#include +#include #ifdef CGAL_USE_GMP #include #endif diff --git a/Number_types/test/Number_types/Nef_polynomial.cpp b/Number_types/test/Number_types/Nef_polynomial.cpp index 02b158bb166..2e3e52419bf 100644 --- a/Number_types/test/Number_types/Nef_polynomial.cpp +++ b/Number_types/test/Number_types/Nef_polynomial.cpp @@ -1,6 +1,6 @@ #include -#include +#include #ifdef CGAL_USE_LEDA #include #include diff --git a/Number_types/test/Number_types/Quotient_new.cpp b/Number_types/test/Number_types/Quotient_new.cpp index 37bd1afa40d..6831353a207 100644 --- a/Number_types/test/Number_types/Quotient_new.cpp +++ b/Number_types/test/Number_types/Quotient_new.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/Number_types/test/Number_types/Root_of_traits.cpp b/Number_types/test/Number_types/Root_of_traits.cpp index a9cb2f5c2a2..5c10f1ea88f 100644 --- a/Number_types/test/Number_types/Root_of_traits.cpp +++ b/Number_types/test/Number_types/Root_of_traits.cpp @@ -9,7 +9,7 @@ -#include +#include #include #include #include diff --git a/Number_types/test/Number_types/_test_valid_finite_double.cpp b/Number_types/test/Number_types/_test_valid_finite_double.cpp index ce9fbc1b1d8..e8dfe431555 100644 --- a/Number_types/test/Number_types/_test_valid_finite_double.cpp +++ b/Number_types/test/Number_types/_test_valid_finite_double.cpp @@ -21,7 +21,9 @@ // Author(s) : Stefan Schirra -#include +#include +#include +#include #include #include #include diff --git a/Number_types/test/Number_types/_test_valid_finite_float.cpp b/Number_types/test/Number_types/_test_valid_finite_float.cpp index a2d6222de32..f17ac2e0f8a 100644 --- a/Number_types/test/Number_types/_test_valid_finite_float.cpp +++ b/Number_types/test/Number_types/_test_valid_finite_float.cpp @@ -21,7 +21,9 @@ // Author(s) : Stefan Schirra -#include +#include +#include +#include #include #include #include diff --git a/Number_types/test/Number_types/bench_interval.cpp b/Number_types/test/Number_types/bench_interval.cpp index 3c76f3c06a2..4c6d06e2e03 100644 --- a/Number_types/test/Number_types/bench_interval.cpp +++ b/Number_types/test/Number_types/bench_interval.cpp @@ -1,7 +1,6 @@ // Generic bench file for the IA package. // Sylvain Pion, 1997-2005. -#include #include #include #include diff --git a/Number_types/test/Number_types/checked_NT.h b/Number_types/test/Number_types/checked_NT.h index fd00a2da0f3..4de367c19d2 100644 --- a/Number_types/test/Number_types/checked_NT.h +++ b/Number_types/test/Number_types/checked_NT.h @@ -1,4 +1,13 @@ #include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace CGAL { template diff --git a/Number_types/test/Number_types/double.cpp b/Number_types/test/Number_types/double.cpp index dc0510083c8..c35a9578624 100644 --- a/Number_types/test/Number_types/double.cpp +++ b/Number_types/test/Number_types/double.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/Number_types/test/Number_types/doubletst.cpp b/Number_types/test/Number_types/doubletst.cpp index d5082d9393b..4a4261e2db2 100644 --- a/Number_types/test/Number_types/doubletst.cpp +++ b/Number_types/test/Number_types/doubletst.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/Number_types/test/Number_types/eigen.cpp b/Number_types/test/Number_types/eigen.cpp index 07c61cd53c3..91f620b0b3b 100644 --- a/Number_types/test/Number_types/eigen.cpp +++ b/Number_types/test/Number_types/eigen.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #ifdef CGAL_USE_GMP diff --git a/Number_types/test/Number_types/floattst.cpp b/Number_types/test/Number_types/floattst.cpp index e929cd227a9..e2566b03950 100644 --- a/Number_types/test/Number_types/floattst.cpp +++ b/Number_types/test/Number_types/floattst.cpp @@ -1,4 +1,6 @@ -#include +#include +#include +#include #if defined(BOOST_MSVC) # pragma warning(disable:4723) diff --git a/Number_types/test/Number_types/include/CGAL/Test/test_root_of_2_traits.h b/Number_types/test/Number_types/include/CGAL/Test/test_root_of_2_traits.h index 6936429d8d7..d073f3aba46 100644 --- a/Number_types/test/Number_types/include/CGAL/Test/test_root_of_2_traits.h +++ b/Number_types/test/Number_types/include/CGAL/Test/test_root_of_2_traits.h @@ -1,4 +1,4 @@ -#include +#include template void test_root_of_traits(){ diff --git a/Number_types/test/Number_types/include/CGAL/_test_io.h b/Number_types/test/Number_types/include/CGAL/_test_io.h index bfa3b7d0f9a..915918e68b0 100644 --- a/Number_types/test/Number_types/include/CGAL/_test_io.h +++ b/Number_types/test/Number_types/include/CGAL/_test_io.h @@ -20,7 +20,7 @@ #ifndef CGAL_TEST_IO_H #define CGAL_TEST_IO_H -#include +#include #ifdef NDEBUG # undef NDEBUG # include diff --git a/Number_types/test/Number_types/include/CGAL/_test_utilities.h b/Number_types/test/Number_types/include/CGAL/_test_utilities.h index 4ad18c4e01f..3ca7442f2bf 100644 --- a/Number_types/test/Number_types/include/CGAL/_test_utilities.h +++ b/Number_types/test/Number_types/include/CGAL/_test_utilities.h @@ -23,7 +23,6 @@ #ifndef CGAL_TEST_UTILITIES_H #define CGAL_TEST_UTILITIES_H -#include #include #include #include diff --git a/Number_types/test/Number_types/ioformat.cpp b/Number_types/test/Number_types/ioformat.cpp index 5b43dce5545..a483d2f5971 100644 --- a/Number_types/test/Number_types/ioformat.cpp +++ b/Number_types/test/Number_types/ioformat.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/Number_types/test/Number_types/leda_bigfloat.cpp b/Number_types/test/Number_types/leda_bigfloat.cpp index ff66f2775be..56fc8dda216 100644 --- a/Number_types/test/Number_types/leda_bigfloat.cpp +++ b/Number_types/test/Number_types/leda_bigfloat.cpp @@ -1,5 +1,5 @@ #include -#include +#include #ifdef CGAL_USE_LEDA #include #include diff --git a/Number_types/test/Number_types/leda_bigfloat_interval.cpp b/Number_types/test/Number_types/leda_bigfloat_interval.cpp index a89078d8227..55ddd1a8a77 100644 --- a/Number_types/test/Number_types/leda_bigfloat_interval.cpp +++ b/Number_types/test/Number_types/leda_bigfloat_interval.cpp @@ -1,5 +1,5 @@ #include -#include +#include #ifdef CGAL_USE_LEDA #include #include diff --git a/Number_types/test/Number_types/leda_integer.cpp b/Number_types/test/Number_types/leda_integer.cpp index 27446c09661..aa906df6cf4 100644 --- a/Number_types/test/Number_types/leda_integer.cpp +++ b/Number_types/test/Number_types/leda_integer.cpp @@ -1,6 +1,6 @@ #include -#include +#include #ifdef CGAL_USE_LEDA #include #include diff --git a/Number_types/test/Number_types/leda_rational.cpp b/Number_types/test/Number_types/leda_rational.cpp index a863690a1a1..f048edee83c 100644 --- a/Number_types/test/Number_types/leda_rational.cpp +++ b/Number_types/test/Number_types/leda_rational.cpp @@ -1,6 +1,6 @@ #include -#include +#include #ifdef CGAL_USE_LEDA #include #include diff --git a/Number_types/test/Number_types/leda_real.cpp b/Number_types/test/Number_types/leda_real.cpp index 429229fec62..ff5a7c6dfb4 100644 --- a/Number_types/test/Number_types/leda_real.cpp +++ b/Number_types/test/Number_types/leda_real.cpp @@ -1,6 +1,6 @@ #include -#include +#include #ifdef CGAL_USE_LEDA #include #include diff --git a/Number_types/test/Number_types/long_doubletst.cpp b/Number_types/test/Number_types/long_doubletst.cpp index f8f764f50e2..82e27130196 100644 --- a/Number_types/test/Number_types/long_doubletst.cpp +++ b/Number_types/test/Number_types/long_doubletst.cpp @@ -1,4 +1,6 @@ -#include +#include +#include +#include #include #include diff --git a/Number_types/test/Number_types/mpq_class.cpp b/Number_types/test/Number_types/mpq_class.cpp index 31b46847615..05df94e5786 100644 --- a/Number_types/test/Number_types/mpq_class.cpp +++ b/Number_types/test/Number_types/mpq_class.cpp @@ -1,4 +1,4 @@ -#include +#include #ifdef CGAL_USE_GMPXX diff --git a/Number_types/test/Number_types/mpz_class.cpp b/Number_types/test/Number_types/mpz_class.cpp index ce8f4b8d0d2..2f74da584a6 100644 --- a/Number_types/test/Number_types/mpz_class.cpp +++ b/Number_types/test/Number_types/mpz_class.cpp @@ -1,5 +1,5 @@ -#include - +#include +#include #ifdef CGAL_USE_GMPXX #include diff --git a/Number_types/test/Number_types/quotient_io.cpp b/Number_types/test/Number_types/quotient_io.cpp index 554eb1cf013..a788dc294b1 100644 --- a/Number_types/test/Number_types/quotient_io.cpp +++ b/Number_types/test/Number_types/quotient_io.cpp @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/Number_types/test/Number_types/rounding_modes.cpp b/Number_types/test/Number_types/rounding_modes.cpp index a401dfeb005..87aaa9e8600 100644 --- a/Number_types/test/Number_types/rounding_modes.cpp +++ b/Number_types/test/Number_types/rounding_modes.cpp @@ -1,6 +1,6 @@ // This tests the rounding mode functions. -#include +#include #include #include #include diff --git a/Number_types/test/Number_types/test_nt_Coercion_traits.cpp b/Number_types/test/Number_types/test_nt_Coercion_traits.cpp index 2abf8d11a9c..f80cbb34f2f 100644 --- a/Number_types/test/Number_types/test_nt_Coercion_traits.cpp +++ b/Number_types/test/Number_types/test_nt_Coercion_traits.cpp @@ -12,7 +12,6 @@ // ============================================================================ -#include #include #include #include @@ -23,12 +22,6 @@ #include #include -//#include -//#include -//#include -//#include // TODO: Is this available in CGAL? CGAL/Vector_d? -//#include - #include typedef CGAL::Interval_nt Interval; diff --git a/Number_types/test/Number_types/to_interval_test.cpp b/Number_types/test/Number_types/to_interval_test.cpp index b4897757d87..acb43306b50 100644 --- a/Number_types/test/Number_types/to_interval_test.cpp +++ b/Number_types/test/Number_types/to_interval_test.cpp @@ -1,5 +1,5 @@ -#include +#include #include // That one should not be needed in the long term: diff --git a/Number_types/test/Number_types/unsigned.cpp b/Number_types/test/Number_types/unsigned.cpp index 66a85682e6b..b91bfa6a1d8 100644 --- a/Number_types/test/Number_types/unsigned.cpp +++ b/Number_types/test/Number_types/unsigned.cpp @@ -17,7 +17,8 @@ // // Author: Marc Glisse -#include +#include +#include int main(){ unsigned int a = 42; diff --git a/Number_types/test/Number_types/utilities.cpp b/Number_types/test/Number_types/utilities.cpp index 53a132e5b16..cfb5d7ccfe5 100644 --- a/Number_types/test/Number_types/utilities.cpp +++ b/Number_types/test/Number_types/utilities.cpp @@ -1,4 +1,4 @@ -#include +#include // TODO: solve conflict of CORE with GMPXX #ifdef CGAL_USE_CORE diff --git a/Polynomial/include/CGAL/Test/_test_polynomial_traits_d.h b/Polynomial/include/CGAL/Test/_test_polynomial_traits_d.h index 6527b0fb2c7..1496e42abf5 100644 --- a/Polynomial/include/CGAL/Test/_test_polynomial_traits_d.h +++ b/Polynomial/include/CGAL/Test/_test_polynomial_traits_d.h @@ -24,7 +24,6 @@ #include #include -#include #include #include #include diff --git a/Polynomial/test/Polynomial/Exponent_vector.cpp b/Polynomial/test/Polynomial/Exponent_vector.cpp index 75d4055adab..fefba0f91de 100644 --- a/Polynomial/test/Polynomial/Exponent_vector.cpp +++ b/Polynomial/test/Polynomial/Exponent_vector.cpp @@ -1,6 +1,6 @@ #include -#include #include + #include #include diff --git a/Polynomial/test/Polynomial/Interpolator.cpp b/Polynomial/test/Polynomial/Interpolator.cpp index fa4ca9ceb98..13b74291449 100644 --- a/Polynomial/test/Polynomial/Interpolator.cpp +++ b/Polynomial/test/Polynomial/Interpolator.cpp @@ -1,5 +1,4 @@ #include -#include #include #include diff --git a/Polynomial/test/Polynomial/Polynomial_traits_d_Integer.cpp b/Polynomial/test/Polynomial/Polynomial_traits_d_Integer.cpp index 0754f474d65..1dca60d29cb 100644 --- a/Polynomial/test/Polynomial/Polynomial_traits_d_Integer.cpp +++ b/Polynomial/test/Polynomial/Polynomial_traits_d_Integer.cpp @@ -1,7 +1,6 @@ #include #include -#include #include #ifdef CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL diff --git a/Polynomial/test/Polynomial/Polynomial_traits_d_Integer_Integer.cpp b/Polynomial/test/Polynomial/Polynomial_traits_d_Integer_Integer.cpp index 24070479211..39fec6ba04a 100644 --- a/Polynomial/test/Polynomial/Polynomial_traits_d_Integer_Integer.cpp +++ b/Polynomial/test/Polynomial/Polynomial_traits_d_Integer_Integer.cpp @@ -1,7 +1,6 @@ #include #include -#include #include #include #include diff --git a/Polynomial/test/Polynomial/Polynomial_traits_d_Rational.cpp b/Polynomial/test/Polynomial/Polynomial_traits_d_Rational.cpp index 94feb855986..8988e4324ae 100644 --- a/Polynomial/test/Polynomial/Polynomial_traits_d_Rational.cpp +++ b/Polynomial/test/Polynomial/Polynomial_traits_d_Rational.cpp @@ -1,7 +1,6 @@ #include #include -#include #include #ifdef CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL diff --git a/Polynomial/test/Polynomial/Polynomial_traits_d_Rational_Integer.cpp b/Polynomial/test/Polynomial/Polynomial_traits_d_Rational_Integer.cpp index 433958b49d3..818d997587b 100644 --- a/Polynomial/test/Polynomial/Polynomial_traits_d_Rational_Integer.cpp +++ b/Polynomial/test/Polynomial/Polynomial_traits_d_Rational_Integer.cpp @@ -1,7 +1,6 @@ #include #include -#include #include #ifdef CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL diff --git a/Polynomial/test/Polynomial/Polynomial_traits_d_Rational_Rational.cpp b/Polynomial/test/Polynomial/Polynomial_traits_d_Rational_Rational.cpp index 7c287c70360..223ef906bbc 100644 --- a/Polynomial/test/Polynomial/Polynomial_traits_d_Rational_Rational.cpp +++ b/Polynomial/test/Polynomial/Polynomial_traits_d_Rational_Rational.cpp @@ -1,7 +1,6 @@ #include #include -#include #include #ifdef CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL diff --git a/Polynomial/test/Polynomial/Polynomial_type_generator.cpp b/Polynomial/test/Polynomial/Polynomial_type_generator.cpp index 5d28a774bf0..9de462f7a58 100644 --- a/Polynomial/test/Polynomial/Polynomial_type_generator.cpp +++ b/Polynomial/test/Polynomial/Polynomial_type_generator.cpp @@ -1,8 +1,9 @@ -#include + #include #include #include #include +#include int main(){ CGAL_assertion_code(typedef CGAL::Polynomial Poly_int_1;) diff --git a/Polynomial/test/Polynomial/include/CGAL/gen_sparse_polynomial.h b/Polynomial/test/Polynomial/include/CGAL/gen_sparse_polynomial.h index 3e993524a21..28d32e89775 100644 --- a/Polynomial/test/Polynomial/include/CGAL/gen_sparse_polynomial.h +++ b/Polynomial/test/Polynomial/include/CGAL/gen_sparse_polynomial.h @@ -2,7 +2,6 @@ #ifndef CGAL_GEN_SPARSE_POLYNOMIAL_H #define CGAL_GEN_SPARSE_POLYNOMIAL_H -#include #include #include #include diff --git a/Polynomial/test/Polynomial/include/CGAL/test_modular_gcd.h b/Polynomial/test/Polynomial/include/CGAL/test_modular_gcd.h index 6dac2621a95..343eab9b1ae 100644 --- a/Polynomial/test/Polynomial/include/CGAL/test_modular_gcd.h +++ b/Polynomial/test/Polynomial/include/CGAL/test_modular_gcd.h @@ -3,7 +3,6 @@ #ifndef CGAL_TEST_MODULAR_GCD_H #define CGAL_TEST_MODULAR_GCD_H -#include #include #include #include diff --git a/Polynomial/test/Polynomial/modular_gcd_utcf_algorithm_M.cpp b/Polynomial/test/Polynomial/modular_gcd_utcf_algorithm_M.cpp index b14dc71145f..352d37aca4d 100644 --- a/Polynomial/test/Polynomial/modular_gcd_utcf_algorithm_M.cpp +++ b/Polynomial/test/Polynomial/modular_gcd_utcf_algorithm_M.cpp @@ -34,7 +34,7 @@ #define MY_FUNCTION_CALL modular_gcd_utcf_algorithm_M -#include + #include #include #include diff --git a/Polynomial/test/Polynomial/modular_gcd_utils.cpp b/Polynomial/test/Polynomial/modular_gcd_utils.cpp index 35565afca53..871c2ee41f8 100644 --- a/Polynomial/test/Polynomial/modular_gcd_utils.cpp +++ b/Polynomial/test/Polynomial/modular_gcd_utils.cpp @@ -32,7 +32,7 @@ test for the function euclidean_division_obstinate */ -#include + #include #include #include diff --git a/Polynomial/test/Polynomial/polynomial_gcd.cpp b/Polynomial/test/Polynomial/polynomial_gcd.cpp index c2481844990..f1dfd4a9458 100644 --- a/Polynomial/test/Polynomial/polynomial_gcd.cpp +++ b/Polynomial/test/Polynomial/polynomial_gcd.cpp @@ -32,7 +32,7 @@ test for computing the gcd for polynomials */ -#include + #include #include #include diff --git a/Polynomial/test/Polynomial/resultant.cpp b/Polynomial/test/Polynomial/resultant.cpp index 90ac9fdf353..91a937bd02c 100644 --- a/Polynomial/test/Polynomial/resultant.cpp +++ b/Polynomial/test/Polynomial/resultant.cpp @@ -7,8 +7,6 @@ //#define CGAL_RESULTANT_USE_MODULAR_ARITHMETIC 0 //#define CGAL_RESULTANT_USE_DECOMPOSE 1 -#include - #include #include diff --git a/Polynomial/test/Polynomial/sturm_habicht_sequence.cpp b/Polynomial/test/Polynomial/sturm_habicht_sequence.cpp index 87001959704..a48fd1ec0c0 100644 --- a/Polynomial/test/Polynomial/sturm_habicht_sequence.cpp +++ b/Polynomial/test/Polynomial/sturm_habicht_sequence.cpp @@ -11,7 +11,6 @@ // // ============================================================================ -#include #include #include diff --git a/Polynomial/test/Polynomial/test_polynomial.h b/Polynomial/test/Polynomial/test_polynomial.h index 5784ce41de3..b76017a080c 100644 --- a/Polynomial/test/Polynomial/test_polynomial.h +++ b/Polynomial/test/Polynomial/test_polynomial.h @@ -1,5 +1,4 @@ -#include #include #include #include diff --git a/Polynomial/test/Polynomial/test_polynomial_Coercion_traits.cpp b/Polynomial/test/Polynomial/test_polynomial_Coercion_traits.cpp index a0555c79561..e868144f69c 100644 --- a/Polynomial/test/Polynomial/test_polynomial_Coercion_traits.cpp +++ b/Polynomial/test/Polynomial/test_polynomial_Coercion_traits.cpp @@ -1,5 +1,3 @@ -#include - #include #include diff --git a/Polynomial/test/Polynomial/test_polynomial_Get_arithmetic_kernel.cpp b/Polynomial/test/Polynomial/test_polynomial_Get_arithmetic_kernel.cpp index 2513660179d..1735a1f7dc7 100644 --- a/Polynomial/test/Polynomial/test_polynomial_Get_arithmetic_kernel.cpp +++ b/Polynomial/test/Polynomial/test_polynomial_Get_arithmetic_kernel.cpp @@ -1,4 +1,3 @@ -#include #include #include diff --git a/Polynomial/test/Polynomial/test_subresultants.cpp b/Polynomial/test/Polynomial/test_subresultants.cpp index a361c2f80f4..3f0507bc7a3 100644 --- a/Polynomial/test/Polynomial/test_subresultants.cpp +++ b/Polynomial/test/Polynomial/test_subresultants.cpp @@ -10,7 +10,7 @@ // Author(s) : Michael Kerber // // ============================================================================ -#include + #include #include #include diff --git a/Profiling_tools/test/Profiling_tools/test_timer.cpp b/Profiling_tools/test/Profiling_tools/test_timer.cpp index a9fb346c6a1..cde9cfebff4 100644 --- a/Profiling_tools/test/Profiling_tools/test_timer.cpp +++ b/Profiling_tools/test/Profiling_tools/test_timer.cpp @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/STL_Extension/test/STL_Extension/test_composition.cpp b/STL_Extension/test/STL_Extension/test_composition.cpp index 23113a20d7e..c7deeaa56f0 100644 --- a/STL_Extension/test/STL_Extension/test_composition.cpp +++ b/STL_Extension/test/STL_Extension/test_composition.cpp @@ -1,5 +1,6 @@ -#include #include +#include +#include #include #include #include diff --git a/Spatial_sorting/test/Spatial_sorting/test_hilbert.cpp b/Spatial_sorting/test/Spatial_sorting/test_hilbert.cpp index 40d9596df1a..ac1e5d47ef9 100644 --- a/Spatial_sorting/test/Spatial_sorting/test_hilbert.cpp +++ b/Spatial_sorting/test/Spatial_sorting/test_hilbert.cpp @@ -1,4 +1,3 @@ -#include #include #include diff --git a/Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp b/Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp index 33b9b7ac33f..7dfc145cd0a 100644 --- a/Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp +++ b/Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp @@ -1,4 +1,3 @@ -#include #include #include diff --git a/Straight_skeleton_2/test/Straight_skeleton_2/include/CGAL/test_offset_builder_types.h b/Straight_skeleton_2/test/Straight_skeleton_2/include/CGAL/test_offset_builder_types.h index c5a190eb439..bb40956cd60 100644 --- a/Straight_skeleton_2/test/Straight_skeleton_2/include/CGAL/test_offset_builder_types.h +++ b/Straight_skeleton_2/test/Straight_skeleton_2/include/CGAL/test_offset_builder_types.h @@ -20,7 +20,6 @@ #ifndef CGAL_TEST_SLS_BUILDER_TYPES_H #define CGAL_TEST_SLS_BUILDER_TYPES_H -#include #include #include #include diff --git a/Straight_skeleton_2/test/Straight_skeleton_2/include/CGAL/test_sls_builder_types.h b/Straight_skeleton_2/test/Straight_skeleton_2/include/CGAL/test_sls_builder_types.h index d7f833d69eb..cf4fcefb6a5 100644 --- a/Straight_skeleton_2/test/Straight_skeleton_2/include/CGAL/test_sls_builder_types.h +++ b/Straight_skeleton_2/test/Straight_skeleton_2/include/CGAL/test_sls_builder_types.h @@ -20,7 +20,6 @@ #ifndef CGAL_TEST_SLS_BUILDER_TYPES_H #define CGAL_TEST_SLS_BUILDER_TYPES_H -#include #include #include #include diff --git a/Straight_skeleton_2/test/Straight_skeleton_2/include/CGAL/test_sls_traits_types.h b/Straight_skeleton_2/test/Straight_skeleton_2/include/CGAL/test_sls_traits_types.h index 173915be889..1afa70696ab 100644 --- a/Straight_skeleton_2/test/Straight_skeleton_2/include/CGAL/test_sls_traits_types.h +++ b/Straight_skeleton_2/test/Straight_skeleton_2/include/CGAL/test_sls_traits_types.h @@ -20,7 +20,7 @@ #ifndef CGAL_TEST_SLS_TRAITS_TYPES_H #define CGAL_TEST_SLS_TRAITS_TYPES_H -#include + #include #include diff --git a/Straight_skeleton_2/test/Straight_skeleton_2/include/CGAL/test_sls_types.h b/Straight_skeleton_2/test/Straight_skeleton_2/include/CGAL/test_sls_types.h index 601ab300e31..1f1542a70f5 100644 --- a/Straight_skeleton_2/test/Straight_skeleton_2/include/CGAL/test_sls_types.h +++ b/Straight_skeleton_2/test/Straight_skeleton_2/include/CGAL/test_sls_types.h @@ -20,7 +20,7 @@ #ifndef CGAL_TEST_SLS_TYPES_H #define CGAL_TEST_SLS_TYPES_H -#include + #include #include #include diff --git a/Stream_support/test/Stream_support/test_ioformat.cpp b/Stream_support/test/Stream_support/test_ioformat.cpp index e5a75482948..8b32500e40e 100644 --- a/Stream_support/test/Stream_support/test_ioformat.cpp +++ b/Stream_support/test/Stream_support/test_ioformat.cpp @@ -27,7 +27,6 @@ // // ============================================================================ -#include #include #include #include diff --git a/TDS_2/test/TDS_2/include/CGAL/_test_short_names_2.h b/TDS_2/test/TDS_2/include/CGAL/_test_short_names_2.h deleted file mode 100644 index fa44f4a11f1..00000000000 --- a/TDS_2/test/TDS_2/include/CGAL/_test_short_names_2.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef CGAL_TRIANGULATION_TEST_SHORT_NAMES_2_H -#define CGAL_TRIANGULATION_TEST_SHORT_NAMES_2_H - - -// Define shorter names - - #define Cartesian Ca - #define Homogeneous Hg -// #define Quotient Qt - - #define Triangulation_test_point Ttp - #define Triangulation_test_segment Tts - #define Triangulation_test_line Ttl - #define Triangulation_test_direction Ttd - #define Triangulation_test_ray Ttr - #define Triangulation_test_distance Ttdst - #define _Triangulation_test_traits _Tttr - -#endif //CGAL_TRIANGULATION_TEST_SHORT_NAMES_2_H diff --git a/TDS_2/test/TDS_2/include/CGAL/_test_types.h b/TDS_2/test/TDS_2/include/CGAL/_test_types.h index 3b9285f281e..5d4e12fe2e7 100644 --- a/TDS_2/test/TDS_2/include/CGAL/_test_types.h +++ b/TDS_2/test/TDS_2/include/CGAL/_test_types.h @@ -1,9 +1,6 @@ #ifndef CGAL_TEST_TYPES_H #define CGAL_TEST_TYPES_H -#include - -#include #include #include diff --git a/TDS_2/test/TDS_2/test_triangulation_tds.cpp b/TDS_2/test/TDS_2/test_triangulation_tds.cpp index 78075001a74..b75e0b36d60 100644 --- a/TDS_2/test/TDS_2/test_triangulation_tds.cpp +++ b/TDS_2/test/TDS_2/test_triangulation_tds.cpp @@ -21,7 +21,6 @@ // // ============================================================================ -#include #include #include diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_types.h b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_types.h index c9ad3bd67aa..b2c94de238b 100644 --- a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_types.h +++ b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_types.h @@ -4,7 +4,6 @@ #include #include -#include #include typedef CGAL::MP_Float Rtype; diff --git a/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_2.cpp b/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_2.cpp index a8d7baca3ee..4670430b581 100644 --- a/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_2.cpp +++ b/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_2.cpp @@ -19,7 +19,7 @@ // // coordinator : INRIA Sophia-Antipolis // ============================================================================ -#include +#include #if defined(BOOST_MSVC) diff --git a/Triangulation_3/test/Triangulation_3/include/CGAL/_test_remove_cluster.h b/Triangulation_3/test/Triangulation_3/include/CGAL/_test_remove_cluster.h index 2269ee84348..8389c56754d 100644 --- a/Triangulation_3/test/Triangulation_3/include/CGAL/_test_remove_cluster.h +++ b/Triangulation_3/test/Triangulation_3/include/CGAL/_test_remove_cluster.h @@ -1,4 +1,3 @@ -#include #include #include diff --git a/Union_find/test/Union_find/include/CGAL/test_macros.h b/Union_find/test/Union_find/include/CGAL/test_macros.h index 7cede2731f8..7c20753f5ea 100644 --- a/Union_find/test/Union_find/include/CGAL/test_macros.h +++ b/Union_find/test/Union_find/include/CGAL/test_macros.h @@ -1,7 +1,7 @@ #ifndef CGAL_TEST_MACROS_H #define CGAL_TEST_MACROS_H -#include +#include #include #include #include diff --git a/Visibility_2/test/Visibility_2/include/CGAL/test_model_methods.h b/Visibility_2/test/Visibility_2/include/CGAL/test_model_methods.h index de2bee668bd..d3410db466e 100644 --- a/Visibility_2/test/Visibility_2/include/CGAL/test_model_methods.h +++ b/Visibility_2/test/Visibility_2/include/CGAL/test_model_methods.h @@ -23,7 +23,6 @@ #ifndef CGAL_TEST_MODEL_METHODS_H #define CGAL_TEST_MODEL_METHODS_H -#include #include #include #include diff --git a/Visibility_2/test/Visibility_2/pure_benchmark.cpp b/Visibility_2/test/Visibility_2/pure_benchmark.cpp index bd0896b7169..cf5de043b0a 100644 --- a/Visibility_2/test/Visibility_2/pure_benchmark.cpp +++ b/Visibility_2/test/Visibility_2/pure_benchmark.cpp @@ -21,8 +21,6 @@ // Michael Hemmer // Kan Huang -#include #include #include #include diff --git a/Visibility_2/test/Visibility_2/simple_benchmark.cpp b/Visibility_2/test/Visibility_2/simple_benchmark.cpp index 68975f87aa4..f18d6239834 100644 --- a/Visibility_2/test/Visibility_2/simple_benchmark.cpp +++ b/Visibility_2/test/Visibility_2/simple_benchmark.cpp @@ -22,8 +22,7 @@ // Kan Huang // Ning Xu -#include -#include + #include #include #include diff --git a/Visibility_2/test/Visibility_2/test_rotational_visibility.cpp b/Visibility_2/test/Visibility_2/test_rotational_visibility.cpp index f50b441317d..010f960bd69 100644 --- a/Visibility_2/test/Visibility_2/test_rotational_visibility.cpp +++ b/Visibility_2/test/Visibility_2/test_rotational_visibility.cpp @@ -20,7 +20,6 @@ // Author(s): Francisc Bungiu // Kan Huang -#include #include #include #include diff --git a/Visibility_2/test/Visibility_2/test_simple_visibility.cpp b/Visibility_2/test/Visibility_2/test_simple_visibility.cpp index 95a37cbf3ce..04dca48bbeb 100644 --- a/Visibility_2/test/Visibility_2/test_simple_visibility.cpp +++ b/Visibility_2/test/Visibility_2/test_simple_visibility.cpp @@ -20,7 +20,6 @@ // Author(s): Francisc Bungiu // Michael Hemmer -#include #include #include #include diff --git a/Visibility_2/test/Visibility_2/test_star_shape.cpp b/Visibility_2/test/Visibility_2/test_star_shape.cpp index 6ed90961df1..c1cf616ceb1 100644 --- a/Visibility_2/test/Visibility_2/test_star_shape.cpp +++ b/Visibility_2/test/Visibility_2/test_star_shape.cpp @@ -21,7 +21,7 @@ // Francisc Bungiu // Michael Hemmer -#include + #include #include #include diff --git a/Visibility_2/test/Visibility_2/test_triangular_expansion.cpp b/Visibility_2/test/Visibility_2/test_triangular_expansion.cpp index 92659dbacfe..e17eb3e1609 100644 --- a/Visibility_2/test/Visibility_2/test_triangular_expansion.cpp +++ b/Visibility_2/test/Visibility_2/test_triangular_expansion.cpp @@ -20,7 +20,7 @@ // Author(s): Francisc Bungiu // Michael Hemmer -#include + #include #include #include diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_policy_concept.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_policy_concept.h index 40e139fc5c6..5fe1f431a8f 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_policy_concept.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_policy_concept.h @@ -22,7 +22,6 @@ #ifndef CGAL_ADAPTATION_POLICY_CONCEPT_H #define CGAL_ADAPTATION_POLICY_CONCEPT_H 1 -#include #include #include #include diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_traits_concept.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_traits_concept.h index ea5d61ad445..b6c56e91441 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_traits_concept.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_traits_concept.h @@ -22,7 +22,6 @@ #ifndef CGAL_ADAPTATION_TRAITS_CONCEPT_H #define CGAL_ADAPTATION_TRAITS_CONCEPT_H 1 -#include #include #include #include diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Delaunay_graph_concept.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Delaunay_graph_concept.h index 810e0cde6e5..024d0327430 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Delaunay_graph_concept.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Delaunay_graph_concept.h @@ -22,7 +22,6 @@ #ifndef CGAL_DELAUNAY_GRAPH_CONCEPT_H #define CGAL_DELAUNAY_GRAPH_CONCEPT_H 1 -#include #include #include #include diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_aux.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_aux.h index 6c485a3b573..69aa8e76686 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_aux.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_aux.h @@ -22,7 +22,6 @@ #ifndef VDA_AUX_H #define VDA_AUX_H 1 -#include #include #include #include diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_print_report.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_print_report.h index 2d14bd421a4..1d41b34eb55 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_print_report.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_print_report.h @@ -22,7 +22,6 @@ #ifndef VDA_PRINT_REPORT_H #define VDA_PRINT_REPORT_H 1 -#include #include "vda_aux.h" #include "helper_functions.h" #include diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test.h index 74f3c2f0067..e62a43f77c7 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test.h @@ -22,7 +22,6 @@ #ifndef VDA_TEST_H #define VDA_TEST_H 1 -#include #include #include #include diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_locate.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_locate.h index 9df333f6477..e344ae31a7b 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_locate.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_locate.h @@ -22,7 +22,6 @@ #ifndef VDA_TEST_LOCATE_H #define VDA_TEST_LOCATE_H 1 -#include #include #include #include diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_vda.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_vda.h index 6b397e1959a..71d32d9595b 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_vda.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_vda.h @@ -22,7 +22,6 @@ #ifndef VDA_TEST_VDA_H #define VDA_TEST_VDA_H 1 -#include #include #include #include diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_ag.cpp b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_ag.cpp index 14661db311c..51fc8f279e8 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_ag.cpp +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_ag.cpp @@ -21,8 +21,6 @@ #define VDA_TEST_AG -#include - #include #include "vda_test.h" diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_dt.cpp b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_dt.cpp index 991e4939fbe..f55d86d53ca 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_dt.cpp +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_dt.cpp @@ -21,8 +21,6 @@ #define VDA_TEST_DT -#include - #include #include "vda_test.h" diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_pt.cpp b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_pt.cpp index d1957e5c59d..45c1c72bd58 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_pt.cpp +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_pt.cpp @@ -21,8 +21,6 @@ #define VDA_TEST_PT -#include - #include #include "vda_test.h" diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_rt.cpp b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_rt.cpp index d2532455221..a31c78efa60 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_rt.cpp +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_rt.cpp @@ -21,7 +21,6 @@ #define VDA_TEST_RT -#include #include #include "vda_test.h" diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_sdg.cpp b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_sdg.cpp index 0395aac019d..9018091da4c 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_sdg.cpp +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_sdg.cpp @@ -21,8 +21,6 @@ #define VDA_TEST_SDG -#include - #include #include "vda_test.h"