Merge branch 'CGAL_workaround_counting_iterator-GF'

Approved by the release manager

Algebraic_foundations/include/CGAL/Coercion_traits.h

@@ -32,7 +32,7 @@
 
 #include <iterator>
 
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 #include <CGAL/tags.h>

Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/shear.h

@@ -32,7 +32,7 @@
 #include <functional>
 #include <iterator>
 #include <boost/iterator/transform_iterator.hpp>
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 
 namespace CGAL {
 

Bounding_volumes/include/CGAL/Min_annulus_d.h

@@ -30,7 +30,7 @@
 #include <CGAL/QP_solver/functors.h>
 #include <CGAL/QP_solver/QP_full_filtered_pricing.h>
 #include <CGAL/QP_solver/QP_full_exact_pricing.h>
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 #include <boost/iterator/transform_iterator.hpp>
 
 // here is how it works. We have d+2 variables: 

Installation/include/CGAL/boost/iterator/counting_iterator.hpp

@@ -0,0 +1,41 @@
+// Copyright (c) 2014  
+// Utrecht University (The Netherlands),
+// ETH Zurich (Switzerland),
+// INRIA Sophia-Antipolis (France),
+// Max-Planck-Institute Saarbruecken (Germany),
+// and Tel-Aviv University (Israel).  All rights reserved. 
+//
+// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public License as
+// published by the Free Software Foundation; either version 3 of the License,
+// or (at your option) any later version.
+//
+// Licensees holding a valid commercial license may use this file in
+// accordance with the commercial license agreement provided with the software.
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+//
+// $URL$
+// $Id$
+// 
+//
+// Author(s)     : Andreas Fabri
+ 
+#ifndef CGAL_BOOST_ITERATOR_COUNTING_ITERATOR_H
+#define CGAL_BOOST_ITERATOR_COUNTING_ITERATOR_H
+
+#include <boost/config.hpp>
+
+#if defined(BOOST_MSVC)
+#  pragma warning(push)
+#  pragma warning(disable:4244)
+#endif
+
+#include <boost/iterator/counting_iterator.hpp>
+
+#if defined(BOOST_MSVC)
+#  pragma warning(pop)
+#endif
+
+#endif // CGAL_BOOST_ITERATOR_COUNTING_ITERATOR_H

Installation/include/CGAL/boost/iterator/transform_iterator.hpp

@@ -0,0 +1,41 @@
+// Copyright (c) 2014  
+// Utrecht University (The Netherlands),
+// ETH Zurich (Switzerland),
+// INRIA Sophia-Antipolis (France),
+// Max-Planck-Institute Saarbruecken (Germany),
+// and Tel-Aviv University (Israel).  All rights reserved. 
+//
+// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public License as
+// published by the Free Software Foundation; either version 3 of the License,
+// or (at your option) any later version.
+//
+// Licensees holding a valid commercial license may use this file in
+// accordance with the commercial license agreement provided with the software.
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+//
+// $URL$
+// $Id$
+// 
+//
+// Author(s)     : Andreas Fabri
+ 
+#ifndef CGAL_BOOST_ITERATOR_TRANSFORM_ITERATOR_H
+#define CGAL_BOOST_ITERATOR_TRANSFORM_ITERATOR_H
+
+#include <boost/config.hpp>
+
+#if defined(BOOST_MSVC)
+#  pragma warning(push)
+#  pragma warning(disable:4244)
+#endif
+
+#include <boost/iterator/transform_iterator.hpp>
+
+#if defined(BOOST_MSVC)
+#  pragma warning(pop)
+#endif
+
+#endif // CGAL_BOOST_ITERATOR_TRANSFORM_ITERATOR_H

QP_solver/include/CGAL/QP_models.h

@@ -31,7 +31,8 @@
 #include <iomanip>
 #include <istream>
 #include <sstream>
-#include <boost/iterator/counting_iterator.hpp>
+
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 #include <boost/iterator/transform_iterator.hpp>
 
 // this file defines the following models:

QP_solver/include/CGAL/QP_solution.h

@@ -33,7 +33,8 @@
 #include <CGAL/QP_solver/assertions.h>
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
-#include <boost/iterator/counting_iterator.hpp>
+
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 #include <boost/iterator/transform_iterator.hpp>
 
 namespace CGAL {

QP_solver/include/CGAL/QP_solver/QP_solver.h

@@ -43,6 +43,7 @@
 
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
+
 #include <boost/iterator/transform_iterator.hpp>
 
 #include <vector>

Random_numbers/include/CGAL/Random.h

@@ -29,9 +29,16 @@
 #include <utility>
 #include <CGAL/basic.h>
 
+#if defined(BOOST_MSVC)
+#  pragma warning(push)
+#  pragma warning(disable:4244)
+#endif
+#include <boost/random/uniform_smallint.hpp>
+#if defined(BOOST_MSVC)
+#  pragma warning(pop)
+#endif
 #include <boost/random/linear_congruential.hpp>
 #include <boost/random/uniform_int.hpp>
-#include <boost/random/uniform_smallint.hpp>
 #include <boost/random/uniform_real.hpp>
 #include <boost/random/uniform_01.hpp>
 #include <boost/random/variate_generator.hpp>

Spatial_searching/examples/Spatial_searching/CMakeLists.txt

@@ -0,0 +1,90 @@
+# Created by the script cgal_create_CMakeLists
+# This is the CMake script for compiling a set of CGAL applications.
+
+project( Spatial_searching )
+
+
+cmake_minimum_required(VERSION 2.6.2)
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
+  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
+    cmake_policy(VERSION 2.8.4)
+  else()
+    cmake_policy(VERSION 2.6)
+  endif()
+endif()
+
+set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true )
+ 
+if ( COMMAND cmake_policy )
+
+  cmake_policy( SET CMP0003 NEW )  
+
+endif()
+
+# CGAL and its components
+find_package( CGAL QUIET COMPONENTS  )
+
+if ( NOT CGAL_FOUND )
+
+  message(STATUS "This project requires the CGAL library, and will not be compiled.")
+  return()  
+
+endif()
+
+# include helper file
+include( ${CGAL_USE_FILE} )
+ 
+if (MSVC)
+    # Turn off VC++ warning
+    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244")
+endif()
+
+# Boost and its components
+find_package( Boost REQUIRED )
+
+if ( NOT Boost_FOUND )
+
+  message(STATUS "This project requires the Boost library, and will not be compiled.")
+
+  return()  
+
+endif()
+
+# include for local directory
+
+# include for local package
+include_directories( BEFORE ../../include )
+
+
+# Creating entries for all .cpp/.C files with "main" routine
+# ##########################################################
+
+include( CGAL_CreateSingleSourceCGALProgram )
+
+create_single_source_cgal_program( "circular_query.cpp" )
+
+create_single_source_cgal_program( "distance_browsing.cpp" )
+
+create_single_source_cgal_program( "fuzzy_range_query.cpp" )
+
+create_single_source_cgal_program( "general_neighbor_searching.cpp" )
+
+create_single_source_cgal_program( "iso_rectangle_2_query.cpp" )
+
+create_single_source_cgal_program( "nearest_neighbor_searching.cpp" )
+
+create_single_source_cgal_program( "searching_with_circular_query.cpp" )
+
+create_single_source_cgal_program( "searching_with_point_with_info.cpp" )
+
+create_single_source_cgal_program( "searching_with_point_with_info_inplace.cpp" )
+
+create_single_source_cgal_program( "searching_with_point_with_info_pmap.cpp" )
+
+create_single_source_cgal_program( "user_defined_point_and_distance.cpp" )
+
+create_single_source_cgal_program( "using_fair_splitting_rule.cpp" )
+
+create_single_source_cgal_program( "weighted_Minkowski_distance.cpp" )
+
+