Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r67295 - in sandbox/geometry/boost/geometry: algorithms/detail/overlay algorithms/detail/sections multi/algorithms/detail/sections
From: barend.gehrels_at_[hidden]
Date: 2010-12-18 05:29:50


Author: barendgehrels
Date: 2010-12-18 05:29:46 EST (Sat, 18 Dec 2010)
New Revision: 67295
URL: http://svn.boost.org/trac/boost/changeset/67295

Log:
Removed obsolete get_sections
Small debug-tweak in assemble
Removed:
   sandbox/geometry/boost/geometry/algorithms/detail/sections/get_section.hpp
   sandbox/geometry/boost/geometry/multi/algorithms/detail/sections/get_section.hpp
Text files modified:
   sandbox/geometry/boost/geometry/algorithms/detail/overlay/assemble.hpp | 9 ++++++---
   1 files changed, 6 insertions(+), 3 deletions(-)

Modified: sandbox/geometry/boost/geometry/algorithms/detail/overlay/assemble.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/overlay/assemble.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/overlay/assemble.hpp 2010-12-18 05:29:46 EST (Sat, 18 Dec 2010)
@@ -15,6 +15,12 @@
 
 #include <boost/range.hpp>
 
+#ifdef BOOST_GEOMETRY_DEBUG_ASSEMBLE
+# define BOOST_GEOMETRY_DEBUG_IDENTIFIER
+# include <boost/geometry/util/write_dsv.hpp>
+#endif
+
+
 #include <boost/geometry/algorithms/detail/overlay/get_ring.hpp>
 #include <boost/geometry/algorithms/detail/overlay/convert_ring.hpp>
 #include <boost/geometry/algorithms/detail/overlay/add_to_containment.hpp>
@@ -33,9 +39,6 @@
 #include <boost/geometry/strategies/agnostic/point_in_poly_winding.hpp>
 
 
-#ifdef BOOST_GEOMETRY_DEBUG_ASSEMBLE
-# include <boost/geometry/util/write_dsv.hpp>
-#endif
 
 
 namespace boost { namespace geometry

Deleted: sandbox/geometry/boost/geometry/algorithms/detail/sections/get_section.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/sections/get_section.hpp 2010-12-18 05:29:46 EST (Sat, 18 Dec 2010)
+++ (empty file)
@@ -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 <boost/range.hpp>
-
-
-
-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 <typename Range, typename Section>
-inline void get_section(Range const& range, Section const& section,
- typename boost::range_iterator<Range const>::type& begin,
- typename boost::range_iterator<Range const>::type& end)
-{
- begin = boost::begin(range) + section.begin_index;
- end = boost::begin(range) + section.end_index + 1;
-}
-
-
-// non const version
-template <typename Range, typename Section>
-inline void get_section(Range& range, Section const& section,
- typename boost::range_iterator<Range>::type& begin,
- typename boost::range_iterator<Range>::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

Deleted: sandbox/geometry/boost/geometry/multi/algorithms/detail/sections/get_section.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/detail/sections/get_section.hpp 2010-12-18 05:29:46 EST (Sat, 18 Dec 2010)
+++ (empty file)
@@ -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 <boost/assert.hpp>
-#include <boost/concept/requires.hpp>
-#include <boost/range.hpp>
-
-#include <boost/geometry/multi/core/tags.hpp>
-
-#include <boost/geometry/algorithms/detail/sections/get_section.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-
-template <typename MultiPolygon, typename Section, bool IsConst>
-struct get_section<multi_polygon_tag, MultiPolygon, Section, IsConst>
-{
- typedef typename boost::range_iterator
- <
- typename add_const_if_c
- <
- IsConst,
- typename geometry::range_type<MultiPolygon>::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<MultiPolygon>::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


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk