diff --git a/include/boost/geometry/algorithms/detail/overlay/assemble.hpp b/include/boost/geometry/algorithms/detail/overlay/assemble.hpp index b7142382c..77c570419 100644 --- a/include/boost/geometry/algorithms/detail/overlay/assemble.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/assemble.hpp @@ -15,6 +15,12 @@ #include +#ifdef BOOST_GEOMETRY_DEBUG_ASSEMBLE +# define BOOST_GEOMETRY_DEBUG_IDENTIFIER +# include +#endif + + #include #include #include @@ -33,9 +39,6 @@ #include -#ifdef BOOST_GEOMETRY_DEBUG_ASSEMBLE -# include -#endif namespace boost { namespace geometry diff --git a/include/boost/geometry/algorithms/detail/sections/get_section.hpp b/include/boost/geometry/algorithms/detail/sections/get_section.hpp deleted file mode 100644 index b52952258..000000000 --- a/include/boost/geometry/algorithms/detail/sections/get_section.hpp +++ /dev/null @@ -1,58 +0,0 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) -// -// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands. -// Copyright Bruno Lalande 2008, 2009 -// Use, modification and distribution is subject to the Boost Software License, -// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_SECTIONS_GET_SECTION_HPP -#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_SECTIONS_GET_SECTION_HPP - -// OBSOLETE - -/*** - -#include - - - -namespace boost { namespace geometry -{ - - - - \brief Get iterators for a specified section - \ingroup sectionalize - \tparam Range type - \tparam Section type of section to get from - \param range range (retrieved by "range_by_section") to take section of - \param section structure with section - \param begin begin-iterator (const iterator over points of section) - \param end end-iterator (const iterator over points of section) - -template -inline void get_section(Range const& range, Section const& section, - typename boost::range_iterator::type& begin, - typename boost::range_iterator::type& end) -{ - begin = boost::begin(range) + section.begin_index; - end = boost::begin(range) + section.end_index + 1; -} - - -// non const version -template -inline void get_section(Range& range, Section const& section, - typename boost::range_iterator::type& begin, - typename boost::range_iterator::type& end) -{ - begin = boost::begin(range) + section.begin_index; - end = boost::begin(range) + section.end_index + 1; -} - -}} // namespace boost::geometry - -****/ - -#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_SECTIONS_GET_SECTION_HPP diff --git a/include/boost/geometry/multi/algorithms/detail/sections/get_section.hpp b/include/boost/geometry/multi/algorithms/detail/sections/get_section.hpp deleted file mode 100644 index 3c450d787..000000000 --- a/include/boost/geometry/multi/algorithms/detail/sections/get_section.hpp +++ /dev/null @@ -1,78 +0,0 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) -// -// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands. -// Copyright Bruno Lalande 2008, 2009 -// Use, modification and distribution is subject to the Boost Software License, -// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -#ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_SECTIONS_GET_SECTION_HPP -#define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_SECTIONS_GET_SECTION_HPP - - -// OBSOLETE -/* -#include -#include -#include - -#include - -#include - - -namespace boost { namespace geometry -{ - - -#ifndef DOXYGEN_NO_DISPATCH -namespace dispatch -{ - - -template -struct get_section -{ - typedef typename boost::range_iterator - < - typename add_const_if_c - < - IsConst, - typename geometry::range_type::type - >::type - >::type iterator_type; - - static inline void apply( - typename add_const_if_c - < - IsConst, - MultiPolygon - >::type const& multi_polygon, - Section const& section, - iterator_type& begin, iterator_type& end) - { - BOOST_ASSERT( - section.multi_index >= 0 - && section.multi_index < boost::size(multi_polygon) - ); - - get_section - < - polygon_tag, - typename boost::range_value::type, - Section, - IsConst - >::apply(multi_polygon[section.multi_index], section, begin, end); - } -}; - - -} // namespace dispatch -#endif - - -}} // namespace boost::geometry - -*/ - -#endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_SECTIONS_GET_SECTION_HPP