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

Triangulation_3

This commit is contained in:
Andreas Fabri 2018-01-17 16:57:46 +00:00
parent fb51a69c7c
commit 43d2ecb521
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Filtered_kernel/include/CGAL/Lazy.h
View File

@ -22,6 +22,8 @@
#ifndef CGAL_LAZY_H
#define CGAL_LAZY_H
#include <CGAL/disable_warnings.h>
#include <CGAL/basic.h>
#include <CGAL/Handle.h>
#include <CGAL/Object.h>
@ -1760,5 +1762,6 @@ struct result<F( BOOST_PP_ENUM_PARAMS(n, T) )> { \
#undef CGAL_LEXACT
#undef CGAL_LARGS
#include <CGAL/enable_warnings.h>
#endif // CGAL_LAZY_H

4
Generator/include/CGAL/point_generators_3.h
View File

@ -28,6 +28,9 @@
#ifndef CGAL_POINT_GENERATORS_3_H
#define CGAL_POINT_GENERATORS_3_H 1
#include <CGAL/disable_warnings.h>
#include <CGAL/generators.h>
#include <CGAL/point_generators_2.h>
#include <CGAL/number_type_basic.h>
@ -696,6 +699,7 @@ struct Random_points_in_triangles_3
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_POINT_GENERATORS_3_H //
// EOF //

4
Installation/include/CGAL/disable_warnings.h
View File

@ -23,9 +23,9 @@
# pragma warning(push)
# pragma warning(disable: 4099) // struct class mixed
# pragma warning(disable: 4127) // conditional expression is constant
# pragma warning(disable:4355) // 'this' : used in base member initializer list
# pragma warning(disable: 4355) // 'this' : used in base member initializer list
# pragma warning(disable: 4510) // default constructor could not be generated
# pragma warning(disable: 4512) // assignment operator could not be generated
# pragma warning(disable: 4610) // can never be instantiated - user defined constructor required
# pragma warning(disable: 4706) // assignment within conditional expression
#endif

11
Triangulation_3/include/CGAL/Regular_triangulation_3.h
View File

@ -27,6 +27,8 @@
#include <CGAL/license/Triangulation_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/basic.h>
#include <set>
@ -68,11 +70,6 @@
#include <CGAL/point_generators_3.h>
#endif
#if defined(BOOST_MSVC)
# pragma warning(push)
# pragma warning(disable:4355) // complaint about using 'this' to
#endif // initialize a member
namespace CGAL {
/************************************************
@ -2570,8 +2567,6 @@ namespace CGAL {
} //namespace CGAL
#if defined(BOOST_MSVC)
# pragma warning(pop)
#endif
#include <CGAL/enable_warnings.h>
#endif // CGAL_REGULAR_TRIANGULATION_3_H