Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r75073 - in trunk: boost/geometry boost/geometry/algorithms/detail boost/geometry/algorithms/detail/overlay boost/geometry/extensions/algorithms boost/geometry/io boost/geometry/io/dsv boost/geometry/multi/util boost/geometry/strategies/agnostic boost/geometry/strategies/spherical boost/geometry/util libs/geometry/example libs/geometry/test/algorithms libs/geometry/test/concepts libs/geometry/test/geometries libs/geometry/test/policies libs/geometry/test/util libs/geometry/test/views libs/geometry/test_extensions/algorithms
From: mateusz_at_[hidden]
Date: 2011-10-20 17:12:58

Author: mloskot
Date: 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
New Revision: 75073
URL: http://svn.boost.org/trac/boost/changeset/75073

Log:
[geometry] Moved util/write_dsv.hpp to io/dsv/write.hpp. This introduces refinement of new io structure: geometry/io/<FORMAT>/<read|write>.hpp
Added:
   trunk/boost/geometry/io/
   trunk/boost/geometry/io/dsv/
   trunk/boost/geometry/io/dsv/write.hpp
      - copied, changed from r74901, /trunk/boost/geometry/util/write_dsv.hpp
Removed:
   trunk/boost/geometry/util/write_dsv.hpp
Text files modified:
   trunk/boost/geometry/algorithms/detail/has_self_intersections.hpp | 2 +-
   trunk/boost/geometry/algorithms/detail/overlay/get_turns.hpp | 2 +-
   trunk/boost/geometry/algorithms/detail/overlay/overlay.hpp | 2 +-
   trunk/boost/geometry/extensions/algorithms/connect.hpp | 2 +-
   trunk/boost/geometry/geometry.hpp | 2 +-
   trunk/boost/geometry/io/dsv/write.hpp | 6 +++---
   trunk/boost/geometry/multi/util/write_dsv.hpp | 2 +-
   trunk/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp | 2 +-
   trunk/boost/geometry/strategies/spherical/distance_cross_track.hpp | 2 +-
   trunk/libs/geometry/example/c01_custom_point_example.cpp | 2 +-
   trunk/libs/geometry/example/c02_custom_box_example.cpp | 2 +-
   trunk/libs/geometry/example/c04_a_custom_triangle_example.cpp | 2 +-
   trunk/libs/geometry/example/c04_b_custom_triangle_example.cpp | 2 +-
   trunk/libs/geometry/example/c09_custom_fusion_example.cpp | 2 +-
   trunk/libs/geometry/test/algorithms/correct.cpp | 2 +-
   trunk/libs/geometry/test/algorithms/test_expand.hpp | 2 +-
   trunk/libs/geometry/test/algorithms/test_for_each.hpp | 2 +-
   trunk/libs/geometry/test/algorithms/transform.cpp | 2 +-
   trunk/libs/geometry/test/concepts/linestring_concept.cpp | 2 +-
   trunk/libs/geometry/test/geometries/segment.cpp | 2 +-
   trunk/libs/geometry/test/policies/compare.cpp | 2 +-
   trunk/libs/geometry/test/util/write_dsv.cpp | 2 +-
   trunk/libs/geometry/test/views/closeable_view.cpp | 2 +-
   trunk/libs/geometry/test/views/reversible_closeable.cpp | 2 +-
   trunk/libs/geometry/test/views/reversible_view.cpp | 2 +-
   trunk/libs/geometry/test_extensions/algorithms/midpoints.cpp | 2 +-
   26 files changed, 28 insertions(+), 28 deletions(-)

Modified: trunk/boost/geometry/algorithms/detail/has_self_intersections.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/has_self_intersections.hpp (original)
+++ trunk/boost/geometry/algorithms/detail/has_self_intersections.hpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -21,7 +21,7 @@

#ifdef BOOST_GEOMETRY_DEBUG_HAS_SELF_INTERSECTIONS
# include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
-# include <boost/geometry/util/write_dsv.hpp>
+# include <boost/geometry/io/dsv/write.hpp>
#endif

Modified: trunk/boost/geometry/algorithms/detail/overlay/get_turns.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/overlay/get_turns.hpp (original)
+++ trunk/boost/geometry/algorithms/detail/overlay/get_turns.hpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -58,7 +58,7 @@

#ifdef BOOST_GEOMETRY_DEBUG_INTERSECTION
# include <sstream>
-# include <boost/geometry/util/write_dsv.hpp>
+# include <boost/geometry/io/dsv/write.hpp>
#endif

Modified: trunk/boost/geometry/algorithms/detail/overlay/overlay.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/overlay/overlay.hpp (original)
+++ trunk/boost/geometry/algorithms/detail/overlay/overlay.hpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -37,7 +37,7 @@

#ifdef BOOST_GEOMETRY_DEBUG_ASSEMBLE
-# include <boost/geometry/util/write_dsv.hpp>
+# include <boost/geometry/io/dsv/write.hpp>
#endif

Modified: trunk/boost/geometry/extensions/algorithms/connect.hpp
==============================================================================
--- trunk/boost/geometry/extensions/algorithms/connect.hpp (original)
+++ trunk/boost/geometry/extensions/algorithms/connect.hpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -23,7 +23,7 @@

#include <boost/geometry/geometries/concepts/check.hpp>

-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>

Modified: trunk/boost/geometry/geometry.hpp
==============================================================================
--- trunk/boost/geometry/geometry.hpp (original)
+++ trunk/boost/geometry/geometry.hpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -76,7 +76,7 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/util/select_most_precise.hpp>
#include <boost/geometry/util/select_coordinate_type.hpp>
-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>

#include <boost/geometry/views/box_view.hpp>
#include <boost/geometry/views/segment_view.hpp>

Copied: trunk/boost/geometry/io/dsv/write.hpp (from r74901, /trunk/boost/geometry/util/write_dsv.hpp)
==============================================================================
--- /trunk/boost/geometry/util/write_dsv.hpp (original)
+++ trunk/boost/geometry/io/dsv/write.hpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -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_UTIL_WRITE_DSV_HPP
-#define BOOST_GEOMETRY_UTIL_WRITE_DSV_HPP
+#ifndef BOOST_GEOMETRY_IO_WRITE_DSV_HPP
+#define BOOST_GEOMETRY_IO_WRITE_DSV_HPP

#include <cstddef>
@@ -393,4 +393,4 @@
}} // namespace boost::geometry

-#endif // BOOST_GEOMETRY_UTIL_WRITE_DSV_HPP
+#endif // BOOST_GEOMETRY_IO_WRITE_DSV_HPP

Modified: trunk/boost/geometry/multi/util/write_dsv.hpp
==============================================================================
--- trunk/boost/geometry/multi/util/write_dsv.hpp (original)
+++ trunk/boost/geometry/multi/util/write_dsv.hpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -16,7 +16,7 @@

#include <boost/range.hpp>

-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>

namespace boost { namespace geometry
{

Modified: trunk/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp
==============================================================================
--- trunk/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp (original)
+++ trunk/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -27,7 +27,7 @@
//#define GL_DEBUG_DOUGLAS_PEUCKER

#ifdef GL_DEBUG_DOUGLAS_PEUCKER
-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>
#endif

Modified: trunk/boost/geometry/strategies/spherical/distance_cross_track.hpp
==============================================================================
--- trunk/boost/geometry/strategies/spherical/distance_cross_track.hpp (original)
+++ trunk/boost/geometry/strategies/spherical/distance_cross_track.hpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -26,7 +26,7 @@
#include <boost/geometry/util/math.hpp>

#ifdef BOOST_GEOMETRY_DEBUG_CROSS_TRACK
-# include <boost/geometry/util/write_dsv.hpp>
+# include <boost/geometry/io/dsv/write.hpp>
#endif

Deleted: trunk/boost/geometry/util/write_dsv.hpp
==============================================================================
--- trunk/boost/geometry/util/write_dsv.hpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
+++ (empty file)
@@ -1,396 +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_WRITE_DSV_HPP
-#define BOOST_GEOMETRY_UTIL_WRITE_DSV_HPP
-
-
-#include <cstddef>
-#include <ostream>
-#include <string>
-
-#include <boost/concept_check.hpp>
-#include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
-
-#include <boost/geometry/core/exterior_ring.hpp>
-#include <boost/geometry/core/interior_rings.hpp>
-#include <boost/geometry/core/ring_type.hpp>
-#include <boost/geometry/core/tag_cast.hpp>
-
-#include <boost/geometry/geometries/concepts/check.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace dsv
-{
-
-
-struct dsv_settings
-{
- std::string coordinate_separator;
- std::string point_open;
- std::string point_close;
- std::string point_separator;
- std::string list_open;
- std::string list_close;
- std::string list_separator;
-
- dsv_settings(std::string const& sep
- , std::string const& open
- , std::string const& close
- , std::string const& psep
- , std::string const& lopen
- , std::string const& lclose
- , std::string const& lsep
- )
- : coordinate_separator(sep)
- , point_open(open)
- , point_close(close)
- , point_separator(psep)
- , list_open(lopen)
- , list_close(lclose)
- , list_separator(lsep)
- {}
-};
-
-/*!
-\brief Stream coordinate of a point as \ref DSV
-*/
-template <typename Point, std::size_t Dimension, std::size_t Count>
-struct stream_coordinate
-{
- template <typename Char, typename Traits>
- static inline void apply(std::basic_ostream<Char, Traits>& os,
- Point const& point,
- dsv_settings const& settings)
- {
- os << (Dimension > 0 ? settings.coordinate_separator : "")
- << get<Dimension>(point);
-
- stream_coordinate
- <
- Point, Dimension + 1, Count
- >::apply(os, point, settings);
- }
-};
-
-template <typename Point, std::size_t Count>
-struct stream_coordinate<Point, Count, Count>
-{
- template <typename Char, typename Traits>
- static inline void apply(std::basic_ostream<Char, Traits>&,
- Point const&,
- dsv_settings const& )
- {
- }
-};
-
-
-/*!
-\brief Stream indexed coordinate of a box/segment as \ref DSV
-*/
-template
-<
- typename Geometry,
- std::size_t Index,
- std::size_t Dimension,
- std::size_t Count
->
-struct stream_indexed
-{
- template <typename Char, typename Traits>
- static inline void apply(std::basic_ostream<Char, Traits>& os,
- Geometry const& geometry,
- dsv_settings const& settings)
- {
- os << (Dimension > 0 ? settings.coordinate_separator : "")
- << get<Index, Dimension>(geometry);
- stream_indexed
- <
- Geometry, Index, Dimension + 1, Count
- >::apply(os, geometry, settings);
- }
-};
-
-template <typename Geometry, std::size_t Index, std::size_t Count>
-struct stream_indexed<Geometry, Index, Count, Count>
-{
- template <typename Char, typename Traits>
- static inline void apply(std::basic_ostream<Char, Traits>&, Geometry const&,
- dsv_settings const& )
- {
- }
-};
-
-
-
-/*!
-\brief Stream points as \ref DSV
-*/
-template <typename Point>
-struct dsv_point
-{
- template <typename Char, typename Traits>
- static inline void apply(std::basic_ostream<Char, Traits>& os,
- Point const& p,
- dsv_settings const& settings)
- {
- os << settings.point_open;
- stream_coordinate<Point, 0, dimension<Point>::type::value>::apply(os, p, settings);
- os << settings.point_close;
- }
-};
-
-/*!
-\brief Stream ranges as DSV
-\note policy is used to stream prefix/postfix, enabling derived classes to override this
-*/
-template <typename Range>
-struct dsv_range
-{
- template <typename Char, typename Traits>
- static inline void apply(std::basic_ostream<Char, Traits>& os,
- Range const& range,
- dsv_settings const& settings)
- {
- typedef typename boost::range_iterator<Range const>::type iterator_type;
-
- bool first = true;
-
- os << settings.list_open;
-
- for (iterator_type it = boost::begin(range);
- it != boost::end(range);
- ++it)
- {
- os << (first ? "" : settings.point_separator)
- << settings.point_open;
-
- stream_coordinate
- <
- point_type, 0, dimension<point_type>::type::value
- >::apply(os, *it, settings);
- os << settings.point_close;
-
- first = false;
- }
-
- os << settings.list_close;
- }
-
-private:
- typedef typename boost::range_value<Range>::type point_type;
-};
-
-/*!
-\brief Stream sequence of points as DSV-part, e.g. (1 2),(3 4)
-\note Used in polygon, all multi-geometries
-*/
-
-
-template <typename Polygon>
-struct dsv_poly
-{
- template <typename Char, typename Traits>
- static inline void apply(std::basic_ostream<Char, Traits>& os,
- Polygon const& poly,
- dsv_settings const& settings)
- {
- typedef typename ring_type<Polygon>::type ring;
-
- os << settings.list_open;
-
- dsv_range<ring>::apply(os, exterior_ring(poly), settings);
-
- typename interior_return_type<Polygon const>::type rings
- = interior_rings(poly);
- for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
- {
- os << settings.list_separator;
- dsv_range<ring>::apply(os, *it, settings);
- }
- os << settings.list_close;
- }
-};
-
-template <typename Geometry, std::size_t Index>
-struct dsv_per_index
-{
- typedef typename point_type<Geometry>::type point_type;
-
- template <typename Char, typename Traits>
- static inline void apply(std::basic_ostream<Char, Traits>& os,
- Geometry const& geometry,
- dsv_settings const& settings)
- {
- os << settings.point_open;
- stream_indexed
- <
- Geometry, Index, 0, dimension<Geometry>::type::value
- >::apply(os, geometry, settings);
- os << settings.point_close;
- }
-};
-
-
-template <typename Geometry>
-struct dsv_indexed
-{
- typedef typename point_type<Geometry>::type point_type;
-
- template <typename Char, typename Traits>
- static inline void apply(std::basic_ostream<Char, Traits>& os,
- Geometry const& geometry,
- dsv_settings const& settings)
- {
- os << settings.list_open;
- dsv_per_index<Geometry, 0>::apply(os, geometry, settings);
- os << settings.point_separator;
- dsv_per_index<Geometry, 1>::apply(os, geometry, settings);
- os << settings.list_close;
- }
-};
-
-}} // namespace detail::dsv
-#endif // DOXYGEN_NO_DETAIL
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename Tag, typename Geometry>
-struct dsv {};
-
-
-template <typename Point>
-struct dsv<point_tag, Point>
- : detail::dsv::dsv_point<Point>
-{};
-
-
-template <typename Linestring>
-struct dsv<linestring_tag, Linestring>
- : detail::dsv::dsv_range<Linestring>
-{};
-
-
-template <typename Box>
-struct dsv<box_tag, Box>
- : detail::dsv::dsv_indexed<Box>
-{};
-
-template <typename Segment>
-struct dsv<segment_tag, Segment>
- : detail::dsv::dsv_indexed<Segment>
-{};
-
-
-template <typename Ring>
-struct dsv<ring_tag, Ring>
- : detail::dsv::dsv_range<Ring>
-{};
-
-
-template <typename Polygon>
-struct dsv<polygon_tag, Polygon>
- : detail::dsv::dsv_poly<Polygon>
-{};
-
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace dsv
-{
-
-
-// FIXME: This class is not copyable/assignable but it is used as such --mloskot
-template <typename Geometry>
-class dsv_manipulator
-{
-public:
-
- inline dsv_manipulator(Geometry const& g,
- dsv_settings const& settings)
- : m_geometry(g)
- , m_settings(settings)
- {}
-
- template <typename Char, typename Traits>
- inline friend std::basic_ostream<Char, Traits>& operator<<(
- std::basic_ostream<Char, Traits>& os,
- dsv_manipulator const& m)
- {
- dispatch::dsv
- <
- typename tag_cast
- <
- typename tag<Geometry>::type,
- multi_tag
- >::type,
- Geometry
- >::apply(os, m.m_geometry, m.m_settings);
- os.flush();
- return os;
- }
-
-private:
- Geometry const& m_geometry;
- dsv_settings m_settings;
-};
-
-
-}} // namespace detail::dsv
-#endif // DOXYGEN_NO_DETAIL
-
-
-/*!
-\brief Main DSV-streaming function
-\details DSV stands for Delimiter Separated Values. Geometries can be streamed
- as DSV. There are defaults for all separators.
-\note Useful for examples and testing purposes
-\note With this function GeoJSON objects can be created, using the right
- delimiters
-\ingroup utility
-*/
-template <typename Geometry>
-inline detail::dsv::dsv_manipulator<Geometry> dsv(Geometry const& geometry
- , std::string const& coordinate_separator = ", "
- , std::string const& point_open = "("
- , std::string const& point_close = ")"
- , std::string const& point_separator = ", "
- , std::string const& list_open = "("
- , std::string const& list_close = ")"
- , std::string const& list_separator = ", "
- )
-{
- concept::check<Geometry const>();
-
- return detail::dsv::dsv_manipulator<Geometry>(geometry,
- detail::dsv::dsv_settings(coordinate_separator,
- point_open, point_close, point_separator,
- list_open, list_close, list_separator));
-}
-
-
-}} // namespace boost::geometry
-
-
-#endif // BOOST_GEOMETRY_UTIL_WRITE_DSV_HPP

Modified: trunk/libs/geometry/example/c01_custom_point_example.cpp
==============================================================================
--- trunk/libs/geometry/example/c01_custom_point_example.cpp (original)
+++ trunk/libs/geometry/example/c01_custom_point_example.cpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry/algorithms/make.hpp>
#include <boost/geometry/geometries/register/point.hpp>
#include <boost/geometry/strategies/strategies.hpp>
-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>

// Sample point, defining three color values
struct my_color_point

Modified: trunk/libs/geometry/example/c02_custom_box_example.cpp
==============================================================================
--- trunk/libs/geometry/example/c02_custom_box_example.cpp (original)
+++ trunk/libs/geometry/example/c02_custom_box_example.cpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -17,7 +17,7 @@
#include <boost/geometry/geometries/register/point.hpp>
#include <boost/geometry/geometries/register/box.hpp>
#include <boost/geometry/strategies/strategies.hpp>
-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>

struct my_point
{

Modified: trunk/libs/geometry/example/c04_a_custom_triangle_example.cpp
==============================================================================
--- trunk/libs/geometry/example/c04_a_custom_triangle_example.cpp (original)
+++ trunk/libs/geometry/example/c04_a_custom_triangle_example.cpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -19,7 +19,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/register/ring.hpp>
#include <boost/geometry/strategies/strategies.hpp>
-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>

struct triangle : public boost::array<boost::geometry::model::d2::point_xy<double>, 4>

Modified: trunk/libs/geometry/example/c04_b_custom_triangle_example.cpp
==============================================================================
--- trunk/libs/geometry/example/c04_b_custom_triangle_example.cpp (original)
+++ trunk/libs/geometry/example/c04_b_custom_triangle_example.cpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -20,7 +20,7 @@
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/geometries/register/ring.hpp>
#include <boost/geometry/strategies/strategies.hpp>
-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>

BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

Modified: trunk/libs/geometry/example/c09_custom_fusion_example.cpp
==============================================================================
--- trunk/libs/geometry/example/c09_custom_fusion_example.cpp (original)
+++ trunk/libs/geometry/example/c09_custom_fusion_example.cpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -18,7 +18,7 @@
#include <boost/geometry/geometries/adapted/boost_fusion.hpp>

#include <boost/geometry/strategies/strategies.hpp>
-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>

BOOST_GEOMETRY_REGISTER_BOOST_FUSION_CS(cs::cartesian);

Modified: trunk/libs/geometry/test/algorithms/correct.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/correct.cpp (original)
+++ trunk/libs/geometry/test/algorithms/correct.cpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -19,7 +19,7 @@
#include <boost/geometry/algorithms/correct.hpp>
#include <boost/geometry/strategies/strategies.hpp>

-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>

#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>

Modified: trunk/libs/geometry/test/algorithms/test_expand.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_expand.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_expand.hpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
#include <boost/geometry/algorithms/assign.hpp>
-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>

template <typename Geometry, typename Box>

Modified: trunk/libs/geometry/test/algorithms/test_for_each.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_for_each.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_for_each.hpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry/algorithms/distance.hpp>
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>

template<typename Point>

Modified: trunk/libs/geometry/test/algorithms/transform.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/transform.cpp (original)
+++ trunk/libs/geometry/test/algorithms/transform.cpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -24,7 +24,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>

-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>

#include <test_common/test_point.hpp>

Modified: trunk/libs/geometry/test/concepts/linestring_concept.cpp
==============================================================================
--- trunk/libs/geometry/test/concepts/linestring_concept.cpp (original)
+++ trunk/libs/geometry/test/concepts/linestring_concept.cpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -19,7 +19,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/concepts/linestring_concept.hpp>

-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>

#include <test_common/test_point.hpp>

Modified: trunk/libs/geometry/test/geometries/segment.cpp
==============================================================================
--- trunk/libs/geometry/test/geometries/segment.cpp (original)
+++ trunk/libs/geometry/test/geometries/segment.cpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -25,7 +25,7 @@
#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>

#include <test_common/test_point.hpp>

Modified: trunk/libs/geometry/test/policies/compare.cpp
==============================================================================
--- trunk/libs/geometry/test/policies/compare.cpp (original)
+++ trunk/libs/geometry/test/policies/compare.cpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -12,7 +12,7 @@
#include <algorithm>

#include <boost/geometry/algorithms/make.hpp>
-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>

#include <boost/geometry/policies/compare.hpp>

Modified: trunk/libs/geometry/test/util/write_dsv.cpp
==============================================================================
--- trunk/libs/geometry/test/util/write_dsv.cpp (original)
+++ trunk/libs/geometry/test/util/write_dsv.cpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -17,7 +17,7 @@

#include <geometry_test_common.hpp>

-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>

#include <boost/geometry/geometries/geometries.hpp>

Modified: trunk/libs/geometry/test/views/closeable_view.cpp
==============================================================================
--- trunk/libs/geometry/test/views/closeable_view.cpp (original)
+++ trunk/libs/geometry/test/views/closeable_view.cpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -17,7 +17,7 @@
#include <boost/geometry/views/closeable_view.hpp>

#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

Modified: trunk/libs/geometry/test/views/reversible_closeable.cpp
==============================================================================
--- trunk/libs/geometry/test/views/reversible_closeable.cpp (original)
+++ trunk/libs/geometry/test/views/reversible_closeable.cpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -19,7 +19,7 @@
#include <boost/geometry/views/reversible_view.hpp>

#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

Modified: trunk/libs/geometry/test/views/reversible_view.cpp
==============================================================================
--- trunk/libs/geometry/test/views/reversible_view.cpp (original)
+++ trunk/libs/geometry/test/views/reversible_view.cpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -17,7 +17,7 @@
#include <boost/geometry/views/reversible_view.hpp>

#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

Modified: trunk/libs/geometry/test_extensions/algorithms/midpoints.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/midpoints.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/midpoints.cpp 2011-10-20 17:12:52 EDT (Thu, 20 Oct 2011)
@@ -24,7 +24,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>

-#include <boost/geometry/util/write_dsv.hpp>
+#include <boost/geometry/io/dsv/write.hpp>

#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>

Date view	Thread view	Subject view	Author view

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