From c800f15ff04fa72f54e312db9889a54a26806846 Mon Sep 17 00:00:00 2001 From: Barend Gehrels Date: Thu, 17 Mar 2011 13:00:19 +0000 Subject: [PATCH] Removed obsolete files Moved two not-used experimental views to extensions/util Moved for_each_range from util to algorithm/detail and to namespace detail [SVN r70056] --- .../detail}/for_each_range.hpp | 11 ++-- .../algorithms/detail/overlay/get_turns.hpp | 4 +- include/boost/geometry/core/is_multi.hpp | 1 - .../util/get_cs_as_radian.hpp | 0 .../{ => extensions}/views/enveloped_view.hpp | 0 .../{ => extensions}/views/section_view.hpp | 0 .../concepts/detail/check_append.hpp | 1 - .../concepts/detail/check_clear.hpp | 1 - .../geometry/multi/algorithms/convex_hull.hpp | 2 +- .../detail}/for_each_range.hpp | 10 ++-- .../boost/geometry/multi/core/is_multi.hpp | 1 - .../agnostic/hull_graham_andrew.hpp | 8 +-- .../geometry/util/ensure_const_reference.hpp | 51 ------------------- .../boost/geometry/views/reversible_view.hpp | 2 +- 14 files changed, 21 insertions(+), 71 deletions(-) rename include/boost/geometry/{util => algorithms/detail}/for_each_range.hpp (92%) delete mode 100644 include/boost/geometry/core/is_multi.hpp rename include/boost/geometry/{ => extensions}/util/get_cs_as_radian.hpp (100%) rename include/boost/geometry/{ => extensions}/views/enveloped_view.hpp (100%) rename include/boost/geometry/{ => extensions}/views/section_view.hpp (100%) delete mode 100644 include/boost/geometry/geometries/concepts/detail/check_append.hpp delete mode 100644 include/boost/geometry/geometries/concepts/detail/check_clear.hpp rename include/boost/geometry/multi/{util => algorithms/detail}/for_each_range.hpp (84%) delete mode 100644 include/boost/geometry/multi/core/is_multi.hpp delete mode 100644 include/boost/geometry/util/ensure_const_reference.hpp diff --git a/include/boost/geometry/util/for_each_range.hpp b/include/boost/geometry/algorithms/detail/for_each_range.hpp similarity index 92% rename from include/boost/geometry/util/for_each_range.hpp rename to include/boost/geometry/algorithms/detail/for_each_range.hpp index 64729e97a..3f2597b19 100644 --- a/include/boost/geometry/util/for_each_range.hpp +++ b/include/boost/geometry/algorithms/detail/for_each_range.hpp @@ -6,8 +6,8 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#ifndef BOOST_GEOMETRY_UTIL_FOR_EACH_RANGE_HPP -#define BOOST_GEOMETRY_UTIL_FOR_EACH_RANGE_HPP +#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_FOR_EACH_RANGE_HPP +#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_FOR_EACH_RANGE_HPP #include @@ -95,6 +95,8 @@ struct for_each_range } // namespace dispatch #endif // DOXYGEN_NO_DISPATCH +namespace detail +{ template inline void for_each_range(Geometry const& geometry, Actor& actor) @@ -109,7 +111,10 @@ inline void for_each_range(Geometry const& geometry, Actor& actor) } +} + + }} // namespace boost::geometry -#endif // BOOST_GEOMETRY_UTIL_FOR_EACH_RANGE_HPP +#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_FOR_EACH_RANGE_HPP diff --git a/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp b/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp index 072164d72..d04dbebc2 100644 --- a/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp @@ -409,7 +409,7 @@ public: typedef typename boost::range_value::type ip_type; typedef typename ip_type::point_type point_type; typedef model::box box_type; - typedef typename geometry::sections sections_type; + typedef typename geometry::sections sections_type; sections_type sec1, sec2; @@ -427,7 +427,7 @@ public: geometry::partition < box_type, get_section_box, ovelaps_section_box - >::apply(sec1, sec2, visitor, 4); + >::apply(sec1, sec2, visitor); } }; diff --git a/include/boost/geometry/core/is_multi.hpp b/include/boost/geometry/core/is_multi.hpp deleted file mode 100644 index a921efba2..000000000 --- a/include/boost/geometry/core/is_multi.hpp +++ /dev/null @@ -1 +0,0 @@ -// obsolete diff --git a/include/boost/geometry/util/get_cs_as_radian.hpp b/include/boost/geometry/extensions/util/get_cs_as_radian.hpp similarity index 100% rename from include/boost/geometry/util/get_cs_as_radian.hpp rename to include/boost/geometry/extensions/util/get_cs_as_radian.hpp diff --git a/include/boost/geometry/views/enveloped_view.hpp b/include/boost/geometry/extensions/views/enveloped_view.hpp similarity index 100% rename from include/boost/geometry/views/enveloped_view.hpp rename to include/boost/geometry/extensions/views/enveloped_view.hpp diff --git a/include/boost/geometry/views/section_view.hpp b/include/boost/geometry/extensions/views/section_view.hpp similarity index 100% rename from include/boost/geometry/views/section_view.hpp rename to include/boost/geometry/extensions/views/section_view.hpp diff --git a/include/boost/geometry/geometries/concepts/detail/check_append.hpp b/include/boost/geometry/geometries/concepts/detail/check_append.hpp deleted file mode 100644 index a921efba2..000000000 --- a/include/boost/geometry/geometries/concepts/detail/check_append.hpp +++ /dev/null @@ -1 +0,0 @@ -// obsolete diff --git a/include/boost/geometry/geometries/concepts/detail/check_clear.hpp b/include/boost/geometry/geometries/concepts/detail/check_clear.hpp deleted file mode 100644 index a921efba2..000000000 --- a/include/boost/geometry/geometries/concepts/detail/check_clear.hpp +++ /dev/null @@ -1 +0,0 @@ -// obsolete diff --git a/include/boost/geometry/multi/algorithms/convex_hull.hpp b/include/boost/geometry/multi/algorithms/convex_hull.hpp index 73a481cb8..fa35ee850 100644 --- a/include/boost/geometry/multi/algorithms/convex_hull.hpp +++ b/include/boost/geometry/multi/algorithms/convex_hull.hpp @@ -10,7 +10,7 @@ #include -#include +#include // Note that this file is, furthermore, empty, // there is no specialization necessary diff --git a/include/boost/geometry/multi/util/for_each_range.hpp b/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp similarity index 84% rename from include/boost/geometry/multi/util/for_each_range.hpp rename to include/boost/geometry/multi/algorithms/detail/for_each_range.hpp index 975c93eb0..c95beea86 100644 --- a/include/boost/geometry/multi/util/for_each_range.hpp +++ b/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp @@ -6,14 +6,14 @@ // 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_UTIL_FOR_EACH_RANGE_HPP -#define BOOST_GEOMETRY_MULTI_UTIL_FOR_EACH_RANGE_HPP +#ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_FOR_EACH_RANGE_HPP +#define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_FOR_EACH_RANGE_HPP #include #include -#include +#include #include @@ -36,7 +36,7 @@ struct fe_range_multi { for(BOOST_AUTO(it, boost::begin(multi)); it != boost::end(multi); ++it) { - geometry::for_each_range(*it, actor); + geometry::detail::for_each_range(*it, actor); } } }; @@ -78,4 +78,4 @@ struct for_each_range }} // namespace boost::geometry -#endif // BOOST_GEOMETRY_MULTI_UTIL_FOR_EACH_RANGE_HPP +#endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_FOR_EACH_RANGE_HPP diff --git a/include/boost/geometry/multi/core/is_multi.hpp b/include/boost/geometry/multi/core/is_multi.hpp deleted file mode 100644 index a921efba2..000000000 --- a/include/boost/geometry/multi/core/is_multi.hpp +++ /dev/null @@ -1 +0,0 @@ -// obsolete diff --git a/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp b/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp index 79909906f..a8d7bc708 100644 --- a/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp +++ b/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp @@ -23,7 +23,7 @@ #include -#include +#include #include @@ -287,7 +287,7 @@ public: geometry::less, geometry::greater > extremes; - geometry::for_each_range(geometry, extremes); + geometry::detail::for_each_range(geometry, extremes); // Bounding left/right points // Second pass, now that extremes are found, assign all points @@ -300,7 +300,7 @@ public: typename strategy_side::type > assigner(extremes.left, extremes.right); - geometry::for_each_range(geometry, assigner); + geometry::detail::for_each_range(geometry, assigner); // Sort both collections, first on x(, then on y) @@ -382,7 +382,7 @@ private: template - static inline void output_range(container_type const& range, + static inline void output_range(container_type const& range, OutputIterator out, bool skip_first) { typedef typename reversible_view::type view_type; diff --git a/include/boost/geometry/util/ensure_const_reference.hpp b/include/boost/geometry/util/ensure_const_reference.hpp deleted file mode 100644 index 32dfd25ed..000000000 --- a/include/boost/geometry/util/ensure_const_reference.hpp +++ /dev/null @@ -1,51 +0,0 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) -// -// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands. -// 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_UTIL_ENSURE_CONST_REFERENCE_HPP -#define BOOST_GEOMETRY_UTIL_ENSURE_CONST_REFERENCE_HPP - -#ifdef OBSOLETE - -#include -#include - - -namespace boost { namespace geometry -{ - - -/*! - \brief Meta-function to change a & into a const&, if it is a reference, - otherwise it is the original - \ingroup utility - \note This traits class is completely independant from Boost.Geometry - and might be a separate addition to Boost - \note Used in a.o. interior_rings, exterior_ring -*/ -template -struct ensure_const_reference -{ - typedef typename mpl::if_ - < - typename boost::is_reference::type, - typename boost::add_reference - < - typename boost::add_const - < - typename boost::remove_reference::type - >::type - >::type, - T - >::type type; -}; - - -}} // namespace boost::geometry - -#endif - -#endif // BOOST_GEOMETRY_UTIL_ENSURE_CONST_REFERENCE_HPP diff --git a/include/boost/geometry/views/reversible_view.hpp b/include/boost/geometry/views/reversible_view.hpp index 96f3d9b48..e306b2eee 100644 --- a/include/boost/geometry/views/reversible_view.hpp +++ b/include/boost/geometry/views/reversible_view.hpp @@ -54,7 +54,7 @@ struct reversible_view #if BOOST_VERSION > 104500 typedef boost::reversed_range type; #else - // For Boost.Release: + // For older versions of Boost typedef boost::range_detail::reverse_range type; #endif };