From f76e744bffd50651a88465f593e2f55e2c003282 Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Wed, 17 Jan 2018 20:12:06 +0000
Subject: [PATCH] Spatial_searching

---
 Generator/include/CGAL/point_generators_d.h                  | 5 +++++
 Profiling_tools/include/CGAL/Memory_sizer.h                  | 2 +-
 STL_Extension/include/CGAL/Handle_for.h                      | 4 ++++
 Spatial_searching/include/CGAL/Incremental_neighbor_search.h | 3 +++
 Spatial_searching/include/CGAL/K_neighbor_search.h           | 2 ++
 Spatial_searching/include/CGAL/Kd_tree.h                     | 1 -
 Spatial_searching/include/CGAL/Kd_tree_node.h                | 2 +-
 .../include/CGAL/Orthogonal_incremental_neighbor_search.h    | 3 +++
 .../include/CGAL/Orthogonal_k_neighbor_search.h              | 3 +++
 Spatial_searching/include/CGAL/Search_traits_adapter.h       | 3 +++
 10 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/Generator/include/CGAL/point_generators_d.h b/Generator/include/CGAL/point_generators_d.h
index 008e4719c50..1cc01033b5d 100644
--- a/Generator/include/CGAL/point_generators_d.h
+++ b/Generator/include/CGAL/point_generators_d.h
@@ -22,6 +22,9 @@
 
 #ifndef CGAL_POINT_GENERATORS_D_H
 #define CGAL_POINT_GENERATORS_D_H 1
+
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/generators.h>
 #include <CGAL/number_type_basic.h>
 #include <cmath>
@@ -208,5 +211,7 @@ points_on_cube_grid_d( int dimension, double a,
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_POINT_GENERATORS_D_H //
 // EOF //
diff --git a/Profiling_tools/include/CGAL/Memory_sizer.h b/Profiling_tools/include/CGAL/Memory_sizer.h
index 4500aa2a011..a590745c862 100644
--- a/Profiling_tools/include/CGAL/Memory_sizer.h
+++ b/Profiling_tools/include/CGAL/Memory_sizer.h
@@ -80,7 +80,7 @@ private:
   { 
 #ifdef _MSC_VER
     DWORD pid = GetCurrentProcessId();
-    size_type result;
+    size_type result=0;
     HANDLE hProcess;
     PROCESS_MEMORY_COUNTERS pmc;
     hProcess = OpenProcess(  PROCESS_QUERY_INFORMATION |
diff --git a/STL_Extension/include/CGAL/Handle_for.h b/STL_Extension/include/CGAL/Handle_for.h
index b8148310d12..55f6a086c3c 100644
--- a/STL_Extension/include/CGAL/Handle_for.h
+++ b/STL_Extension/include/CGAL/Handle_for.h
@@ -26,6 +26,8 @@
 #ifndef CGAL_HANDLE_FOR_H
 #define CGAL_HANDLE_FOR_H
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/config.h>
 #include <CGAL/assertions.h> // for CGAL_assume
 
@@ -313,4 +315,6 @@ get_pointee_or_identity(const T &t)
 #  pragma warning(pop)
 #endif
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_HANDLE_FOR_H
diff --git a/Spatial_searching/include/CGAL/Incremental_neighbor_search.h b/Spatial_searching/include/CGAL/Incremental_neighbor_search.h
index 79fecf50054..9b71e56c4e8 100644
--- a/Spatial_searching/include/CGAL/Incremental_neighbor_search.h
+++ b/Spatial_searching/include/CGAL/Incremental_neighbor_search.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Spatial_searching.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <cstring>
 #include <list>
@@ -550,4 +551,6 @@ namespace CGAL {
 
 } // namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif  // CGAL_INCREMENTAL_NEIGHBOR_SEARCH_H
diff --git a/Spatial_searching/include/CGAL/K_neighbor_search.h b/Spatial_searching/include/CGAL/K_neighbor_search.h
index 655088baa37..b46db779a26 100644
--- a/Spatial_searching/include/CGAL/K_neighbor_search.h
+++ b/Spatial_searching/include/CGAL/K_neighbor_search.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Spatial_searching.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/internal/K_neighbor_search.h>
 #include <CGAL/internal/Get_dimension_tag.h>
@@ -142,5 +143,6 @@ private:
 
 } // namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif  // CGAL_K_NEIGHBOR_SEARCH_H
diff --git a/Spatial_searching/include/CGAL/Kd_tree.h b/Spatial_searching/include/CGAL/Kd_tree.h
index ba27e527745..c431e87bd33 100644
--- a/Spatial_searching/include/CGAL/Kd_tree.h
+++ b/Spatial_searching/include/CGAL/Kd_tree.h
@@ -417,7 +417,6 @@ private:
       //if (traits().construct_cartesian_const_iterator_d_object()(p)[newparent->cutting_dimension()] >= newparent->cutting_value())
 	return remove_(p, parent, islower, newparent, false, newparent->upper(), equal_to_p);
 
-      CGAL_assertion(false); // Point was not found
     }
 
     // Actual removal
diff --git a/Spatial_searching/include/CGAL/Kd_tree_node.h b/Spatial_searching/include/CGAL/Kd_tree_node.h
index 05ef0dc38ff..2699edf5987 100644
--- a/Spatial_searching/include/CGAL/Kd_tree_node.h
+++ b/Spatial_searching/include/CGAL/Kd_tree_node.h
@@ -553,7 +553,7 @@ namespace CGAL {
 
     inline
     void set_separator(Separator& sep){
-      cut_dim = sep.cutting_dimension();
+      cut_dim = static_cast<boost::uint8_t>(sep.cutting_dimension());
       cut_val = sep.cutting_value();
     }
   	
diff --git a/Spatial_searching/include/CGAL/Orthogonal_incremental_neighbor_search.h b/Spatial_searching/include/CGAL/Orthogonal_incremental_neighbor_search.h
index 5b540f5eec7..a7a6ffb8822 100644
--- a/Spatial_searching/include/CGAL/Orthogonal_incremental_neighbor_search.h
+++ b/Spatial_searching/include/CGAL/Orthogonal_incremental_neighbor_search.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Spatial_searching.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <cstring>
 #include <list>
@@ -621,4 +622,6 @@ namespace CGAL {
 
 } // namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_ORTHOGONAL_INCREMENTAL_NEIGHBOR_SEARCH_H
diff --git a/Spatial_searching/include/CGAL/Orthogonal_k_neighbor_search.h b/Spatial_searching/include/CGAL/Orthogonal_k_neighbor_search.h
index 5afdd732378..b8c649a4afc 100644
--- a/Spatial_searching/include/CGAL/Orthogonal_k_neighbor_search.h
+++ b/Spatial_searching/include/CGAL/Orthogonal_k_neighbor_search.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Spatial_searching.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/internal/K_neighbor_search.h>
 
@@ -194,4 +195,6 @@ private:
 
 } // namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif  // CGAL_ORTHOGONAL_K_NEIGHBOR_SEARCH_H
diff --git a/Spatial_searching/include/CGAL/Search_traits_adapter.h b/Spatial_searching/include/CGAL/Search_traits_adapter.h
index b07f761c1c0..f6d4eae7c6d 100644
--- a/Spatial_searching/include/CGAL/Search_traits_adapter.h
+++ b/Spatial_searching/include/CGAL/Search_traits_adapter.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Spatial_searching.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Kd_tree_rectangle.h>
 #include <CGAL/Euclidean_distance.h> //for default distance specialization
@@ -193,4 +194,6 @@ public:
 
 }//namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif //CGAL_SEARCH_TRAITS_WITH_INFO