From 257b18035188ec6a94cc25e08ef3bc3c38a90ae6 Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Thu, 18 Jan 2018 13:56:10 +0000
Subject: [PATCH] Triangulation

---
 Installation/include/CGAL/disable_warnings.h                | 1 +
 NewKernel_d/include/CGAL/Epeck_d.h                          | 6 ++++++
 NewKernel_d/include/CGAL/Epick_d.h                          | 6 ++++++
 NewKernel_d/test/NewKernel_d/Epick_d.cpp                    | 6 ++++++
 Triangulation/include/CGAL/Regular_triangulation.h          | 4 ++++
 Triangulation/include/CGAL/Triangulation_data_structure.h   | 3 +++
 Triangulation/include/CGAL/Triangulation_ds_full_cell.h     | 3 +++
 Triangulation/include/CGAL/Triangulation_ds_vertex.h        | 3 +++
 Triangulation/include/CGAL/Triangulation_face.h             | 3 +++
 Triangulation/include/CGAL/Triangulation_full_cell.h        | 3 +++
 Triangulation/include/CGAL/Triangulation_vertex.h           | 3 +++
 .../include/CGAL/internal/Combination_enumerator.h          | 3 +++
 12 files changed, 44 insertions(+)

diff --git a/Installation/include/CGAL/disable_warnings.h b/Installation/include/CGAL/disable_warnings.h
index cb388ea188d..75cb6574e6e 100644
--- a/Installation/include/CGAL/disable_warnings.h
+++ b/Installation/include/CGAL/disable_warnings.h
@@ -30,6 +30,7 @@
 #  pragma warning(disable: 4512) //  assignment operator could not be generated#  pragma warning(disable: 4522)  // multiple assignment operators specified
 #  pragma warning(disable: 4610) // can never be instantiated - user defined constructor required
 #  pragma warning(disable: 4706) // assignment within conditional expression
+#  pragma warning(disable: 4714) // function marked as __forceinline not inlined
 #  pragma warning(disable: 4800) //  forcing value to bool 'true' or 'false' (performance warning)
 #  pragma warning(disable: 4913) // user defined binary operator ',' exists but no overload could convert all operands, default built-in binary operator ',' used
 
diff --git a/NewKernel_d/include/CGAL/Epeck_d.h b/NewKernel_d/include/CGAL/Epeck_d.h
index 34bb5b4b46d..e8fa035db94 100644
--- a/NewKernel_d/include/CGAL/Epeck_d.h
+++ b/NewKernel_d/include/CGAL/Epeck_d.h
@@ -20,6 +20,9 @@
 
 #ifndef CGAL_EPECK_D_H
 #define CGAL_EPECK_D_H
+
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/NewKernel_d/Cartesian_base.h>
 #include <CGAL/NewKernel_d/Wrapper/Cartesian_wrap.h>
 #include <CGAL/NewKernel_d/Kernel_d_interface.h>
@@ -51,4 +54,7 @@ struct Epeck_d
 };
 #undef CGAL_BASE
 }
+
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/NewKernel_d/include/CGAL/Epick_d.h b/NewKernel_d/include/CGAL/Epick_d.h
index 6d0f1210f12..5728e41e745 100644
--- a/NewKernel_d/include/CGAL/Epick_d.h
+++ b/NewKernel_d/include/CGAL/Epick_d.h
@@ -20,6 +20,9 @@
 
 #ifndef CGAL_EPICK_D_H
 #define CGAL_EPICK_D_H
+
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/NewKernel_d/Cartesian_base.h>
 #include <CGAL/NewKernel_d/Cartesian_static_filters.h>
 #include <CGAL/NewKernel_d/Cartesian_filter_K.h>
@@ -69,4 +72,7 @@ struct Epick_d
 };
 #undef CGAL_BASE
 }
+
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/NewKernel_d/test/NewKernel_d/Epick_d.cpp b/NewKernel_d/test/NewKernel_d/Epick_d.cpp
index bed06b20a03..3e8b3547d18 100644
--- a/NewKernel_d/test/NewKernel_d/Epick_d.cpp
+++ b/NewKernel_d/test/NewKernel_d/Epick_d.cpp
@@ -12,6 +12,7 @@ int main()
 //#define BOOST_RESULT_OF_USE_DECLTYPE 1
 #include <CGAL/Epick_d.h>
 #include <typeinfo>
+
 #include <CGAL/NewKernel_d/Cartesian_base.h>
 #include <CGAL/NewKernel_d/Cartesian_static_filters.h>
 #include <CGAL/NewKernel_d/Cartesian_filter_NT.h>
@@ -25,6 +26,7 @@ int main()
 #include <iostream>
 #include <sstream>
 #include <CGAL/NewKernel_d/Types/Weighted_point.h>
+
 #include <cmath>
 
 //typedef CGAL::Cartesian_base_d<double,CGAL::Dimension_tag<2> > K0;
@@ -411,6 +413,8 @@ void test2(){
   D un10; CGAL_USE(un10);
 }
 
+#  pragma warning(push)
+#  pragma warning(disable: 4512)
 template<class CP> struct Construct_point3_helper {
   CP const& cp;
   Construct_point3_helper(CP const& x) : cp(x) {}
@@ -426,6 +430,8 @@ template<class CP> struct Construct_point3_helper {
   }
 };
 
+#  pragma warning(pop)
+
 template<class Ker>
 void test3(){
   typedef Ker K1;
diff --git a/Triangulation/include/CGAL/Regular_triangulation.h b/Triangulation/include/CGAL/Regular_triangulation.h
index 73a4af99490..900c8d642da 100644
--- a/Triangulation/include/CGAL/Regular_triangulation.h
+++ b/Triangulation/include/CGAL/Regular_triangulation.h
@@ -23,6 +23,8 @@
 
 #include <CGAL/license/Triangulation.h>
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/Triangulation.h>
 #include <CGAL/Dimension.h>
 #include <CGAL/Default.h>
@@ -1166,4 +1168,6 @@ Regular_triangulation<Traits, TDS>
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif //CGAL_REGULAR_TRIANGULATION_H
diff --git a/Triangulation/include/CGAL/Triangulation_data_structure.h b/Triangulation/include/CGAL/Triangulation_data_structure.h
index bb74dcba91d..411ac09b6bf 100644
--- a/Triangulation/include/CGAL/Triangulation_data_structure.h
+++ b/Triangulation/include/CGAL/Triangulation_data_structure.h
@@ -23,6 +23,7 @@
 
 #include <CGAL/license/Triangulation.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/basic.h>
 #include <CGAL/Default.h>
@@ -1604,4 +1605,6 @@ operator<<(std::ostream & os, const Triangulation_data_structure<Dimen, Vb, Fcb>
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_TRIANGULATION_DATA_STRUCTURE_H
diff --git a/Triangulation/include/CGAL/Triangulation_ds_full_cell.h b/Triangulation/include/CGAL/Triangulation_ds_full_cell.h
index 3a1ce0a9579..922bcd3caee 100644
--- a/Triangulation/include/CGAL/Triangulation_ds_full_cell.h
+++ b/Triangulation/include/CGAL/Triangulation_ds_full_cell.h
@@ -23,6 +23,7 @@
 
 #include <CGAL/license/Triangulation.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/TDS_full_cell_default_storage_policy.h>
 #include <CGAL/TDS_full_cell_mirror_storage_policy.h>
@@ -312,4 +313,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_TRIANGULATION_DS_FULL_CELL_H
diff --git a/Triangulation/include/CGAL/Triangulation_ds_vertex.h b/Triangulation/include/CGAL/Triangulation_ds_vertex.h
index fcac607841d..83ab7f5261d 100644
--- a/Triangulation/include/CGAL/Triangulation_ds_vertex.h
+++ b/Triangulation/include/CGAL/Triangulation_ds_vertex.h
@@ -23,6 +23,7 @@
 
 #include <CGAL/license/Triangulation.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Compact_container.h>
 #include <CGAL/internal/Triangulation/Dummy_TDS.h>
@@ -155,4 +156,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_TRIANGULATION_DS_VERTEX_H
diff --git a/Triangulation/include/CGAL/Triangulation_face.h b/Triangulation/include/CGAL/Triangulation_face.h
index e0de1b49c71..950121a67da 100644
--- a/Triangulation/include/CGAL/Triangulation_face.h
+++ b/Triangulation/include/CGAL/Triangulation_face.h
@@ -23,6 +23,7 @@
 
 #include <CGAL/license/Triangulation.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/basic.h>
 #include <CGAL/internal/Static_or_dynamic_array.h>
@@ -112,4 +113,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_TRIANGULATION_FACE_H
diff --git a/Triangulation/include/CGAL/Triangulation_full_cell.h b/Triangulation/include/CGAL/Triangulation_full_cell.h
index 4a23a6f6495..0a3cc98fb6e 100644
--- a/Triangulation/include/CGAL/Triangulation_full_cell.h
+++ b/Triangulation/include/CGAL/Triangulation_full_cell.h
@@ -23,6 +23,7 @@
 
 #include <CGAL/license/Triangulation.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Triangulation_ds_full_cell.h>
 #include <CGAL/internal/Triangulation/utilities.h>
@@ -149,4 +150,6 @@ operator>>(std::istream & I, Triangulation_full_cell<TDS, Data, SSP> & s)
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_TRIANGULATION_SIMPLEX_H
diff --git a/Triangulation/include/CGAL/Triangulation_vertex.h b/Triangulation/include/CGAL/Triangulation_vertex.h
index c337ba644bf..11094d00f43 100644
--- a/Triangulation/include/CGAL/Triangulation_vertex.h
+++ b/Triangulation/include/CGAL/Triangulation_vertex.h
@@ -23,6 +23,7 @@
 
 #include <CGAL/license/Triangulation.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Triangulation_ds_vertex.h>
 #include <CGAL/Default.h>
@@ -129,4 +130,6 @@ operator<<(std::ostream & os, const Triangulation_vertex<A, Data, B> & v)
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_TRIANGULATION_VERTEX_H
diff --git a/Triangulation/include/CGAL/internal/Combination_enumerator.h b/Triangulation/include/CGAL/internal/Combination_enumerator.h
index f446e4c4d36..d4e7ce5e4a6 100644
--- a/Triangulation/include/CGAL/internal/Combination_enumerator.h
+++ b/Triangulation/include/CGAL/internal/Combination_enumerator.h
@@ -23,6 +23,7 @@
 
 #include <CGAL/license/Triangulation.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/basic.h>
 #include <vector>
@@ -149,4 +150,6 @@ public:
 
 } // end of namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_INTERNAL_COMBINATION_ENUMERATOR_H