songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup : remove ancient CGAL_PROTECT_* macros. 

It's the compiler's job to optimize preprocessing time.
This commit is contained in:
Sylvain Pion 2007-01-24 17:16:05 +00:00
parent 9b7a13a3ed
commit fb8595b94e
35 changed files with 76 additions and 386 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Circulator/include/CGAL/circulator_bases.h
View File

@ -24,14 +24,8 @@
#ifndef CGAL_CIRCULATOR_BASES_H #ifndef CGAL_CIRCULATOR_BASES_H
#define CGAL_CIRCULATOR_BASES_H 1 #define CGAL_CIRCULATOR_BASES_H 1
#ifndef CGAL_PROTECT_CSTDDEF
#include <cstddef> #include <cstddef>
#define CGAL_PROTECT_CSTDDEF
#endif
#ifndef CGAL_PROTECT_ITERATOR
#include <iterator> #include <iterator>
#define CGAL_PROTECT_ITERATOR
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

4
Circulator/test/Circulator/test_circ1.C
View File

@ -2244,10 +2244,8 @@ void test_container_from_circulator() {
delete_nodes(data_struct); delete_nodes(data_struct);
delete[] my_C_array; delete[] my_C_array;
} }
#ifndef CGAL_PROTECT_ALGORITHM
#include <algorithm> #include <algorithm>
#define CGAL_PROTECT_ALGORITHM
#endif
void test_circulator_from_iterator() { void test_circulator_from_iterator() {
int* my_C_array = new_C_array(); int* my_C_array = new_C_array();

11
Generator/include/CGAL/random_selection.h
View File

@ -23,17 +23,10 @@
#ifndef CGAL_RANDOM_SELECTION_H #ifndef CGAL_RANDOM_SELECTION_H
#define CGAL_RANDOM_SELECTION_H 1 #define CGAL_RANDOM_SELECTION_H 1
#ifndef CGAL_PROTECT_CSTDDEF
#include <cstddef> #include <cstddef>
#define CGAL_PROTECT_CSTDDEF
#endif
#ifndef CGAL_PROTECT_ITERATOR
#include <iterator> #include <iterator>
#define CGAL_PROTECT_ITERATOR
#endif
#ifndef CGAL_RANDOM_H
#include <CGAL/Random.h> #include <CGAL/Random.h>
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE
@ -67,5 +60,5 @@ OutputIterator random_selection( RandomAccessIterator first,
} }
CGAL_END_NAMESPACE CGAL_END_NAMESPACE
#endif // CGAL_RANDOM_SELECTION_H // #endif // CGAL_RANDOM_SELECTION_H //
// EOF //

7
HalfedgeDS/include/CGAL/HalfedgeDS_const_decorator.h
View File

@ -24,16 +24,9 @@
#ifndef CGAL_HALFEDGEDS_CONST_DECORATOR_H #ifndef CGAL_HALFEDGEDS_CONST_DECORATOR_H
#define CGAL_HALFEDGEDS_CONST_DECORATOR_H 1 #define CGAL_HALFEDGEDS_CONST_DECORATOR_H 1
#ifndef CGAL_HALFEDGEDS_ITEMS_DECORATOR_H
#include <CGAL/HalfedgeDS_items_decorator.h> #include <CGAL/HalfedgeDS_items_decorator.h>
#endif
#ifndef CGAL_PROTECT_VECTOR
#include <vector> #include <vector>
#define CGAL_PROTECT_VECTOR
#endif
#ifndef CGAL_IO_VERBOSE_OSTREAM_H
#include <CGAL/IO/Verbose_ostream.h> #include <CGAL/IO/Verbose_ostream.h>
#endif // CGAL_IO_VERBOSE_OSTREAM_H
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

10
HalfedgeDS/include/CGAL/HalfedgeDS_decorator.h
View File

@ -24,20 +24,10 @@
#ifndef CGAL_HALFEDGEDS_DECORATOR_H #ifndef CGAL_HALFEDGEDS_DECORATOR_H
#define CGAL_HALFEDGEDS_DECORATOR_H 1 #define CGAL_HALFEDGEDS_DECORATOR_H 1
#ifndef CGAL_HALFEDGEDS_ITEMS_DECORATOR_H
#include <CGAL/HalfedgeDS_items_decorator.h> #include <CGAL/HalfedgeDS_items_decorator.h>
#endif
#ifndef CGAL_HALFEDGEDS_CONST_DECORATOR_H
#include <CGAL/HalfedgeDS_const_decorator.h> #include <CGAL/HalfedgeDS_const_decorator.h>
#endif
#ifndef CGAL_PROTECT_VECTOR
#include <vector> #include <vector>
#define CGAL_PROTECT_VECTOR
#endif
#ifndef CGAL_IO_VERBOSE_OSTREAM_H
#include <CGAL/IO/Verbose_ostream.h> #include <CGAL/IO/Verbose_ostream.h>
#endif // CGAL_IO_VERBOSE_OSTREAM_H
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

4
HalfedgeDS/include/CGAL/HalfedgeDS_iterator_adaptor.h
View File

@ -23,10 +23,8 @@
#ifndef CGAL_HALFEDGEDS_ITERATOR_ADAPTOR_H #ifndef CGAL_HALFEDGEDS_ITERATOR_ADAPTOR_H
#define CGAL_HALFEDGEDS_ITERATOR_ADAPTOR_H 1 #define CGAL_HALFEDGEDS_ITERATOR_ADAPTOR_H 1
#ifndef CGAL_PROTECT_ITERATOR
#include <iterator> #include <iterator>
#define CGAL_PROTECT_ITERATOR
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

15
Min_annulus_d/web/Min_annulus_d.aw
View File

@ -393,10 +393,7 @@ The inputs points are kept in a vector to have random access to them.
Their dimension is stored separately. Their dimension is stored separately.
@macro <Min_annulus_d standard includes> += @begin @macro <Min_annulus_d standard includes> += @begin
#ifndef CGAL_PROTECT_VECTOR #include <vector>
# include <vector>
# define CGAL_PROTECT_VECTOR
#endif
@end @end
@macro <Min_annulus_d private types> += @begin @macro <Min_annulus_d private types> += @begin
@ -450,10 +447,7 @@ Two constructors are provided. If the user wants to get some verbose output
\ccc{verbose} and \ccc{stream}. \ccc{verbose} and \ccc{stream}.
@macro <Min_annulus_d standard includes> += @begin @macro <Min_annulus_d standard includes> += @begin
#ifndef CGAL_PROTECT_IOSTREAM #include <iostream>
# include <iostream>
# define CGAL_PROTECT_IOSTREAM
#endif
@end @end
@macro <Min_annulus_d member functions> += @begin @macro <Min_annulus_d member functions> += @begin
@ -545,10 +539,7 @@ following function class.
Another function class is used to divide the index by 2. Another function class is used to divide the index by 2.
@macro <Min_annulus_d standard includes> += @begin @macro <Min_annulus_d standard includes> += @begin
#ifndef CGAL_PROTECT_FUNCTIONAL_H #include <functional>
# include <functional>
# define CGAL_PROTECT_FUNCTIONAL_H
#endif
@end @end
@macro<Min_annulus_d private types> += @begin @macro<Min_annulus_d private types> += @begin

29
Min_circle_2/web/Min_circle_2.aw
View File

@ -2787,29 +2787,12 @@ end of each file.
#ifndef CGAL_MIN_CIRCLE_2_H #ifndef CGAL_MIN_CIRCLE_2_H
#define CGAL_MIN_CIRCLE_2_H #define CGAL_MIN_CIRCLE_2_H
// includes #include <CGAL/Optimisation/basic.h>
#ifndef CGAL_OPTIMISATION_BASIC_H #include <CGAL/Random.h>
# include <CGAL/Optimisation/basic.h> #include <list>
#endif #include <vector>
#ifndef CGAL_RANDOM_H #include <algorithm>
# include <CGAL/Random.h> #include <iostream>
#endif
#ifndef CGAL_PROTECT_LIST
# include <list>
# define CGAL_PROTECT_LIST
#endif
#ifndef CGAL_PROTECT_VECTOR
# include <vector>
# define CGAL_PROTECT_VECTOR
#endif
#ifndef CGAL_PROTECT_ALGORITHM
# include <algorithm>
# define CGAL_PROTECT_ALGORITHM
#endif
#ifndef CGAL_PROTECT_IOSTREAM
# include <iostream>
# define CGAL_PROTECT_IOSTREAM
#endif
@<namespace begin>("CGAL") @<namespace begin>("CGAL")

29
Min_ellipse_2/include/CGAL/Min_ellipse_2.h
View File

@ -20,29 +20,12 @@
#ifndef CGAL_MIN_ELLIPSE_2_H #ifndef CGAL_MIN_ELLIPSE_2_H
#define CGAL_MIN_ELLIPSE_2_H #define CGAL_MIN_ELLIPSE_2_H
// includes #include <CGAL/Optimisation/basic.h>
#ifndef CGAL_OPTIMISATION_BASIC_H #include <CGAL/Random.h>
# include <CGAL/Optimisation/basic.h> #include <list>
#endif #include <vector>
#ifndef CGAL_RANDOM_H #include <algorithm>
# include <CGAL/Random.h> #include <iostream>
#endif
#ifndef CGAL_PROTECT_LIST
# include <list>
# define CGAL_PROTECT_LIST
#endif
#ifndef CGAL_PROTECT_VECTOR
# include <vector>
# define CGAL_PROTECT_VECTOR
#endif
#ifndef CGAL_PROTECT_ALGORITHM
# include <algorithm>
# define CGAL_PROTECT_ALGORITHM
#endif
#ifndef CGAL_PROTECT_IOSTREAM
# include <iostream>
# define CGAL_PROTECT_IOSTREAM
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

28
Min_ellipse_2/web/Min_ellipse_2.aw
View File

@ -3000,28 +3000,12 @@ end of each file.
#define CGAL_MIN_ELLIPSE_2_H #define CGAL_MIN_ELLIPSE_2_H
// includes // includes
#ifndef CGAL_OPTIMISATION_BASIC_H #include <CGAL/Optimisation/basic.h>
# include <CGAL/Optimisation/basic.h> #include <CGAL/Random.h>
#endif #include <list>
#ifndef CGAL_RANDOM_H #include <vector>
# include <CGAL/Random.h> #include <algorithm>
#endif #include <iostream>
#ifndef CGAL_PROTECT_LIST
# include <list>
# define CGAL_PROTECT_LIST
#endif
#ifndef CGAL_PROTECT_VECTOR
# include <vector>
# define CGAL_PROTECT_VECTOR
#endif
#ifndef CGAL_PROTECT_ALGORITHM
# include <algorithm>
# define CGAL_PROTECT_ALGORITHM
#endif
#ifndef CGAL_PROTECT_IOSTREAM
# include <iostream>
# define CGAL_PROTECT_IOSTREAM
#endif
@<namespace begin>("CGAL") @<namespace begin>("CGAL")

10
Min_sphere_d/include/CGAL/Min_sphere_d.h
View File

@ -37,15 +37,9 @@
# include <CGAL/Min_sphere_d/Optimisation_sphere_d.h> # include <CGAL/Min_sphere_d/Optimisation_sphere_d.h>
#ifndef CGAL_PROTECT_LIST #include <list>
# include <list>
# define CGAL_PROTECT_LIST
#endif
#ifndef CGAL_PROTECT_IOSTREAM #include <iostream>
# include <iostream>
# define CGAL_PROTECT_IOSTREAM
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

10
Min_sphere_d/web/Doc_Min_sphere_d.aw
View File

@ -3137,15 +3137,9 @@ int main ()
# include <CGAL/Optimisation_sphere_d.h> # include <CGAL/Optimisation_sphere_d.h>
#ifndef CGAL_PROTECT_LIST #include <list>
# include <list>
# define CGAL_PROTECT_LIST
#endif
#ifndef CGAL_PROTECT_IOSTREAM #include <iostream>
# include <iostream>
# define CGAL_PROTECT_IOSTREAM
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

10
Min_sphere_d_new/web/Min_sphere_d.aw
View File

@ -279,10 +279,7 @@ The inputs points are kept in a vector to have random access to them.
Their dimension is stored separately. Their dimension is stored separately.
@macro <Min_sphere_d standard includes> += @begin @macro <Min_sphere_d standard includes> += @begin
#ifndef CGAL_PROTECT_VECTOR #include <vector>
# include <vector>
# define CGAL_PROTECT_VECTOR
#endif
@end @end
@macro <Min_sphere_d private types> += @begin @macro <Min_sphere_d private types> += @begin
@ -335,10 +332,7 @@ Two constructors are provided. If the user wants to get some verbose output
\ccc{verbose} and \ccc{stream}. \ccc{verbose} and \ccc{stream}.
@macro <Min_sphere_d standard includes> += @begin @macro <Min_sphere_d standard includes> += @begin
#ifndef CGAL_PROTECT_IOSTREAM #include <iostream>
# include <iostream>
# define CGAL_PROTECT_IOSTREAM
#endif
@end @end
@macro <Min_sphere_d member functions> += @begin @macro <Min_sphere_d member functions> += @begin

20
Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h
View File

@ -24,22 +24,10 @@
#ifndef CGAL_OPTIMISATION_CONSTRUCT_POINT_2_H #ifndef CGAL_OPTIMISATION_CONSTRUCT_POINT_2_H
#define CGAL_OPTIMISATION_CONSTRUCT_POINT_2_H #define CGAL_OPTIMISATION_CONSTRUCT_POINT_2_H
// includes #include <CGAL/Point_2.h>
#ifndef CGAL_POINT_2_H #include <vector>
# include <CGAL/Point_2.h> #include <functional>
#endif #include <iterator>
#ifndef CGAL_PROTECT_VECTOR
# include <vector>
# define CGAL_PROTECT_VECTOR
#endif
#ifndef CGAL_PROTECT_FUNCTIONAL
# include <functional>
# define CGAL_PROTECT_FUNCTIONAL
#endif
#ifndef CGAL_PROTECT_ITERATOR
# include <iterator>
# define CGAL_PROTECT_ITERATOR
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

20
Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h
View File

@ -24,22 +24,10 @@
#ifndef CGAL_OPTIMISATION_CONSTRUCT_POINT_3_H #ifndef CGAL_OPTIMISATION_CONSTRUCT_POINT_3_H
#define CGAL_OPTIMISATION_CONSTRUCT_POINT_3_H #define CGAL_OPTIMISATION_CONSTRUCT_POINT_3_H
// includes #include <CGAL/Point_3.h>
#ifndef CGAL_POINT_3_H #include <vector>
# include <CGAL/Point_3.h> #include <functional>
#endif #include <iterator>
#ifndef CGAL_PROTECT_VECTOR
# include <vector>
# define CGAL_PROTECT_VECTOR
#endif
#ifndef CGAL_PROTECT_FUNCTIONAL
# include <functional>
# define CGAL_PROTECT_FUNCTIONAL
#endif
#ifndef CGAL_PROTECT_ITERATOR
# include <iterator>
# define CGAL_PROTECT_ITERATOR
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

3
Polyhedron_IO/examples/Polyhedron_IO/triangulation_print_OFF.h
View File

@ -3,10 +3,7 @@
#ifndef CGAL_TRIANGULATION_PRINT_OFF_H #ifndef CGAL_TRIANGULATION_PRINT_OFF_H
#define CGAL_TRIANGULATION_PRINT_OFF_H 1 #define CGAL_TRIANGULATION_PRINT_OFF_H 1
#ifndef CGAL_PROTECT_MAP
#include <map> #include <map>
#define CGAL_PROTECT_MAP
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

10
Polytope_distance_d/web/Polytope_distance_d.aw
View File

@ -280,10 +280,7 @@ The inputs points are kept in a vector to have random access to them.
Their dimension is stored separately. Their dimension is stored separately.
@macro <Poly_dist_d standard includes> += @begin @macro <Poly_dist_d standard includes> += @begin
#ifndef CGAL_PROTECT_VECTOR #include <vector>
# include <vector>
# define CGAL_PROTECT_VECTOR
#endif
@end @end
@macro <Poly_dist_d private types> += @begin @macro <Poly_dist_d private types> += @begin
@ -335,10 +332,7 @@ Two constructors are provided. If the user wants to get some verbose output
\ccc{verbose} and \ccc{stream}. \ccc{verbose} and \ccc{stream}.
@macro <Poly_dist_d standard includes> += @begin @macro <Poly_dist_d standard includes> += @begin
#ifndef CGAL_PROTECT_IOSTREAM #include <iostream>
# include <iostream>
# define CGAL_PROTECT_IOSTREAM
#endif
@end @end
@macro <Poly_dist_d member functions> += @begin @macro <Poly_dist_d member functions> += @begin

17
QP_solver/include/CGAL/QP_solver.h
View File

@ -33,22 +33,11 @@
#include <CGAL/algorithm.h> #include <CGAL/algorithm.h>
#ifndef CGAL_IO_VERBOSE_OSTREAM_H
#include <CGAL/IO/Verbose_ostream.h> #include <CGAL/IO/Verbose_ostream.h>
#endif
#ifndef CGAL_PROTECT_VECTOR #include <vector>
# define CGAL_PROTECT_VECTOR #include <numeric>
# include <vector> #include <algorithm>
#endif
#ifndef CGAL_PROTECT_NUMERIC
# define CGAL_PROTECT_NUMERIC
# include <numeric>
#endif
#ifndef CGAL_PROTECT_ALGORITHM
# define CGAL_PROTECT_ALGORITHM
# include <algorithm>
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

15
QP_solver/include/CGAL/QP_solver/QP_basis_inverse.h
View File

@ -23,18 +23,9 @@
#ifndef CGAL_QP_SOLVER_QP_BASIS_INVERSE_H #ifndef CGAL_QP_SOLVER_QP_BASIS_INVERSE_H
#define CGAL_QP_SOLVER_QP_BASIS_INVERSE_H #define CGAL_QP_SOLVER_QP_BASIS_INVERSE_H
// includes #include <CGAL/QP_solver/basic.h>
#ifndef CGAL_QP_SOLVER_BASIC_H #include <CGAL/IO/Verbose_ostream.h>
# include <CGAL/QP_solver/basic.h> #include <vector>
#endif
#ifndef CGAL_IO_VERBOSE_OSTREAM_H
# include <CGAL/IO/Verbose_ostream.h>
#endif
#ifndef CGAL_PROTECT_VECTOR
# define CGAL_PROTECT_VECTOR
# include <vector>
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

20
QP_solver/include/CGAL/QP_solver/functors.h
View File

@ -23,22 +23,10 @@
#ifndef CGAL_QP_SOLVER_FUNCTORS_H #ifndef CGAL_QP_SOLVER_FUNCTORS_H
#define CGAL_QP_SOLVER_FUNCTORS_H #define CGAL_QP_SOLVER_FUNCTORS_H
// includes #include <CGAL/QP_solver/basic.h>
#ifndef CGAL_QP_SOLVER_BASIC_H #include <CGAL/function_objects.h>
# include <CGAL/QP_solver/basic.h> #include <functional>
#endif #include <iterator>
#ifndef CGAL_FUNCTION_OBJECTS_H
# include <CGAL/function_objects.h>
#endif
#ifndef CGAL_PROTECT_FUNCTIONAL
# define CGAL_PROTECT_FUNCTIONAL
# include <functional>
#endif
#ifndef CGAL_PROTECT_ITERATOR
# define CGAL_PROTECT_ITERATOR
# include <iterator>
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

9
Random_numbers/src/CGAL/Random.cpp
View File

@ -22,12 +22,7 @@
// Author(s) : Sven Schönherr <sven@inf.ethz.ch> // Author(s) : Sven Schönherr <sven@inf.ethz.ch>
#include <CGAL/Random.h> #include <CGAL/Random.h>
#include <ctime>
// additional includes
#ifndef CGAL_PROTECT_CTIME
# include <ctime>
# define CGAL_PROTECT_CTIME
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE
@ -63,5 +58,3 @@ Random( unsigned int seed)
Random default_random; Random default_random;
CGAL_END_NAMESPACE CGAL_END_NAMESPACE
// ===== EOF ==================================================================

15
Random_numbers/web/Random.aw
View File

@ -467,10 +467,7 @@ numbers.
// Class implementation (inline functions) // Class implementation (inline functions)
// ======================================= // =======================================
// includes // includes
#ifndef CGAL_PROTECT_CSTDLIB #include <cstdlib>
# include <cstdlib>
# define CGAL_PROTECT_CSTDLIB
#endif
@<namespace begin>("CGAL") @<namespace begin>("CGAL")
@ -498,14 +495,8 @@ numbers.
#include <CGAL/Random.h> #include <CGAL/Random.h>
// additional includes // additional includes
#ifndef CGAL_PROTECT_CTIME #include <ctime>
# include <ctime> #include <sys/time.h>
# define CGAL_PROTECT_CTIME
#endif
#ifndef CGAL_PROTECT_SYS_TIME_H
# include <sys/time.h>
# define CGAL_PROTECT_SYS_TIME_H
#endif
@<namespace begin>("CGAL") @<namespace begin>("CGAL")

6
Stream_support/include/CGAL/IO/File_header_OFF.h
View File

@ -24,13 +24,9 @@
#ifndef CGAL_IO_FILE_HEADER_OFF_H #ifndef CGAL_IO_FILE_HEADER_OFF_H
#define CGAL_IO_FILE_HEADER_OFF_H 1 #define CGAL_IO_FILE_HEADER_OFF_H 1
#ifndef CGAL_IO_FILE_HEADER_EXTENDED_OFF_H
#include <CGAL/IO/File_header_extended_OFF.h> #include <CGAL/IO/File_header_extended_OFF.h>
#endif // CGAL_IO_FILE_HEADER_EXTENDED_OFF_H
#ifndef CGAL_PROTECT_IOSTREAM
#include <iostream> #include <iostream>
#define CGAL_PROTECT_IOSTREAM
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

11
Stream_support/include/CGAL/IO/File_writer_OFF.h
View File

@ -23,20 +23,11 @@
#ifndef CGAL_IO_FILE_WRITER_OFF_H #ifndef CGAL_IO_FILE_WRITER_OFF_H
#define CGAL_IO_FILE_WRITER_OFF_H 1 #define CGAL_IO_FILE_WRITER_OFF_H 1
#ifndef CGAL_IO_BINARY_FILE_IO_H
#include <CGAL/IO/binary_file_io.h> #include <CGAL/IO/binary_file_io.h>
#endif // CGAL_IO_BINARY_FILE_IO_H
#ifndef CGAL_IO_FILE_HEADER_OFF_H
#include <CGAL/IO/File_header_OFF.h> #include <CGAL/IO/File_header_OFF.h>
#endif // CGAL_IO_FILE_HEADER_OFF_H
#ifndef CGAL_PROTECT_IOSTREAM
#include <iostream> #include <iostream>
#define CGAL_PROTECT_IOSTREAM
#endif
#ifndef CGAL_PROTECT_CSTDDEF
#include <cstddef> #include <cstddef>
#define CGAL_PROTECT_CSTDDEF
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

9
Stream_support/include/CGAL/IO/File_writer_VRML_2.h
View File

@ -23,17 +23,10 @@
#ifndef CGAL_IO_FILE_WRITER_VRML_2_H #ifndef CGAL_IO_FILE_WRITER_VRML_2_H
#define CGAL_IO_FILE_WRITER_VRML_2_H 1 #define CGAL_IO_FILE_WRITER_VRML_2_H 1
#ifndef CGAL_BASIC_H
#include <CGAL/basic.h> #include <CGAL/basic.h>
#endif // CGAL_BASIC_H
#ifndef CGAL_PROTECT_IOSTREAM
#include <iostream> #include <iostream>
#define CGAL_PROTECT_IOSTREAM
#endif
#ifndef CGAL_PROTECT_CSTDDEF
#include <cstddef> #include <cstddef>
#define CGAL_PROTECT_CSTDDEF
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

9
Stream_support/include/CGAL/IO/File_writer_inventor.h
View File

@ -23,17 +23,10 @@
#ifndef CGAL_IO_FILE_WRITER_INVENTOR_H #ifndef CGAL_IO_FILE_WRITER_INVENTOR_H
#define CGAL_IO_FILE_WRITER_INVENTOR_H 1 #define CGAL_IO_FILE_WRITER_INVENTOR_H 1
#ifndef CGAL_BASIC_H
#include <CGAL/basic.h> #include <CGAL/basic.h>
#endif // CGAL_BASIC_H
#ifndef CGAL_PROTECT_IOSTREAM
#include <iostream> #include <iostream>
#define CGAL_PROTECT_IOSTREAM
#endif
#ifndef CGAL_PROTECT_CSTDDEF
#include <cstddef> #include <cstddef>
#define CGAL_PROTECT_CSTDDEF
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

9
Stream_support/include/CGAL/IO/File_writer_wavefront.h
View File

@ -23,17 +23,10 @@
#ifndef CGAL_IO_FILE_WRITER_WAVEFRONT_H #ifndef CGAL_IO_FILE_WRITER_WAVEFRONT_H
#define CGAL_IO_FILE_WRITER_WAVEFRONT_H 1 #define CGAL_IO_FILE_WRITER_WAVEFRONT_H 1
#ifndef CGAL_IO_BINARY_FILE_IO_H
#include <CGAL/IO/binary_file_io.h> #include <CGAL/IO/binary_file_io.h>
#endif // CGAL_IO_BINARY_FILE_IO_H
#ifndef CGAL_PROTECT_IOSTREAM
#include <iostream> #include <iostream>
#define CGAL_PROTECT_IOSTREAM
#endif
#ifndef CGAL_PROTECT_CSTDDEF
#include <cstddef> #include <cstddef>
#define CGAL_PROTECT_CSTDDEF
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

6
Stream_support/include/CGAL/IO/Generic_writer.h
View File

@ -23,13 +23,9 @@
#ifndef CGAL_IO_GENERIC_WRITER_H #ifndef CGAL_IO_GENERIC_WRITER_H
#define CGAL_IO_GENERIC_WRITER_H 1 #define CGAL_IO_GENERIC_WRITER_H 1
#ifndef CGAL_BASIC_H
#include <CGAL/basic.h> #include <CGAL/basic.h>
#endif
#ifndef CGAL_PROTECT_ITERATOR
#include <iterator> #include <iterator>
#define CGAL_PROTECT_ITERATOR
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

13
Stream_support/include/CGAL/IO/generic_copy_OFF.h
View File

@ -23,23 +23,12 @@
#ifndef CGAL_IO_GENERIC_COPY_OFF_H #ifndef CGAL_IO_GENERIC_COPY_OFF_H
#define CGAL_IO_GENERIC_COPY_OFF_H 1 #define CGAL_IO_GENERIC_COPY_OFF_H 1
#ifndef CGAL_BASIC_H
#include <CGAL/basic.h> #include <CGAL/basic.h>
#endif
#ifndef CGAL_PROTECT_CSTDDEF
#include <cstddef> #include <cstddef>
#define CGAL_PROTECT_CSTDDEF
#endif
#ifndef CGAL_IO_FILE_HEADER_OFF_H
#include <CGAL/IO/File_header_OFF.h> #include <CGAL/IO/File_header_OFF.h>
#endif // CGAL_IO_FILE_HEADER_OFF_H
#ifndef CGAL_IO_FILE_SCANNER_OFF_H
#include <CGAL/IO/File_scanner_OFF.h> #include <CGAL/IO/File_scanner_OFF.h>
#endif // CGAL_IO_FILE_SCANNER_OFF_H
#ifndef CGAL_PROTECT_IOSTREAM
#include <iostream> #include <iostream>
#define CGAL_PROTECT_IOSTREAM
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

23
Stream_support/src/CGAL/File_header_OFF.cpp
View File

@ -21,38 +21,15 @@
// //
// Author(s) : Lutz Kettner <kettner@mpi-sb.mpg.de> // Author(s) : Lutz Kettner <kettner@mpi-sb.mpg.de>
#ifndef CGAL_BASIC_H
#include <CGAL/basic.h> #include <CGAL/basic.h>
#endif // CGAL_BASIC_H
#ifndef CGAL_KNOWN_BIT_SIZE_INTEGERS_H
#include <CGAL/known_bit_size_integers.h> #include <CGAL/known_bit_size_integers.h>
#endif
#ifndef CGAL_PROTECT_CSTDLIB
#include <cstdlib> #include <cstdlib>
#define CGAL_PROTECT_CSTDLIB
#endif
#ifndef CGAL_PROTECT_CCTYPE
#include <cctype> #include <cctype>
#define CGAL_PROTECT_CCTYPE
#endif
#ifndef CGAL_PROTECT_CSTRING
#include <cstring> #include <cstring>
#define CGAL_PROTECT_CSTRING
#endif
#ifndef CGAL_PROTECT_IOSTREAM
#include <iostream> #include <iostream>
#define CGAL_PROTECT_IOSTREAM
#endif
#ifndef CGAL_IO_BINARY_FILE_IO_H
#include <CGAL/IO/binary_file_io.h> #include <CGAL/IO/binary_file_io.h>
#endif // CGAL_IO_BINARY_FILE_IO_H
#ifndef CGAL_IO_FILE_HEADER_OFF_H
#include <CGAL/IO/File_header_OFF.h> #include <CGAL/IO/File_header_OFF.h>
#endif // CGAL_IO_FILE_HEADER_OFF_H
#ifndef CGAL_PROTECT_ALGORITHM
#include <algorithm> #include <algorithm>
#define CGAL_PROTECT_ALGORITHM
#endif
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

12
Stream_support/src/CGAL/File_scanner_OFF.cpp
View File

@ -21,23 +21,11 @@
// //
// Author(s) : Lutz Kettner <kettner@mpi-sb.mpg.de> // Author(s) : Lutz Kettner <kettner@mpi-sb.mpg.de>
#ifndef CGAL_BASIC_H
#include <CGAL/basic.h> #include <CGAL/basic.h>
#endif // CGAL_BASIC_H
#ifndef CGAL_PROTECT_CSTDLIB
#include <cstdlib> #include <cstdlib>
#define CGAL_PROTECT_CSTDLIB
#endif
#ifndef CGAL_PROTECT_IOSTREAM
#include <iostream> #include <iostream>
#define CGAL_PROTECT_IOSTREAM
#endif
#ifndef CGAL_IO_BINARY_FILE_IO_H
#include <CGAL/IO/binary_file_io.h> #include <CGAL/IO/binary_file_io.h>
#endif // CGAL_IO_BINARY_FILE_IO_H
#ifndef CGAL_IO_FILE_SCANNER_OFF_H
#include <CGAL/IO/File_scanner_OFF.h> #include <CGAL/IO/File_scanner_OFF.h>
#endif // CGAL_IO_FILE_SCANNER_OFF_H
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

7
Stream_support/src/CGAL/File_writer_OFF.cpp
View File

@ -21,16 +21,9 @@
// //
// Author(s) : Lutz Kettner <kettner@mpi-sb.mpg.de> // Author(s) : Lutz Kettner <kettner@mpi-sb.mpg.de>
#ifndef CGAL_BASIC_H
#include <CGAL/basic.h> #include <CGAL/basic.h>
#endif // CGAL_BASIC_H
#ifndef CGAL_PROTECT_IOSTREAM
#include <iostream> #include <iostream>
#define CGAL_PROTECT_IOSTREAM
#endif
#ifndef CGAL_IO_FILE_WRITER_OFF_H
#include <CGAL/IO/File_writer_OFF.h> #include <CGAL/IO/File_writer_OFF.h>
#endif // CGAL_IO_FILE_WRITER_OFF_H
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

7
Stream_support/src/CGAL/File_writer_VRML_2.cpp
View File

@ -21,16 +21,9 @@
// //
// Author(s) : Lutz Kettner <kettner@mpi-sb.mpg.de> // Author(s) : Lutz Kettner <kettner@mpi-sb.mpg.de>
#ifndef CGAL_BASIC_H
#include <CGAL/basic.h> #include <CGAL/basic.h>
#endif // CGAL_BASIC_H
#ifndef CGAL_PROTECT_IOSTREAM
#include <iostream> #include <iostream>
#define CGAL_PROTECT_IOSTREAM
#endif
#ifndef CGAL_IO_FILE_WRITER_VRML_2_H
#include <CGAL/IO/File_writer_VRML_2.h> #include <CGAL/IO/File_writer_VRML_2.h>
#endif // CGAL_IO_FILE_WRITER_VRML_2_H
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

7
Stream_support/src/CGAL/File_writer_wavefront.cpp
View File

@ -21,16 +21,9 @@
// //
// Author(s) : Lutz Kettner <kettner@mpi-sb.mpg.de> // Author(s) : Lutz Kettner <kettner@mpi-sb.mpg.de>
#ifndef CGAL_BASIC_H
#include <CGAL/basic.h> #include <CGAL/basic.h>
#endif // CGAL_BASIC_H
#ifndef CGAL_PROTECT_IOSTREAM
#include <iostream> #include <iostream>
#define CGAL_PROTECT_IOSTREAM
#endif
#ifndef CGAL_IO_FILE_WRITER_WAVEFRONT_H
#include <CGAL/IO/File_writer_wavefront.h> #include <CGAL/IO/File_writer_wavefront.h>
#endif // CGAL_IO_FILE_WRITER_WAVEFRONT_H
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE

39
Timer/src/CGAL/Real_timer.cpp
View File

@ -25,38 +25,27 @@
#include <CGAL/Real_timer.h> #include <CGAL/Real_timer.h>
#if defined (_MSC_VER) #if defined (_MSC_VER)
#define CGAL_PROTECT_SYS_TIME_H # include <sys/timeb.h>
#include <sys/timeb.h> # include <sys/types.h>
#include <sys/types.h>
#endif
#if defined (__BORLANDC__) #elif defined (__BORLANDC__)
#define CGAL_PROTECT_SYS_TIME_H # include <sys/timeb>
#include <sys/timeb> # include <ctype>
#include <ctype>
#endif
#if defined (__MWERKS__) #elif defined (__MWERKS__)
#define CGAL_PROTECT_SYS_TIME_H # include <ctime>
#include <ctime>
#endif
#if defined (__MINGW32__) #elif defined (__MINGW32__)
#define CGAL_PROTECT_SYS_TIME_H # include <sys/timeb.h>
#include <sys/timeb.h> # include <sys/types.h>
#include <sys/types.h>
#endif
#else
// If none of the above PC compilers, use POSIX fct. gettimeofday() // If none of the above PC compilers, use POSIX fct. gettimeofday()
#ifndef CGAL_PROTECT_SYS_TIME_H # include <sys/time.h>
#include <sys/time.h> #endif
#define CGAL_PROTECT_SYS_TIME_H
#endif // CGAL_PROTECT_SYS_TIME_H
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE
// Static member variable for Real_timer // Static member variable for Real_timer
// ===================================== // =====================================
@ -147,5 +136,3 @@ double Real_timer::precision() const {
} }
CGAL_END_NAMESPACE CGAL_END_NAMESPACE
// EOF //