From f972c6da7a80293f740920cc1f9e3375532338c4 Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Thu, 18 Jan 2018 10:46:12 +0000
Subject: [PATCH] Nef

---
 Nef_2/include/CGAL/Nef_2/Segment_overlay_traits.h   | 2 +-
 Triangulation/include/CGAL/Delaunay_triangulation.h | 3 +++
 Triangulation/include/CGAL/Triangulation.h          | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Nef_2/include/CGAL/Nef_2/Segment_overlay_traits.h b/Nef_2/include/CGAL/Nef_2/Segment_overlay_traits.h
index a19df76726e..01179236725 100644
--- a/Nef_2/include/CGAL/Nef_2/Segment_overlay_traits.h
+++ b/Nef_2/include/CGAL/Nef_2/Segment_overlay_traits.h
@@ -1039,7 +1039,7 @@ public:
       x2iso[&*event] = 0;
     }
     
-    ISegment next_seg = ISegment();
+    ISegment next_seg = ISegment(); // to avoid /W4 warning
     seg_iterator next_it = SQ.begin();
     while ( next_it != SQ.end() && 
 	    ( next_seg = next_it->second, p_sweep == source(next_seg)) ) {
diff --git a/Triangulation/include/CGAL/Delaunay_triangulation.h b/Triangulation/include/CGAL/Delaunay_triangulation.h
index 40076704d30..a5fa258db23 100644
--- a/Triangulation/include/CGAL/Delaunay_triangulation.h
+++ b/Triangulation/include/CGAL/Delaunay_triangulation.h
@@ -23,6 +23,7 @@
 
 #include <CGAL/license/Triangulation.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/tss.h>
 #include <CGAL/Triangulation.h>
@@ -934,4 +935,6 @@ Delaunay_triangulation<DCTraits, TDS>
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_DELAUNAY_COMPLEX_H
diff --git a/Triangulation/include/CGAL/Triangulation.h b/Triangulation/include/CGAL/Triangulation.h
index dd1f7c9c560..f040c53e494 100644
--- a/Triangulation/include/CGAL/Triangulation.h
+++ b/Triangulation/include/CGAL/Triangulation.h
@@ -23,6 +23,7 @@
 
 #include <CGAL/license/Triangulation.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/internal/Triangulation/utilities.h>
 #include <CGAL/Triangulation_data_structure.h>
@@ -1431,4 +1432,6 @@ operator<<(std::ostream & os, const Triangulation<TT, TDS> & tr)
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_TRIANGULATION_H