From fb8595b94e68c8490ef31c542f72be07f1354084 Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Wed, 24 Jan 2007 17:16:05 +0000 Subject: [PATCH] Cleanup : remove ancient CGAL_PROTECT_* macros. It's the compiler's job to optimize preprocessing time. --- Circulator/include/CGAL/circulator_bases.h | 6 --- Circulator/test/Circulator/test_circ1.C | 4 +- Generator/include/CGAL/random_selection.h | 11 +----- .../include/CGAL/HalfedgeDS_const_decorator.h | 7 ---- .../include/CGAL/HalfedgeDS_decorator.h | 10 ----- .../CGAL/HalfedgeDS_iterator_adaptor.h | 4 +- Min_annulus_d/web/Min_annulus_d.aw | 15 ++----- Min_circle_2/web/Min_circle_2.aw | 29 +++----------- Min_ellipse_2/include/CGAL/Min_ellipse_2.h | 29 +++----------- Min_ellipse_2/web/Min_ellipse_2.aw | 28 +++---------- Min_sphere_d/include/CGAL/Min_sphere_d.h | 10 +---- Min_sphere_d/web/Doc_Min_sphere_d.aw | 10 +---- Min_sphere_d_new/web/Min_sphere_d.aw | 10 +---- .../CGAL/Optimisation/Construct_point_2.h | 20 ++-------- .../CGAL/Optimisation/Construct_point_3.h | 20 ++-------- .../Polyhedron_IO/triangulation_print_OFF.h | 3 -- .../web/Polytope_distance_d.aw | 10 +---- QP_solver/include/CGAL/QP_solver.h | 17 ++------ .../include/CGAL/QP_solver/QP_basis_inverse.h | 17 ++------ QP_solver/include/CGAL/QP_solver/functors.h | 20 ++-------- Random_numbers/src/CGAL/Random.cpp | 9 +---- Random_numbers/web/Random.aw | 15 ++----- .../include/CGAL/IO/File_header_OFF.h | 6 +-- .../include/CGAL/IO/File_writer_OFF.h | 11 +----- .../include/CGAL/IO/File_writer_VRML_2.h | 9 +---- .../include/CGAL/IO/File_writer_inventor.h | 9 +---- .../include/CGAL/IO/File_writer_wavefront.h | 9 +---- .../include/CGAL/IO/Generic_writer.h | 6 +-- .../include/CGAL/IO/generic_copy_OFF.h | 13 +------ Stream_support/src/CGAL/File_header_OFF.cpp | 23 ----------- Stream_support/src/CGAL/File_scanner_OFF.cpp | 12 ------ Stream_support/src/CGAL/File_writer_OFF.cpp | 7 ---- .../src/CGAL/File_writer_VRML_2.cpp | 7 ---- .../src/CGAL/File_writer_wavefront.cpp | 7 ---- Timer/src/CGAL/Real_timer.cpp | 39 +++++++------------ 35 files changed, 76 insertions(+), 386 deletions(-) diff --git a/Circulator/include/CGAL/circulator_bases.h b/Circulator/include/CGAL/circulator_bases.h index afd721dd896..75916c4274a 100644 --- a/Circulator/include/CGAL/circulator_bases.h +++ b/Circulator/include/CGAL/circulator_bases.h @@ -24,14 +24,8 @@ #ifndef CGAL_CIRCULATOR_BASES_H #define CGAL_CIRCULATOR_BASES_H 1 -#ifndef CGAL_PROTECT_CSTDDEF #include -#define CGAL_PROTECT_CSTDDEF -#endif -#ifndef CGAL_PROTECT_ITERATOR #include -#define CGAL_PROTECT_ITERATOR -#endif CGAL_BEGIN_NAMESPACE diff --git a/Circulator/test/Circulator/test_circ1.C b/Circulator/test/Circulator/test_circ1.C index f36fcd688f7..9027fd41a38 100644 --- a/Circulator/test/Circulator/test_circ1.C +++ b/Circulator/test/Circulator/test_circ1.C @@ -2244,10 +2244,8 @@ void test_container_from_circulator() { delete_nodes(data_struct); delete[] my_C_array; } -#ifndef CGAL_PROTECT_ALGORITHM + #include -#define CGAL_PROTECT_ALGORITHM -#endif void test_circulator_from_iterator() { int* my_C_array = new_C_array(); diff --git a/Generator/include/CGAL/random_selection.h b/Generator/include/CGAL/random_selection.h index ee47b641c0b..eff57353bc7 100644 --- a/Generator/include/CGAL/random_selection.h +++ b/Generator/include/CGAL/random_selection.h @@ -23,17 +23,10 @@ #ifndef CGAL_RANDOM_SELECTION_H #define CGAL_RANDOM_SELECTION_H 1 -#ifndef CGAL_PROTECT_CSTDDEF + #include -#define CGAL_PROTECT_CSTDDEF -#endif -#ifndef CGAL_PROTECT_ITERATOR #include -#define CGAL_PROTECT_ITERATOR -#endif -#ifndef CGAL_RANDOM_H #include -#endif CGAL_BEGIN_NAMESPACE @@ -67,5 +60,5 @@ OutputIterator random_selection( RandomAccessIterator first, } CGAL_END_NAMESPACE + #endif // CGAL_RANDOM_SELECTION_H // -// EOF // diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_const_decorator.h b/HalfedgeDS/include/CGAL/HalfedgeDS_const_decorator.h index 36ed3757c94..6a12511a470 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_const_decorator.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_const_decorator.h @@ -24,16 +24,9 @@ #ifndef CGAL_HALFEDGEDS_CONST_DECORATOR_H #define CGAL_HALFEDGEDS_CONST_DECORATOR_H 1 -#ifndef CGAL_HALFEDGEDS_ITEMS_DECORATOR_H #include -#endif -#ifndef CGAL_PROTECT_VECTOR #include -#define CGAL_PROTECT_VECTOR -#endif -#ifndef CGAL_IO_VERBOSE_OSTREAM_H #include -#endif // CGAL_IO_VERBOSE_OSTREAM_H CGAL_BEGIN_NAMESPACE diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_decorator.h b/HalfedgeDS/include/CGAL/HalfedgeDS_decorator.h index 622d2552e53..1804703fb16 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_decorator.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_decorator.h @@ -24,20 +24,10 @@ #ifndef CGAL_HALFEDGEDS_DECORATOR_H #define CGAL_HALFEDGEDS_DECORATOR_H 1 -#ifndef CGAL_HALFEDGEDS_ITEMS_DECORATOR_H #include -#endif -#ifndef CGAL_HALFEDGEDS_CONST_DECORATOR_H #include -#endif -#ifndef CGAL_PROTECT_VECTOR #include -#define CGAL_PROTECT_VECTOR -#endif - -#ifndef CGAL_IO_VERBOSE_OSTREAM_H #include -#endif // CGAL_IO_VERBOSE_OSTREAM_H CGAL_BEGIN_NAMESPACE diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_iterator_adaptor.h b/HalfedgeDS/include/CGAL/HalfedgeDS_iterator_adaptor.h index 2d9635af63d..ffe9bbef319 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_iterator_adaptor.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_iterator_adaptor.h @@ -23,10 +23,8 @@ #ifndef CGAL_HALFEDGEDS_ITERATOR_ADAPTOR_H #define CGAL_HALFEDGEDS_ITERATOR_ADAPTOR_H 1 -#ifndef CGAL_PROTECT_ITERATOR + #include -#define CGAL_PROTECT_ITERATOR -#endif CGAL_BEGIN_NAMESPACE diff --git a/Min_annulus_d/web/Min_annulus_d.aw b/Min_annulus_d/web/Min_annulus_d.aw index 3afb61a2b50..21f36764116 100644 --- a/Min_annulus_d/web/Min_annulus_d.aw +++ b/Min_annulus_d/web/Min_annulus_d.aw @@ -393,10 +393,7 @@ The inputs points are kept in a vector to have random access to them. Their dimension is stored separately. @macro += @begin - #ifndef CGAL_PROTECT_VECTOR - # include - # define CGAL_PROTECT_VECTOR - #endif + #include @end @macro += @begin @@ -450,10 +447,7 @@ Two constructors are provided. If the user wants to get some verbose output \ccc{verbose} and \ccc{stream}. @macro += @begin - #ifndef CGAL_PROTECT_IOSTREAM - # include - # define CGAL_PROTECT_IOSTREAM - #endif + #include @end @macro += @begin @@ -545,10 +539,7 @@ following function class. Another function class is used to divide the index by 2. @macro += @begin - #ifndef CGAL_PROTECT_FUNCTIONAL_H - # include - # define CGAL_PROTECT_FUNCTIONAL_H - #endif + #include @end @macro += @begin diff --git a/Min_circle_2/web/Min_circle_2.aw b/Min_circle_2/web/Min_circle_2.aw index c0c5981e79d..038490c1e9e 100644 --- a/Min_circle_2/web/Min_circle_2.aw +++ b/Min_circle_2/web/Min_circle_2.aw @@ -2787,29 +2787,12 @@ end of each file. #ifndef CGAL_MIN_CIRCLE_2_H #define CGAL_MIN_CIRCLE_2_H - // includes - #ifndef CGAL_OPTIMISATION_BASIC_H - # include - #endif - #ifndef CGAL_RANDOM_H - # include - #endif - #ifndef CGAL_PROTECT_LIST - # include - # define CGAL_PROTECT_LIST - #endif - #ifndef CGAL_PROTECT_VECTOR - # include - # define CGAL_PROTECT_VECTOR - #endif - #ifndef CGAL_PROTECT_ALGORITHM - # include - # define CGAL_PROTECT_ALGORITHM - #endif - #ifndef CGAL_PROTECT_IOSTREAM - # include - # define CGAL_PROTECT_IOSTREAM - #endif + #include + #include + #include + #include + #include + #include @("CGAL") diff --git a/Min_ellipse_2/include/CGAL/Min_ellipse_2.h b/Min_ellipse_2/include/CGAL/Min_ellipse_2.h index 6c150d985c9..0606525ad69 100644 --- a/Min_ellipse_2/include/CGAL/Min_ellipse_2.h +++ b/Min_ellipse_2/include/CGAL/Min_ellipse_2.h @@ -20,29 +20,12 @@ #ifndef CGAL_MIN_ELLIPSE_2_H #define CGAL_MIN_ELLIPSE_2_H -// includes -#ifndef CGAL_OPTIMISATION_BASIC_H -# include -#endif -#ifndef CGAL_RANDOM_H -# include -#endif -#ifndef CGAL_PROTECT_LIST -# include -# define CGAL_PROTECT_LIST -#endif -#ifndef CGAL_PROTECT_VECTOR -# include -# define CGAL_PROTECT_VECTOR -#endif -#ifndef CGAL_PROTECT_ALGORITHM -# include -# define CGAL_PROTECT_ALGORITHM -#endif -#ifndef CGAL_PROTECT_IOSTREAM -# include -# define CGAL_PROTECT_IOSTREAM -#endif +#include +#include +#include +#include +#include +#include CGAL_BEGIN_NAMESPACE diff --git a/Min_ellipse_2/web/Min_ellipse_2.aw b/Min_ellipse_2/web/Min_ellipse_2.aw index dd01fc1cf4b..ebc38f0bcfe 100644 --- a/Min_ellipse_2/web/Min_ellipse_2.aw +++ b/Min_ellipse_2/web/Min_ellipse_2.aw @@ -3000,28 +3000,12 @@ end of each file. #define CGAL_MIN_ELLIPSE_2_H // includes - #ifndef CGAL_OPTIMISATION_BASIC_H - # include - #endif - #ifndef CGAL_RANDOM_H - # include - #endif - #ifndef CGAL_PROTECT_LIST - # include - # define CGAL_PROTECT_LIST - #endif - #ifndef CGAL_PROTECT_VECTOR - # include - # define CGAL_PROTECT_VECTOR - #endif - #ifndef CGAL_PROTECT_ALGORITHM - # include - # define CGAL_PROTECT_ALGORITHM - #endif - #ifndef CGAL_PROTECT_IOSTREAM - # include - # define CGAL_PROTECT_IOSTREAM - #endif + #include + #include + #include + #include + #include + #include @("CGAL") diff --git a/Min_sphere_d/include/CGAL/Min_sphere_d.h b/Min_sphere_d/include/CGAL/Min_sphere_d.h index 831deee2462..f860a4b6d26 100644 --- a/Min_sphere_d/include/CGAL/Min_sphere_d.h +++ b/Min_sphere_d/include/CGAL/Min_sphere_d.h @@ -37,15 +37,9 @@ # include -#ifndef CGAL_PROTECT_LIST -# include -# define CGAL_PROTECT_LIST -#endif +#include -#ifndef CGAL_PROTECT_IOSTREAM -# include -# define CGAL_PROTECT_IOSTREAM -#endif +#include CGAL_BEGIN_NAMESPACE diff --git a/Min_sphere_d/web/Doc_Min_sphere_d.aw b/Min_sphere_d/web/Doc_Min_sphere_d.aw index 615af56ce01..b0619a8fb51 100644 --- a/Min_sphere_d/web/Doc_Min_sphere_d.aw +++ b/Min_sphere_d/web/Doc_Min_sphere_d.aw @@ -3137,15 +3137,9 @@ int main () # include - #ifndef CGAL_PROTECT_LIST - # include - # define CGAL_PROTECT_LIST - #endif + #include - #ifndef CGAL_PROTECT_IOSTREAM - # include - # define CGAL_PROTECT_IOSTREAM - #endif + #include CGAL_BEGIN_NAMESPACE diff --git a/Min_sphere_d_new/web/Min_sphere_d.aw b/Min_sphere_d_new/web/Min_sphere_d.aw index 41e4bf3928f..2bbebb23309 100644 --- a/Min_sphere_d_new/web/Min_sphere_d.aw +++ b/Min_sphere_d_new/web/Min_sphere_d.aw @@ -279,10 +279,7 @@ The inputs points are kept in a vector to have random access to them. Their dimension is stored separately. @macro += @begin - #ifndef CGAL_PROTECT_VECTOR - # include - # define CGAL_PROTECT_VECTOR - #endif + #include @end @macro += @begin @@ -335,10 +332,7 @@ Two constructors are provided. If the user wants to get some verbose output \ccc{verbose} and \ccc{stream}. @macro += @begin - #ifndef CGAL_PROTECT_IOSTREAM - # include - # define CGAL_PROTECT_IOSTREAM - #endif + #include @end @macro += @begin diff --git a/Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h index da9c5e15f0c..ea5e0f9745d 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h @@ -24,22 +24,10 @@ #ifndef CGAL_OPTIMISATION_CONSTRUCT_POINT_2_H #define CGAL_OPTIMISATION_CONSTRUCT_POINT_2_H -// includes -#ifndef CGAL_POINT_2_H -# include -#endif -#ifndef CGAL_PROTECT_VECTOR -# include -# define CGAL_PROTECT_VECTOR -#endif -#ifndef CGAL_PROTECT_FUNCTIONAL -# include -# define CGAL_PROTECT_FUNCTIONAL -#endif -#ifndef CGAL_PROTECT_ITERATOR -# include -# define CGAL_PROTECT_ITERATOR -#endif +#include +#include +#include +#include CGAL_BEGIN_NAMESPACE diff --git a/Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h index cd3a807da03..9df1819509c 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h @@ -24,22 +24,10 @@ #ifndef CGAL_OPTIMISATION_CONSTRUCT_POINT_3_H #define CGAL_OPTIMISATION_CONSTRUCT_POINT_3_H -// includes -#ifndef CGAL_POINT_3_H -# include -#endif -#ifndef CGAL_PROTECT_VECTOR -# include -# define CGAL_PROTECT_VECTOR -#endif -#ifndef CGAL_PROTECT_FUNCTIONAL -# include -# define CGAL_PROTECT_FUNCTIONAL -#endif -#ifndef CGAL_PROTECT_ITERATOR -# include -# define CGAL_PROTECT_ITERATOR -#endif +#include +#include +#include +#include CGAL_BEGIN_NAMESPACE diff --git a/Polyhedron_IO/examples/Polyhedron_IO/triangulation_print_OFF.h b/Polyhedron_IO/examples/Polyhedron_IO/triangulation_print_OFF.h index 27c399f61f0..ff0157682af 100644 --- a/Polyhedron_IO/examples/Polyhedron_IO/triangulation_print_OFF.h +++ b/Polyhedron_IO/examples/Polyhedron_IO/triangulation_print_OFF.h @@ -3,10 +3,7 @@ #ifndef CGAL_TRIANGULATION_PRINT_OFF_H #define CGAL_TRIANGULATION_PRINT_OFF_H 1 -#ifndef CGAL_PROTECT_MAP #include -#define CGAL_PROTECT_MAP -#endif CGAL_BEGIN_NAMESPACE diff --git a/Polytope_distance_d/web/Polytope_distance_d.aw b/Polytope_distance_d/web/Polytope_distance_d.aw index 6d33dda5249..f092bad84d3 100644 --- a/Polytope_distance_d/web/Polytope_distance_d.aw +++ b/Polytope_distance_d/web/Polytope_distance_d.aw @@ -280,10 +280,7 @@ The inputs points are kept in a vector to have random access to them. Their dimension is stored separately. @macro += @begin - #ifndef CGAL_PROTECT_VECTOR - # include - # define CGAL_PROTECT_VECTOR - #endif + #include @end @macro += @begin @@ -335,10 +332,7 @@ Two constructors are provided. If the user wants to get some verbose output \ccc{verbose} and \ccc{stream}. @macro += @begin - #ifndef CGAL_PROTECT_IOSTREAM - # include - # define CGAL_PROTECT_IOSTREAM - #endif + #include @end @macro += @begin diff --git a/QP_solver/include/CGAL/QP_solver.h b/QP_solver/include/CGAL/QP_solver.h index 21a7c9d045c..b54598251e0 100644 --- a/QP_solver/include/CGAL/QP_solver.h +++ b/QP_solver/include/CGAL/QP_solver.h @@ -33,22 +33,11 @@ #include -#ifndef CGAL_IO_VERBOSE_OSTREAM_H #include -#endif -#ifndef CGAL_PROTECT_VECTOR -# define CGAL_PROTECT_VECTOR -# include -#endif -#ifndef CGAL_PROTECT_NUMERIC -# define CGAL_PROTECT_NUMERIC -# include -#endif -#ifndef CGAL_PROTECT_ALGORITHM -# define CGAL_PROTECT_ALGORITHM -# include -#endif +#include +#include +#include CGAL_BEGIN_NAMESPACE diff --git a/QP_solver/include/CGAL/QP_solver/QP_basis_inverse.h b/QP_solver/include/CGAL/QP_solver/QP_basis_inverse.h index cd9d6fc5320..59b233496d6 100644 --- a/QP_solver/include/CGAL/QP_solver/QP_basis_inverse.h +++ b/QP_solver/include/CGAL/QP_solver/QP_basis_inverse.h @@ -23,19 +23,10 @@ #ifndef CGAL_QP_SOLVER_QP_BASIS_INVERSE_H #define CGAL_QP_SOLVER_QP_BASIS_INVERSE_H -// includes -#ifndef CGAL_QP_SOLVER_BASIC_H -# include -#endif -#ifndef CGAL_IO_VERBOSE_OSTREAM_H -# include -#endif - -#ifndef CGAL_PROTECT_VECTOR -# define CGAL_PROTECT_VECTOR -# include -#endif - +#include +#include +#include + CGAL_BEGIN_NAMESPACE // ================= diff --git a/QP_solver/include/CGAL/QP_solver/functors.h b/QP_solver/include/CGAL/QP_solver/functors.h index 4d349b6f69a..bd401f22ad2 100644 --- a/QP_solver/include/CGAL/QP_solver/functors.h +++ b/QP_solver/include/CGAL/QP_solver/functors.h @@ -23,22 +23,10 @@ #ifndef CGAL_QP_SOLVER_FUNCTORS_H #define CGAL_QP_SOLVER_FUNCTORS_H -// includes -#ifndef CGAL_QP_SOLVER_BASIC_H -# include -#endif -#ifndef CGAL_FUNCTION_OBJECTS_H -# include -#endif - -#ifndef CGAL_PROTECT_FUNCTIONAL -# define CGAL_PROTECT_FUNCTIONAL -# include -#endif -#ifndef CGAL_PROTECT_ITERATOR -# define CGAL_PROTECT_ITERATOR -# include -#endif +#include +#include +#include +#include CGAL_BEGIN_NAMESPACE diff --git a/Random_numbers/src/CGAL/Random.cpp b/Random_numbers/src/CGAL/Random.cpp index 4d4e533851e..e5cae403b8a 100644 --- a/Random_numbers/src/CGAL/Random.cpp +++ b/Random_numbers/src/CGAL/Random.cpp @@ -22,12 +22,7 @@ // Author(s) : Sven Schönherr #include - -// additional includes -#ifndef CGAL_PROTECT_CTIME -# include -# define CGAL_PROTECT_CTIME -#endif +#include CGAL_BEGIN_NAMESPACE @@ -63,5 +58,3 @@ Random( unsigned int seed) Random default_random; CGAL_END_NAMESPACE - -// ===== EOF ================================================================== diff --git a/Random_numbers/web/Random.aw b/Random_numbers/web/Random.aw index 85e415a34c8..0b0ea32a584 100644 --- a/Random_numbers/web/Random.aw +++ b/Random_numbers/web/Random.aw @@ -467,10 +467,7 @@ numbers. // Class implementation (inline functions) // ======================================= // includes - #ifndef CGAL_PROTECT_CSTDLIB - # include - # define CGAL_PROTECT_CSTDLIB - #endif + #include @("CGAL") @@ -498,14 +495,8 @@ numbers. #include // additional includes - #ifndef CGAL_PROTECT_CTIME - # include - # define CGAL_PROTECT_CTIME - #endif - #ifndef CGAL_PROTECT_SYS_TIME_H - # include - # define CGAL_PROTECT_SYS_TIME_H - #endif + #include + #include @("CGAL") diff --git a/Stream_support/include/CGAL/IO/File_header_OFF.h b/Stream_support/include/CGAL/IO/File_header_OFF.h index 741b46446e4..d822f19e0aa 100644 --- a/Stream_support/include/CGAL/IO/File_header_OFF.h +++ b/Stream_support/include/CGAL/IO/File_header_OFF.h @@ -24,13 +24,9 @@ #ifndef CGAL_IO_FILE_HEADER_OFF_H #define CGAL_IO_FILE_HEADER_OFF_H 1 -#ifndef CGAL_IO_FILE_HEADER_EXTENDED_OFF_H + #include -#endif // CGAL_IO_FILE_HEADER_EXTENDED_OFF_H -#ifndef CGAL_PROTECT_IOSTREAM #include -#define CGAL_PROTECT_IOSTREAM -#endif CGAL_BEGIN_NAMESPACE diff --git a/Stream_support/include/CGAL/IO/File_writer_OFF.h b/Stream_support/include/CGAL/IO/File_writer_OFF.h index bca8812d610..41330b5f7ec 100644 --- a/Stream_support/include/CGAL/IO/File_writer_OFF.h +++ b/Stream_support/include/CGAL/IO/File_writer_OFF.h @@ -23,20 +23,11 @@ #ifndef CGAL_IO_FILE_WRITER_OFF_H #define CGAL_IO_FILE_WRITER_OFF_H 1 -#ifndef CGAL_IO_BINARY_FILE_IO_H + #include -#endif // CGAL_IO_BINARY_FILE_IO_H -#ifndef CGAL_IO_FILE_HEADER_OFF_H #include -#endif // CGAL_IO_FILE_HEADER_OFF_H -#ifndef CGAL_PROTECT_IOSTREAM #include -#define CGAL_PROTECT_IOSTREAM -#endif -#ifndef CGAL_PROTECT_CSTDDEF #include -#define CGAL_PROTECT_CSTDDEF -#endif CGAL_BEGIN_NAMESPACE diff --git a/Stream_support/include/CGAL/IO/File_writer_VRML_2.h b/Stream_support/include/CGAL/IO/File_writer_VRML_2.h index f62f6cfed7a..9c64451cfa3 100644 --- a/Stream_support/include/CGAL/IO/File_writer_VRML_2.h +++ b/Stream_support/include/CGAL/IO/File_writer_VRML_2.h @@ -23,17 +23,10 @@ #ifndef CGAL_IO_FILE_WRITER_VRML_2_H #define CGAL_IO_FILE_WRITER_VRML_2_H 1 -#ifndef CGAL_BASIC_H + #include -#endif // CGAL_BASIC_H -#ifndef CGAL_PROTECT_IOSTREAM #include -#define CGAL_PROTECT_IOSTREAM -#endif -#ifndef CGAL_PROTECT_CSTDDEF #include -#define CGAL_PROTECT_CSTDDEF -#endif CGAL_BEGIN_NAMESPACE diff --git a/Stream_support/include/CGAL/IO/File_writer_inventor.h b/Stream_support/include/CGAL/IO/File_writer_inventor.h index d574961a60b..bbe29473f55 100644 --- a/Stream_support/include/CGAL/IO/File_writer_inventor.h +++ b/Stream_support/include/CGAL/IO/File_writer_inventor.h @@ -23,17 +23,10 @@ #ifndef CGAL_IO_FILE_WRITER_INVENTOR_H #define CGAL_IO_FILE_WRITER_INVENTOR_H 1 -#ifndef CGAL_BASIC_H + #include -#endif // CGAL_BASIC_H -#ifndef CGAL_PROTECT_IOSTREAM #include -#define CGAL_PROTECT_IOSTREAM -#endif -#ifndef CGAL_PROTECT_CSTDDEF #include -#define CGAL_PROTECT_CSTDDEF -#endif CGAL_BEGIN_NAMESPACE diff --git a/Stream_support/include/CGAL/IO/File_writer_wavefront.h b/Stream_support/include/CGAL/IO/File_writer_wavefront.h index f135e31afcb..77b1cd5cde8 100644 --- a/Stream_support/include/CGAL/IO/File_writer_wavefront.h +++ b/Stream_support/include/CGAL/IO/File_writer_wavefront.h @@ -23,17 +23,10 @@ #ifndef CGAL_IO_FILE_WRITER_WAVEFRONT_H #define CGAL_IO_FILE_WRITER_WAVEFRONT_H 1 -#ifndef CGAL_IO_BINARY_FILE_IO_H + #include -#endif // CGAL_IO_BINARY_FILE_IO_H -#ifndef CGAL_PROTECT_IOSTREAM #include -#define CGAL_PROTECT_IOSTREAM -#endif -#ifndef CGAL_PROTECT_CSTDDEF #include -#define CGAL_PROTECT_CSTDDEF -#endif CGAL_BEGIN_NAMESPACE diff --git a/Stream_support/include/CGAL/IO/Generic_writer.h b/Stream_support/include/CGAL/IO/Generic_writer.h index 4a3eca522d1..bfa88559fe1 100644 --- a/Stream_support/include/CGAL/IO/Generic_writer.h +++ b/Stream_support/include/CGAL/IO/Generic_writer.h @@ -23,13 +23,9 @@ #ifndef CGAL_IO_GENERIC_WRITER_H #define CGAL_IO_GENERIC_WRITER_H 1 -#ifndef CGAL_BASIC_H + #include -#endif -#ifndef CGAL_PROTECT_ITERATOR #include -#define CGAL_PROTECT_ITERATOR -#endif CGAL_BEGIN_NAMESPACE diff --git a/Stream_support/include/CGAL/IO/generic_copy_OFF.h b/Stream_support/include/CGAL/IO/generic_copy_OFF.h index 518a6dd60d4..f9c61fb045f 100644 --- a/Stream_support/include/CGAL/IO/generic_copy_OFF.h +++ b/Stream_support/include/CGAL/IO/generic_copy_OFF.h @@ -23,23 +23,12 @@ #ifndef CGAL_IO_GENERIC_COPY_OFF_H #define CGAL_IO_GENERIC_COPY_OFF_H 1 -#ifndef CGAL_BASIC_H + #include -#endif -#ifndef CGAL_PROTECT_CSTDDEF #include -#define CGAL_PROTECT_CSTDDEF -#endif -#ifndef CGAL_IO_FILE_HEADER_OFF_H #include -#endif // CGAL_IO_FILE_HEADER_OFF_H -#ifndef CGAL_IO_FILE_SCANNER_OFF_H #include -#endif // CGAL_IO_FILE_SCANNER_OFF_H -#ifndef CGAL_PROTECT_IOSTREAM #include -#define CGAL_PROTECT_IOSTREAM -#endif CGAL_BEGIN_NAMESPACE diff --git a/Stream_support/src/CGAL/File_header_OFF.cpp b/Stream_support/src/CGAL/File_header_OFF.cpp index e1099c6856e..687a855a8a9 100644 --- a/Stream_support/src/CGAL/File_header_OFF.cpp +++ b/Stream_support/src/CGAL/File_header_OFF.cpp @@ -21,38 +21,15 @@ // // Author(s) : Lutz Kettner -#ifndef CGAL_BASIC_H #include -#endif // CGAL_BASIC_H -#ifndef CGAL_KNOWN_BIT_SIZE_INTEGERS_H #include -#endif -#ifndef CGAL_PROTECT_CSTDLIB #include -#define CGAL_PROTECT_CSTDLIB -#endif -#ifndef CGAL_PROTECT_CCTYPE #include -#define CGAL_PROTECT_CCTYPE -#endif -#ifndef CGAL_PROTECT_CSTRING #include -#define CGAL_PROTECT_CSTRING -#endif -#ifndef CGAL_PROTECT_IOSTREAM #include -#define CGAL_PROTECT_IOSTREAM -#endif -#ifndef CGAL_IO_BINARY_FILE_IO_H #include -#endif // CGAL_IO_BINARY_FILE_IO_H -#ifndef CGAL_IO_FILE_HEADER_OFF_H #include -#endif // CGAL_IO_FILE_HEADER_OFF_H -#ifndef CGAL_PROTECT_ALGORITHM #include -#define CGAL_PROTECT_ALGORITHM -#endif CGAL_BEGIN_NAMESPACE diff --git a/Stream_support/src/CGAL/File_scanner_OFF.cpp b/Stream_support/src/CGAL/File_scanner_OFF.cpp index c413bda325e..9ed9864f029 100644 --- a/Stream_support/src/CGAL/File_scanner_OFF.cpp +++ b/Stream_support/src/CGAL/File_scanner_OFF.cpp @@ -21,23 +21,11 @@ // // Author(s) : Lutz Kettner -#ifndef CGAL_BASIC_H #include -#endif // CGAL_BASIC_H -#ifndef CGAL_PROTECT_CSTDLIB #include -#define CGAL_PROTECT_CSTDLIB -#endif -#ifndef CGAL_PROTECT_IOSTREAM #include -#define CGAL_PROTECT_IOSTREAM -#endif -#ifndef CGAL_IO_BINARY_FILE_IO_H #include -#endif // CGAL_IO_BINARY_FILE_IO_H -#ifndef CGAL_IO_FILE_SCANNER_OFF_H #include -#endif // CGAL_IO_FILE_SCANNER_OFF_H CGAL_BEGIN_NAMESPACE diff --git a/Stream_support/src/CGAL/File_writer_OFF.cpp b/Stream_support/src/CGAL/File_writer_OFF.cpp index d7a6a3015c6..bbcde2b465c 100644 --- a/Stream_support/src/CGAL/File_writer_OFF.cpp +++ b/Stream_support/src/CGAL/File_writer_OFF.cpp @@ -21,16 +21,9 @@ // // Author(s) : Lutz Kettner -#ifndef CGAL_BASIC_H #include -#endif // CGAL_BASIC_H -#ifndef CGAL_PROTECT_IOSTREAM #include -#define CGAL_PROTECT_IOSTREAM -#endif -#ifndef CGAL_IO_FILE_WRITER_OFF_H #include -#endif // CGAL_IO_FILE_WRITER_OFF_H CGAL_BEGIN_NAMESPACE diff --git a/Stream_support/src/CGAL/File_writer_VRML_2.cpp b/Stream_support/src/CGAL/File_writer_VRML_2.cpp index 2f0480b2f5e..4308cb05bbc 100644 --- a/Stream_support/src/CGAL/File_writer_VRML_2.cpp +++ b/Stream_support/src/CGAL/File_writer_VRML_2.cpp @@ -21,16 +21,9 @@ // // Author(s) : Lutz Kettner -#ifndef CGAL_BASIC_H #include -#endif // CGAL_BASIC_H -#ifndef CGAL_PROTECT_IOSTREAM #include -#define CGAL_PROTECT_IOSTREAM -#endif -#ifndef CGAL_IO_FILE_WRITER_VRML_2_H #include -#endif // CGAL_IO_FILE_WRITER_VRML_2_H CGAL_BEGIN_NAMESPACE diff --git a/Stream_support/src/CGAL/File_writer_wavefront.cpp b/Stream_support/src/CGAL/File_writer_wavefront.cpp index 03a1e34169a..cefbac932fc 100644 --- a/Stream_support/src/CGAL/File_writer_wavefront.cpp +++ b/Stream_support/src/CGAL/File_writer_wavefront.cpp @@ -21,16 +21,9 @@ // // Author(s) : Lutz Kettner -#ifndef CGAL_BASIC_H #include -#endif // CGAL_BASIC_H -#ifndef CGAL_PROTECT_IOSTREAM #include -#define CGAL_PROTECT_IOSTREAM -#endif -#ifndef CGAL_IO_FILE_WRITER_WAVEFRONT_H #include -#endif // CGAL_IO_FILE_WRITER_WAVEFRONT_H CGAL_BEGIN_NAMESPACE diff --git a/Timer/src/CGAL/Real_timer.cpp b/Timer/src/CGAL/Real_timer.cpp index 5f7827a69e0..f48de960990 100644 --- a/Timer/src/CGAL/Real_timer.cpp +++ b/Timer/src/CGAL/Real_timer.cpp @@ -25,38 +25,27 @@ #include #if defined (_MSC_VER) -#define CGAL_PROTECT_SYS_TIME_H -#include -#include -#endif +# include +# include -#if defined (__BORLANDC__) -#define CGAL_PROTECT_SYS_TIME_H -#include -#include -#endif +#elif defined (__BORLANDC__) +# include +# include -#if defined (__MWERKS__) -#define CGAL_PROTECT_SYS_TIME_H -#include -#endif +#elif defined (__MWERKS__) +# include -#if defined (__MINGW32__) -#define CGAL_PROTECT_SYS_TIME_H - #include - #include -#endif +#elif defined (__MINGW32__) +# include +# include +#else // If none of the above PC compilers, use POSIX fct. gettimeofday() -#ifndef CGAL_PROTECT_SYS_TIME_H -#include -#define CGAL_PROTECT_SYS_TIME_H -#endif // CGAL_PROTECT_SYS_TIME_H - +# include +#endif CGAL_BEGIN_NAMESPACE - // Static member variable for Real_timer // ===================================== @@ -147,5 +136,3 @@ double Real_timer::precision() const { } CGAL_END_NAMESPACE - -// EOF //