From 07b0ddf9a5bc1cf8638c7c8b376e1d47bb869f28 Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Tue, 13 Feb 2018 14:15:38 +0000
Subject: [PATCH] Fix disable/enable warnings; Fix indentation

---
 Mesh_3/include/CGAL/make_mesh_3.h                             | 2 +-
 Surface_mesher/include/CGAL/Multi_surface_3.h                 | 3 +++
 Surface_mesher/include/CGAL/Surface_mesher/Combining_oracle.h | 2 ++
 TDS_3/include/CGAL/Triangulation_data_structure_3.h           | 3 +++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Mesh_3/include/CGAL/make_mesh_3.h b/Mesh_3/include/CGAL/make_mesh_3.h
index f8830a0f7ec..7c54c459f00 100644
--- a/Mesh_3/include/CGAL/make_mesh_3.h
+++ b/Mesh_3/include/CGAL/make_mesh_3.h
@@ -119,7 +119,7 @@ namespace parameters {
   
   // -----------------------------------
   // Parameters
-  //  
+  // -----------------------------------
 
 // see <CGAL/config.h>
 CGAL_PRAGMA_DIAG_PUSH
diff --git a/Surface_mesher/include/CGAL/Multi_surface_3.h b/Surface_mesher/include/CGAL/Multi_surface_3.h
index 8236b7326fb..707a6936589 100644
--- a/Surface_mesher/include/CGAL/Multi_surface_3.h
+++ b/Surface_mesher/include/CGAL/Multi_surface_3.h
@@ -23,6 +23,7 @@
 
 #include <CGAL/license/Surface_mesher.h>
 
+#include <CGAL/disable_warnings.h>
 
 namespace CGAL {
 
@@ -74,4 +75,6 @@ namespace CGAL {
   };
 } // end namespace CGAL, second occurrence.
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MULTI_SURFACE_3_H
diff --git a/Surface_mesher/include/CGAL/Surface_mesher/Combining_oracle.h b/Surface_mesher/include/CGAL/Surface_mesher/Combining_oracle.h
index 88e6dda563e..bec19aeb2fd 100644
--- a/Surface_mesher/include/CGAL/Surface_mesher/Combining_oracle.h
+++ b/Surface_mesher/include/CGAL/Surface_mesher/Combining_oracle.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Surface_mesher.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <list>
 #include <algorithm>
@@ -156,5 +157,6 @@ namespace CGAL {
 
 } // namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif  // CGAL_SURFACE_MESHER_COMBINING_ORACLE_H
diff --git a/TDS_3/include/CGAL/Triangulation_data_structure_3.h b/TDS_3/include/CGAL/Triangulation_data_structure_3.h
index 4fd3c47d164..09981b25aa3 100644
--- a/TDS_3/include/CGAL/Triangulation_data_structure_3.h
+++ b/TDS_3/include/CGAL/Triangulation_data_structure_3.h
@@ -28,6 +28,7 @@
 
 #include <CGAL/license/TDS_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/basic.h>
 
@@ -4011,4 +4012,6 @@ count_cells(size_type & i, bool verbose, int level) const
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_TRIANGULATION_DATA_STRUCTURE_3_H