From f723c527e1416f3c10ca6d1f801dd484c3f0c0f0 Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Wed, 17 Jan 2018 21:56:19 +0000
Subject: [PATCH] Surface_mesh_shortest_path

---
 .../CGAL/internal/Surface_mesh_segmentation/Disk_samplers.h   | 4 ++++
 Surface_mesh_segmentation/include/CGAL/mesh_segmentation.h    | 3 +++
 .../Surface_mesh_shortest_path/Surface_mesh_shortest_path.h   | 4 +++-
 .../Surface_mesh_shortest_path_traits.h                       | 2 ++
 .../include/CGAL/Surface_mesh_shortest_path/barycentric.h     | 3 +++
 .../test/Surface_mesh_shortest_path/TestMesh.cpp              | 2 +-
 6 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Disk_samplers.h b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Disk_samplers.h
index c1c787427a3..10f4e821dd0 100644
--- a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Disk_samplers.h
+++ b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Disk_samplers.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Surface_mesh_segmentation.h>
 
+#include <CGAL/disable_warnings.h>
 
 /// @cond CGAL_DOCUMENT_INTERNAL
 
@@ -265,4 +266,7 @@ public:
 /// @endcond
 }//namespace CGAL
 #undef CGAL_ANGLE_ST_DEV_DIVIDER
+
+#include <CGAL/enable_warnings.h>
+
 #endif //CGAL_SURFACE_MESH_SEGMENTATION_DISK_SAMPLERS_H
diff --git a/Surface_mesh_segmentation/include/CGAL/mesh_segmentation.h b/Surface_mesh_segmentation/include/CGAL/mesh_segmentation.h
index 36e795a3574..49da4622a96 100644
--- a/Surface_mesh_segmentation/include/CGAL/mesh_segmentation.h
+++ b/Surface_mesh_segmentation/include/CGAL/mesh_segmentation.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Surface_mesh_segmentation.h>
 
+#include <CGAL/disable_warnings.h>
 
 /**
  * @file mesh_segmentation.h
@@ -499,4 +500,6 @@ segmentation_via_sdf_values(const TriangleMesh& triangle_mesh,
 
 }//namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_SURFACE_MESH_SEGMENTATION_MESH_SEGMENTATION_H //
diff --git a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h
index f4b1c32fe8e..d9a4afa291a 100644
--- a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h
+++ b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h
@@ -23,6 +23,7 @@
 
 #include <CGAL/license/Surface_mesh_shortest_path.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <iterator>
 #include <vector>
@@ -2059,7 +2060,6 @@ public:
       std::cout << "Final node count: " << m_currentNodeCount << std::endl;
     }
     return;
-    CGAL_assertion(m_currentNodeCount == 0);
 #endif
   }
 
@@ -2808,4 +2808,6 @@ public:
 
 } // namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_SURFACE_MESH_SHORTEST_PATH_SURFACE_MESH_SHORTEST_PATH_H
diff --git a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h
index a433ec75407..14307aba2b0 100644
--- a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h
+++ b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h
@@ -23,6 +23,7 @@
 
 #include <CGAL/license/Surface_mesh_shortest_path.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Surface_mesh_shortest_path/barycentric.h>
 #include <CGAL/Surface_mesh_shortest_path/function_objects.h>
@@ -225,5 +226,6 @@ public:
 
 } // namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_SURFACE_MESH_SHORTEST_PATH_TRAITS_H
diff --git a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/barycentric.h b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/barycentric.h
index 2347d7d7718..4c9d0f60a45 100644
--- a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/barycentric.h
+++ b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/barycentric.h
@@ -23,6 +23,7 @@
 
 #include <CGAL/license/Surface_mesh_shortest_path.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/number_utils.h>
 
@@ -262,4 +263,6 @@ public:
 
 } // namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_SURFACE_MESH_SHORTEST_PATHS_3_BARYCENTRIC_H
diff --git a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/TestMesh.cpp b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/TestMesh.cpp
index 3ef0247009e..33d52e8fe4a 100644
--- a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/TestMesh.cpp
+++ b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/TestMesh.cpp
@@ -90,7 +90,7 @@ struct TestMeshProgramInstance
 
     if (randomizer)
     {
-      return shortestPath.face_location(vertices[randomizer->get_int(0, vertices.size())]);
+      return shortestPath.face_location(vertices[randomizer->get_int(0, static_cast<int>(vertices.size()))]);
     }
     else
     {