diff --git a/include/boost/geometry/algorithms/append.hpp b/include/boost/geometry/algorithms/append.hpp index 0557d21f5..7e5f6b7b5 100644 --- a/include/boost/geometry/algorithms/append.hpp +++ b/include/boost/geometry/algorithms/append.hpp @@ -51,7 +51,7 @@ struct append_point int = 0, int = 0) { typename geometry::point_type::type copy; - geometry::detail::convert::convert_point_to_point(point, copy); + geometry::detail::conversion::convert_point_to_point(point, copy); traits::push_back::apply(geometry, copy); } }; diff --git a/include/boost/geometry/algorithms/centroid.hpp b/include/boost/geometry/algorithms/centroid.hpp index a400e2e0b..9b51ba07d 100644 --- a/include/boost/geometry/algorithms/centroid.hpp +++ b/include/boost/geometry/algorithms/centroid.hpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include @@ -83,7 +83,7 @@ struct centroid_point static inline void apply(Point const& point, PointCentroid& centroid, Strategy const&) { - geometry::convert(point, centroid); + geometry::detail::convert(point, centroid); } }; @@ -163,7 +163,7 @@ inline bool range_ok(Range const& range, Point& centroid) else // if (n == 1) { // Take over the first point in a "coordinate neutral way" - geometry::convert(*boost::begin(range), centroid); + geometry::detail::convert(*boost::begin(range), centroid); return false; } return true; diff --git a/include/boost/geometry/algorithms/convert.hpp b/include/boost/geometry/algorithms/detail/convert.hpp similarity index 91% rename from include/boost/geometry/algorithms/convert.hpp rename to include/boost/geometry/algorithms/detail/convert.hpp index 607898a3f..9301006a7 100644 --- a/include/boost/geometry/algorithms/convert.hpp +++ b/include/boost/geometry/algorithms/detail/convert.hpp @@ -11,8 +11,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_ALGORITHMS_CONVERT_HPP -#define BOOST_GEOMETRY_ALGORITHMS_CONVERT_HPP +#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_CONVERT_HPP +#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_CONVERT_HPP #include @@ -33,7 +33,7 @@ namespace boost { namespace geometry { #ifndef DOXYGEN_NO_DETAIL -namespace detail { namespace convert +namespace detail { namespace conversion { template @@ -75,7 +75,7 @@ struct point_to_box }; -}} // namespace detail::convert +}} // namespace detail::conversion #endif // DOXYGEN_NO_DETAIL @@ -117,7 +117,7 @@ template typename Geometry1, typename Geometry2 > struct convert - : detail::convert::point_to_point + : detail::conversion::point_to_point {}; @@ -186,11 +186,11 @@ struct convert { static inline void apply(Point const& point, Box& box) { - detail::convert::point_to_box + detail::conversion::point_to_box < Point, Box, min_corner, 0, DimensionCount >::apply(point, box); - detail::convert::point_to_box + detail::conversion::point_to_box < Point, Box, max_corner, 0, DimensionCount >::apply(point, box); @@ -232,6 +232,11 @@ struct convert } // namespace dispatch #endif // DOXYGEN_NO_DISPATCH + +#ifndef DOXYGEN_NO_DETAIL +namespace detail +{ + /*! \brief Converts one geometry to another geometry \details The convert algorithm converts one geometry, e.g. a BOX, to another geometry, e.g. a RING. This only @@ -241,6 +246,8 @@ if it is possible and applicable. \tparam Geometry2 \tparam_geometry \param geometry1 \param_geometry (source) \param geometry2 \param_geometry (target) +\note It is moved to namespace detail because it overlaps functionality + of assign. So assign will be changed such that it also can convert. */ template inline void convert(Geometry1 const& geometry1, Geometry2& geometry2) @@ -257,8 +264,11 @@ inline void convert(Geometry1 const& geometry1, Geometry2& geometry2) >::apply(geometry1, geometry2); } +} +#endif // DOXYGEN_NO_DETAIL + }} // namespace boost::geometry -#endif // BOOST_GEOMETRY_ALGORITHMS_CONVERT_HPP +#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_CONVERT_HPP diff --git a/include/boost/geometry/algorithms/detail/convert_point_to_point.hpp b/include/boost/geometry/algorithms/detail/convert_point_to_point.hpp index 48981ce09..0c42fd936 100644 --- a/include/boost/geometry/algorithms/detail/convert_point_to_point.hpp +++ b/include/boost/geometry/algorithms/detail/convert_point_to_point.hpp @@ -28,7 +28,7 @@ namespace boost { namespace geometry { #ifndef DOXYGEN_NO_DETAIL -namespace detail { namespace convert +namespace detail { namespace conversion { @@ -60,7 +60,7 @@ inline void convert_point_to_point(Source const& source, Destination& destinatio -}} // namespace detail::convert +}} // namespace detail::conversion #endif // DOXYGEN_NO_DETAIL }} // namespace boost::geometry diff --git a/include/boost/geometry/algorithms/detail/overlay/clip_linestring.hpp b/include/boost/geometry/algorithms/detail/overlay/clip_linestring.hpp index 6e8a7f6c3..b5bbab84c 100644 --- a/include/boost/geometry/algorithms/detail/overlay/clip_linestring.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/clip_linestring.hpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include @@ -181,8 +181,8 @@ OutputIterator clip_range_with_box(Box const& b, Range const& range, ++previous, ++vertex) { point_type p1, p2; - geometry::convert(*previous, p1); - geometry::convert(*vertex, p2); + geometry::detail::convert(*previous, p1); + geometry::detail::convert(*vertex, p2); // Clip the segment. Five situations: // 1. Segment is invisible, finish line if any (shouldn't occur) diff --git a/include/boost/geometry/algorithms/detail/overlay/convert_ring.hpp b/include/boost/geometry/algorithms/detail/overlay/convert_ring.hpp index d81826f51..433908061 100644 --- a/include/boost/geometry/algorithms/detail/overlay/convert_ring.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/convert_ring.hpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace boost { namespace geometry @@ -50,7 +50,7 @@ struct convert_ring { if (! append) { - geometry::convert(source, destination); + geometry::detail::convert(source, destination); if (reverse) { boost::reverse(destination); @@ -69,7 +69,7 @@ struct convert_ring { if (! append) { - geometry::convert(source, exterior_ring(destination)); + geometry::detail::convert(source, exterior_ring(destination)); if (reverse) { boost::reverse(exterior_ring(destination)); @@ -79,7 +79,7 @@ struct convert_ring { interior_rings(destination).resize( interior_rings(destination).size() + 1); - geometry::convert(source, interior_rings(destination).back()); + geometry::detail::convert(source, interior_rings(destination).back()); if (reverse) { boost::reverse(interior_rings(destination).back()); diff --git a/include/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp b/include/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp index ead786280..927cefb51 100644 --- a/include/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -71,7 +71,7 @@ struct copy_segment_point_range rview_type view(cview); - geometry::convert(*(boost::begin(view) + index), point); + geometry::detail::convert(*(boost::begin(view) + index), point); return true; } }; diff --git a/include/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp b/include/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp index 4a0fdc952..da7695e91 100644 --- a/include/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp @@ -12,7 +12,7 @@ #include -#include +#include #include @@ -64,7 +64,7 @@ struct get_turn_without_info { TurnInfo tp; - geometry::convert(result.template get<0>().intersections[i], tp.point); + geometry::detail::convert(result.template get<0>().intersections[i], tp.point); *out++ = tp; } diff --git a/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp b/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp index 2e7195310..74abdca0d 100644 --- a/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include @@ -94,7 +94,7 @@ struct touch_interior : public base_turn_handler DirInfo const& dir_info) { ti.method = method_touch_interior; - geometry::convert(intersection_info.intersections[0], ti.point); + geometry::detail::convert(intersection_info.intersections[0], ti.point); // Both segments of q touch segment p somewhere in its interior // 1) We know: if q comes from LEFT or RIGHT @@ -213,7 +213,7 @@ struct touch : public base_turn_handler DirInfo const& dir_info) { ti.method = method_touch; - geometry::convert(intersection_info.intersections[0], ti.point); + geometry::detail::convert(intersection_info.intersections[0], ti.point); int const side_qi_p1 = dir_info.sides.template get<1, 0>(); int const side_qk_p1 = SideStrategy::apply(pi, pj, qk); @@ -376,7 +376,7 @@ struct touch : public base_turn_handler << " qk " << get<0>(qk) << " , " << get<1>(qk) << std::endl; #endif - + } }; @@ -404,7 +404,7 @@ struct equal : public base_turn_handler { ti.method = method_equal; // Copy the SECOND intersection point - geometry::convert(intersection_info.intersections[1], ti.point); + geometry::detail::convert(intersection_info.intersections[1], ti.point); int const side_pk_q2 = SideStrategy::apply(qj, qk, pk); int const side_pk_p = SideStrategy::apply(pi, pj, pk); @@ -486,7 +486,7 @@ struct collinear : public base_turn_handler DirInfo const& dir_info) { ti.method = method_collinear; - geometry::convert(intersection_info.intersections[1], ti.point); + geometry::detail::convert(intersection_info.intersections[1], ti.point); int const arrival = dir_info.arrival[0]; // Should not be 0, this is checked before @@ -585,7 +585,7 @@ private : // If P arrives within Q, set info on P (which is done above, index=0), // this turn-info belongs to the second intersection point, index=1 // (see e.g. figure CLO1) - geometry::convert(intersection_info.intersections[1 - Index], tp.point); + geometry::detail::convert(intersection_info.intersections[1 - Index], tp.point); return true; } @@ -661,7 +661,7 @@ struct crosses : public base_turn_handler DirInfo const& dir_info) { ti.method = method_crosses; - geometry::convert(intersection_info.intersections[0], ti.point); + geometry::detail::convert(intersection_info.intersections[0], ti.point); // In all casees: // If Q crosses P from left to right @@ -877,7 +877,7 @@ struct get_turn_info #ifdef BOOST_GEOMETRY_DEBUG_GET_TURNS std::cout << "get_turns, nyi: " << method << std::endl; #endif - break; + break; } return out; diff --git a/include/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp b/include/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp index 75d240bc2..222e84fbc 100644 --- a/include/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -65,7 +65,7 @@ struct intersection_segment_segment_point for (std::size_t i = 0; i < is.count; i++) { PointOut p; - geometry::convert(is.intersections[i], p); + geometry::detail::convert(is.intersections[i], p); *out++ = p; } return out; @@ -95,7 +95,7 @@ struct intersection_linestring_linestring_point it = boost::begin(turns); it != boost::end(turns); ++it) { PointOut p; - geometry::convert(it->point, p); + geometry::detail::convert(it->point, p); *out++ = p; } return out; diff --git a/include/boost/geometry/algorithms/envelope.hpp b/include/boost/geometry/algorithms/envelope.hpp index cae9fa0e1..370812f55 100644 --- a/include/boost/geometry/algorithms/envelope.hpp +++ b/include/boost/geometry/algorithms/envelope.hpp @@ -19,7 +19,6 @@ #include -#include #include #include #include diff --git a/include/boost/geometry/algorithms/simplify.hpp b/include/boost/geometry/algorithms/simplify.hpp index e6a75cc77..21ba86432 100644 --- a/include/boost/geometry/algorithms/simplify.hpp +++ b/include/boost/geometry/algorithms/simplify.hpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include @@ -181,7 +181,7 @@ struct simplify static inline void apply(Point const& point, Point& out, Distance const& max_distance, Strategy const& strategy) { - geometry::convert(point, out); + geometry::detail::convert(point, out); } }; diff --git a/include/boost/geometry/core/radian_access.hpp b/include/boost/geometry/core/radian_access.hpp index 37556e226..9aa833704 100644 --- a/include/boost/geometry/core/radian_access.hpp +++ b/include/boost/geometry/core/radian_access.hpp @@ -78,7 +78,7 @@ struct radian_access } }; -// Specialize, any "degree" coordinate system will convert to radian +// Specialize, any "degree" coordinate system will be converted to radian // but only for dimension 0,1 (so: dimension 2 and heigher are untouched) template diff --git a/include/boost/geometry/domains/gis/io/wkt/write_wkt.hpp b/include/boost/geometry/domains/gis/io/wkt/write_wkt.hpp index 424b2c429..fcf168aa7 100644 --- a/include/boost/geometry/domains/gis/io/wkt/write_wkt.hpp +++ b/include/boost/geometry/domains/gis/io/wkt/write_wkt.hpp @@ -24,7 +24,7 @@ #include -#include +#include #include #include #include @@ -199,7 +199,7 @@ struct wkt_box // Convert to ring, then stream typedef model::ring ring_type; ring_type ring; - geometry::convert(box, ring); + geometry::detail::convert(box, ring); os << "POLYGON("; wkt_sequence::apply(os, ring); os << ")"; diff --git a/include/boost/geometry/extensions/algorithms/buffer/line_line_intersection.hpp b/include/boost/geometry/extensions/algorithms/buffer/line_line_intersection.hpp index 3ebc72547..12022226e 100644 --- a/include/boost/geometry/extensions/algorithms/buffer/line_line_intersection.hpp +++ b/include/boost/geometry/extensions/algorithms/buffer/line_line_intersection.hpp @@ -21,7 +21,7 @@ namespace detail { namespace buffer { -// TODO: once convert this to proper strategy +// TODO: once change this to proper strategy // It is different from current segment intersection because these are not segments but lines // If we have the Line concept, we can create a strategy template diff --git a/include/boost/geometry/extensions/algorithms/dissolve.hpp b/include/boost/geometry/extensions/algorithms/dissolve.hpp index d796b5c38..f5aec42ff 100644 --- a/include/boost/geometry/extensions/algorithms/dissolve.hpp +++ b/include/boost/geometry/extensions/algorithms/dissolve.hpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include @@ -134,7 +134,7 @@ struct dissolve_ring_or_polygon else { GeometryOut g; - geometry::convert(geometry, g); + geometry::detail::convert(geometry, g); *out++ = g; return out; } diff --git a/include/boost/geometry/extensions/gis/io/veshape/write_veshape.hpp b/include/boost/geometry/extensions/gis/io/veshape/write_veshape.hpp index eb5f374dc..90221ecf1 100644 --- a/include/boost/geometry/extensions/gis/io/veshape/write_veshape.hpp +++ b/include/boost/geometry/extensions/gis/io/veshape/write_veshape.hpp @@ -25,9 +25,6 @@ #include -#include - - namespace boost { namespace geometry { diff --git a/include/boost/geometry/extensions/gis/projections/project_inverse_transformer.hpp b/include/boost/geometry/extensions/gis/projections/project_inverse_transformer.hpp index 697fb68c9..e2df255f3 100644 --- a/include/boost/geometry/extensions/gis/projections/project_inverse_transformer.hpp +++ b/include/boost/geometry/extensions/gis/projections/project_inverse_transformer.hpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include diff --git a/include/boost/geometry/extensions/gis/projections/project_transformer.hpp b/include/boost/geometry/extensions/gis/projections/project_transformer.hpp index 96f915cad..8f02acd78 100644 --- a/include/boost/geometry/extensions/gis/projections/project_transformer.hpp +++ b/include/boost/geometry/extensions/gis/projections/project_transformer.hpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include diff --git a/include/boost/geometry/extensions/nsphere/geometries/nsphere.hpp b/include/boost/geometry/extensions/nsphere/geometries/nsphere.hpp index 0966b5ff3..506d1fa71 100644 --- a/include/boost/geometry/extensions/nsphere/geometries/nsphere.hpp +++ b/include/boost/geometry/extensions/nsphere/geometries/nsphere.hpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include @@ -63,7 +63,7 @@ public: nsphere(P const& center, T const& radius) : m_radius(radius) { - geometry::convert(center, m_center); + geometry::detail::convert(center, m_center); } inline P const& center() const { return m_center; } diff --git a/include/boost/geometry/extensions/strategies/buffer_join_round.hpp b/include/boost/geometry/extensions/strategies/buffer_join_round.hpp index fb45d92a4..5b173b101 100644 --- a/include/boost/geometry/extensions/strategies/buffer_join_round.hpp +++ b/include/boost/geometry/extensions/strategies/buffer_join_round.hpp @@ -16,7 +16,7 @@ -#include +#include #include #include #include @@ -51,7 +51,7 @@ struct join_round2 static inline Vector create_vector(Point1 const& p1, Point2 const& p2) { Vector v; - geometry::convert(p1, v); + geometry::detail::convert(p1, v); subtract_point(v, p2); return v; } @@ -111,7 +111,7 @@ struct join_round2 PointOut projected_point; multiply_value(v, b); - geometry::convert(vertex, projected_point); + geometry::detail::convert(vertex, projected_point); add_point(projected_point, v); coordinate_type projected_distance = geometry::distance(projected_point, mid_point); diff --git a/include/boost/geometry/geometries/box.hpp b/include/boost/geometry/geometries/box.hpp index a42e72c91..6537f1298 100644 --- a/include/boost/geometry/geometries/box.hpp +++ b/include/boost/geometry/geometries/box.hpp @@ -18,7 +18,7 @@ #include -#include +#include #include @@ -57,8 +57,8 @@ public: */ inline box(Point const& min_corner, Point const& max_corner) { - geometry::convert(min_corner, m_min_corner); - geometry::convert(max_corner, m_max_corner); + geometry::detail::convert(min_corner, m_min_corner); + geometry::detail::convert(max_corner, m_max_corner); } inline Point const& min_corner() const { return m_min_corner; } diff --git a/include/boost/geometry/geometry.hpp b/include/boost/geometry/geometry.hpp index e0acee965..e8405f7a7 100644 --- a/include/boost/geometry/geometry.hpp +++ b/include/boost/geometry/geometry.hpp @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/include/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp b/include/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp index c8e8f0a0b..b4e95b8a4 100644 --- a/include/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp +++ b/include/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp @@ -20,7 +20,6 @@ #include #include -#include #include diff --git a/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp b/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp index 52eb4bd69..d0293c4b6 100644 --- a/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp +++ b/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include @@ -132,8 +132,8 @@ public : // For consistency we define w also in FP fp_vector_type v, w; - geometry::convert(p2, v); - geometry::convert(p, w); + geometry::detail::convert(p2, v); + geometry::detail::convert(p, w); subtract_point(v, p1); subtract_point(w, p1); @@ -163,7 +163,7 @@ public : >::apply(strategy); fp_point_type projected; - geometry::convert(p1, projected); + geometry::detail::convert(p1, projected); multiply_value(v, b); add_point(projected, v); diff --git a/include/boost/geometry/strategies/strategy_transform.hpp b/include/boost/geometry/strategies/strategy_transform.hpp index cb9a14404..3961ee276 100644 --- a/include/boost/geometry/strategies/strategy_transform.hpp +++ b/include/boost/geometry/strategies/strategy_transform.hpp @@ -20,7 +20,7 @@ #include -#include +#include #include #include #include @@ -104,7 +104,7 @@ struct copy_per_coordinate // Defensive check, dimensions are equal, selected by specialization assert_dimension_equal(); - geometry::convert(p1, p2); + geometry::detail::convert(p1, p2); return true; } }; @@ -312,14 +312,14 @@ struct default_strategy type; }; -/// Specialization to convert from degree to radian for any coordinate system / point type combination +/// Specialization to transform from degree to radian for any coordinate system / point type combination template class CoordSys, typename P1, typename P2> struct default_strategy, CoordSys, 2, 2, P1, P2> { typedef degree_radian_vv type; }; -/// Specialization to convert from radian to degree for any coordinate system / point type combination +/// Specialization to transform from radian to degree for any coordinate system / point type combination template class CoordSys, typename P1, typename P2> struct default_strategy, CoordSys, 2, 2, P1, P2> { @@ -341,28 +341,28 @@ struct default_strategy, CoordSys type; }; -/// Specialization to convert from unit sphere(phi,theta) to XYZ +/// Specialization to transform from unit sphere(phi,theta) to XYZ template struct default_strategy { typedef from_spherical_2_to_cartesian_3 type; }; -/// Specialization to convert from sphere(phi,theta,r) to XYZ +/// Specialization to transform from sphere(phi,theta,r) to XYZ template struct default_strategy { typedef from_spherical_3_to_cartesian_3 type; }; -/// Specialization to convert from XYZ to unit sphere(phi,theta) +/// Specialization to transform from XYZ to unit sphere(phi,theta) template struct default_strategy { typedef from_cartesian_3_to_spherical_2 type; }; -/// Specialization to convert from XYZ to sphere(phi,theta,r) +/// Specialization to transform from XYZ to sphere(phi,theta,r) template struct default_strategy { diff --git a/include/boost/geometry/util/copy.hpp b/include/boost/geometry/util/copy.hpp deleted file mode 100644 index 10497df9e..000000000 --- a/include/boost/geometry/util/copy.hpp +++ /dev/null @@ -1,87 +0,0 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) - -// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands. -// Copyright (c) 2008-2011 Bruno Lalande, Paris, France. -// Copyright (c) 2009-2011 Mateusz Loskot, London, UK. - -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-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_COPY_HPP -#define BOOST_GEOMETRY_UTIL_COPY_HPP - -#if defined(BOOST_MSVC_FULL_VER) -#pragma message ("copy_coordinates is deprecated. Use 'convert'") -#else -#warning "copy_coordinates is deprecated. Use 'convert'" -#endif - - - -#include - -#include -#include - -#include - -#include - - -namespace boost { namespace geometry -{ - -#ifndef DOXYGEN_NO_DETAIL -namespace detail { namespace copy -{ - -template -struct copy_coordinates -{ - static inline void copy(Src const& source, Dst& dest) - { - typedef typename coordinate_type::type coordinate_type; - - set(dest, boost::numeric_cast(get(source))); - copy_coordinates::copy(source, dest); - } -}; - -template -struct copy_coordinates -{ - static inline void copy(Src const& , Dst& ) - { - } -}; - -}} // namespace detail::copy -#endif // DOXYGEN_NO_DETAIL - - -// Deprecated! -// This is the same as "convert", but this is specific to point, convert is more generic -template -inline void copy_coordinates(Src const& source, Dst& dest) -{ - BOOST_CONCEPT_ASSERT( (concept::ConstPoint) ); - BOOST_CONCEPT_ASSERT( (concept::Point) ); - - - //assert_dimension_equal(); - detail::copy::copy_coordinates - < - Src, - Dst, - 0, - dimension::type::value - >::copy(source, dest); -} - -}} // namespace boost::geometry - -#endif // BOOST_GEOMETRY_UTIL_COPY_HPP diff --git a/include/boost/geometry/util/write_dsv.hpp b/include/boost/geometry/util/write_dsv.hpp index 27df5d69c..3fef63e77 100644 --- a/include/boost/geometry/util/write_dsv.hpp +++ b/include/boost/geometry/util/write_dsv.hpp @@ -23,8 +23,6 @@ #include #include -#include - #include #include #include