From 43d2ecb52119d998ea503a10d166e5804c71943d Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Wed, 17 Jan 2018 16:57:46 +0000
Subject: [PATCH] Triangulation_3

---
 Filtered_kernel/include/CGAL/Lazy.h                   |  3 +++
 Generator/include/CGAL/point_generators_3.h           |  4 ++++
 Installation/include/CGAL/disable_warnings.h          |  4 ++--
 .../include/CGAL/Regular_triangulation_3.h            | 11 +++--------
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Filtered_kernel/include/CGAL/Lazy.h b/Filtered_kernel/include/CGAL/Lazy.h
index 6e2ae0079a8..1cfb6838fe5 100644
--- a/Filtered_kernel/include/CGAL/Lazy.h
+++ b/Filtered_kernel/include/CGAL/Lazy.h
@@ -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
diff --git a/Generator/include/CGAL/point_generators_3.h b/Generator/include/CGAL/point_generators_3.h
index ce45f184431..7e83b1dab3c 100644
--- a/Generator/include/CGAL/point_generators_3.h
+++ b/Generator/include/CGAL/point_generators_3.h
@@ -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 //
diff --git a/Installation/include/CGAL/disable_warnings.h b/Installation/include/CGAL/disable_warnings.h
index ead4cca6320..645f623b52d 100644
--- a/Installation/include/CGAL/disable_warnings.h
+++ b/Installation/include/CGAL/disable_warnings.h
@@ -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
diff --git a/Triangulation_3/include/CGAL/Regular_triangulation_3.h b/Triangulation_3/include/CGAL/Regular_triangulation_3.h
index bfb6e10e51c..4a39fc68518 100644
--- a/Triangulation_3/include/CGAL/Regular_triangulation_3.h
+++ b/Triangulation_3/include/CGAL/Regular_triangulation_3.h
@@ -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