Moved wkt, phase 3, in debug-defines

Moved parse to extensions

[SVN r69908]
This commit is contained in:
Barend Gehrels 2011-03-13 00:18:21 +00:00
parent d7bc400caf
commit 571790def4
8 changed files with 19 additions and 19 deletions

View File

@ -18,7 +18,7 @@
#ifdef BOOST_GEOMETRY_DEBUG_ENRICH
# include <iostream>
# include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
# include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
# include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
# define BOOST_GEOMETRY_DEBUG_IDENTIFIER
#endif

View File

@ -23,7 +23,7 @@
#if defined(BOOST_GEOMETRY_DEBUG_INTERSECTION) || defined(BOOST_GEOMETRY_OVERLAY_REPORT_WKT)
# include <string>
# include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
# include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
# include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#endif

View File

@ -9,11 +9,11 @@
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_HPP
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
#include <boost/geometry/extensions/gis/io/wkt/write_wkt.hpp>
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
#include <boost/geometry/extensions/gis/io/wkt/read_wkt_multi.hpp>
#include <boost/geometry/extensions/gis/io/wkt/write_wkt_multi.hpp>
#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
#include <boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp>
namespace boost { namespace geometry
{

View File

@ -31,7 +31,7 @@
#if defined(BOOST_GEOMETRY_DEBUG_SPLIT_RINGS) || defined(BOOST_GEOMETRY_CHECK_SPLIT_RINGS)
# include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
# include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#endif

View File

@ -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_ALGORITHMS_PARSE_HPP
#define BOOST_GEOMETRY_ALGORITHMS_PARSE_HPP
#ifndef BOOST_GEOMETRY_EXTENSIONS_ALGORITHMS_PARSE_HPP
#define BOOST_GEOMETRY_EXTENSIONS_ALGORITHMS_PARSE_HPP
#include <string>
@ -17,7 +17,6 @@
#include <boost/geometry/geometries/concepts/check.hpp>
// TODO: remove used EXTENSION here (result should be part of parsing strategy)
#include <boost/geometry/extensions/gis/geographic/strategies/dms_parser.hpp>
@ -116,4 +115,4 @@ inline Geometry parse(std::string const& c1, std::string const& c2)
}} // namespace boost::geometry
#endif // BOOST_GEOMETRY_ALGORITHMS_PARSE_HPP
#endif // BOOST_GEOMETRY_EXTENSIONS_ALGORITHMS_PARSE_HPP

View File

@ -15,7 +15,8 @@
#include <boost/noncopyable.hpp>
#include <boost/type_traits/promote.hpp>
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/extensions/gis/io/shapelib/shp_create_object.hpp>
#include <boost/geometry/extensions/gis/io/shapelib/shp_create_object_multi.hpp>
#include <boost/geometry/extensions/gis/io/shapelib/dbf_write_attribute.hpp>

View File

@ -8,7 +8,7 @@
#ifndef BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_STREAM_WKT_HPP
#define BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_STREAM_WKT_HPP
#include <boost/geometry/extensions/gis/io/wkt/write_wkt.hpp>
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
// This short file contains only one manipulator, streaming as WKT
// Don't move contents to as_wkt, developers must be able to choose how to stream

View File

@ -1,6 +1,6 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
//
// Copyright Barend Gehrels 2008-2009, Geodan, Amsterdam, the Netherlands.
// Copyright Barend Gehrels 2011, 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)