Add wrappers around 2 boost headers to push/pop pragma

Author: afabri

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/examples/Min_annulus_d/min_annulus_d.cpp

@@ -3,7 +3,26 @@
 // as input type and some internal EXACT floating point type
 #include <iostream>
 #include <cassert>
+
+#if 0
+#include <CGAL/config.h>
+
+#if defined(BOOST_MSVC)
+#  pragma warning(push)
+#  pragma warning(disable:4244)
+#endif
+
+//#include <boost/iterator/counting_iterator.hpp>
+#include <boost/iterator/iterator_adaptor.hpp>
+
+#if defined(BOOST_MSVC)
+#  pragma warning(pop)
+#endif
+#endif
+
 #include <CGAL/Homogeneous.h>
+
+
 #include <CGAL/Min_annulus_d.h>
 #include <CGAL/Min_sphere_annulus_d_traits_2.h>
 

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_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

QP_solver/include/CGAL/QP_models.h

@@ -32,15 +32,7 @@
 #include <istream>
 #include <sstream>
 
-#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
-
+#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,14 +33,8 @@
 #include <CGAL/QP_solver/assertions.h>
 #include <boost/bind.hpp>
 #include <boost/function.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
+
+#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>