mirror of
https://github.com/boostorg/geometry.git
synced 2026-02-12 12:12:10 +00:00
Moved wkt, phase 2, added warning and renamed include guards
[SVN r69907]
This commit is contained in:
@@ -5,8 +5,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_IO_WKT_DETAIL_WKT_HPP
|
||||
#define BOOST_GEOMETRY_IO_WKT_DETAIL_WKT_HPP
|
||||
#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_DETAIL_WKT_HPP
|
||||
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_DETAIL_WKT_HPP
|
||||
|
||||
|
||||
namespace boost { namespace geometry
|
||||
@@ -40,4 +40,4 @@ struct prefix_linestring
|
||||
}} // namespace boost::geometry
|
||||
|
||||
|
||||
#endif // BOOST_GEOMETRY_IO_WKT_DETAIL_WKT_HPP
|
||||
#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_DETAIL_WKT_HPP
|
||||
|
||||
@@ -5,8 +5,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_MULTI_IO_WKT_DETAIL_WKT_HPP
|
||||
#define BOOST_GEOMETRY_MULTI_IO_WKT_DETAIL_WKT_HPP
|
||||
#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_DETAIL_WKT_MULTI_HPP
|
||||
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_DETAIL_WKT_MULTI_HPP
|
||||
|
||||
|
||||
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
|
||||
@@ -47,4 +47,4 @@ struct prefix_multipolygon
|
||||
|
||||
}} // namespace boost::geometry
|
||||
|
||||
#endif // BOOST_GEOMETRY_MULTI_IO_WKT_DETAIL_WKT_HPP
|
||||
#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_DETAIL_WKT_MULTI_HPP
|
||||
|
||||
@@ -5,8 +5,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_EXTENSIONS_GIS_IO_WKT_READ_WKT_HPP
|
||||
#define BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_READ_WKT_HPP
|
||||
#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_HPP
|
||||
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_HPP
|
||||
|
||||
#include <string>
|
||||
|
||||
@@ -714,4 +714,4 @@ inline void read_wkt(std::string const& wkt, OutputIterator out)
|
||||
|
||||
}} // namespace boost::geometry
|
||||
|
||||
#endif // BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_READ_WKT_HPP
|
||||
#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_HPP
|
||||
|
||||
@@ -5,8 +5,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_EXTENSIONS_GIS_IO_WKT_READ_WKT_MULTI_HPP
|
||||
#define BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_READ_WKT_MULTI_HPP
|
||||
#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_MULTI_HPP
|
||||
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_MULTI_HPP
|
||||
|
||||
#include <string>
|
||||
|
||||
@@ -103,4 +103,4 @@ struct read_wkt<multi_polygon_tag, MultiGeometry>
|
||||
|
||||
}} // namespace boost::geometry
|
||||
|
||||
#endif // BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_READ_WKT_MULTI_HPP
|
||||
#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_MULTI_HPP
|
||||
|
||||
@@ -5,8 +5,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_EXTENSIONS_GIS_IO_WKT_WKT_HPP
|
||||
#define BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_WKT_HPP
|
||||
#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WKT_HPP
|
||||
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WKT_HPP
|
||||
|
||||
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
@@ -16,4 +16,4 @@
|
||||
#include <boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp>
|
||||
|
||||
|
||||
#endif // BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_WKT_HPP
|
||||
#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WKT_HPP
|
||||
|
||||
@@ -5,8 +5,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_EXTENSIONS_GIS_IO_WKT_WRITE_WKT_HPP
|
||||
#define BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_WRITE_WKT_HPP
|
||||
#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_HPP
|
||||
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_HPP
|
||||
|
||||
#include <ostream>
|
||||
#include <string>
|
||||
@@ -395,4 +395,4 @@ inline wkt_manipulator<Geometry> make_wkt(Geometry const& geometry)
|
||||
|
||||
}} // namespace boost::geometry
|
||||
|
||||
#endif // BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_WRITE_WKT_HPP
|
||||
#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_HPP
|
||||
|
||||
@@ -5,8 +5,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_EXTENSIONS_GIS_IO_WKT_WRITE_WKT_MULTI_HPP
|
||||
#define BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_WRITE_WKT_MULTI_HPP
|
||||
#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_MULTI_HPP
|
||||
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_MULTI_HPP
|
||||
|
||||
|
||||
|
||||
@@ -108,4 +108,4 @@ struct wkt<multi_polygon_tag, Multi>
|
||||
|
||||
}} // namespace boost::geometry
|
||||
|
||||
#endif // BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_WRITE_WKT_MULTI_HPP
|
||||
#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_MULTI_HPP
|
||||
|
||||
9
include/boost/geometry/extensions/gis/io/wkt/readme.txt
Normal file
9
include/boost/geometry/extensions/gis/io/wkt/readme.txt
Normal file
@@ -0,0 +1,9 @@
|
||||
// Boost.Geometry (aka GGL, Generic Geometry Library)
|
||||
//
|
||||
// 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)
|
||||
|
||||
|
||||
Note, the wkt is moved to /boost/geometry/domains/gis/io/wkt
|
||||
26
include/boost/geometry/extensions/gis/io/wkt/wkt.hpp
Normal file
26
include/boost/geometry/extensions/gis/io/wkt/wkt.hpp
Normal file
@@ -0,0 +1,26 @@
|
||||
// Boost.Geometry (aka GGL, Generic Geometry Library)
|
||||
//
|
||||
// Copyright Barend Gehrels 2008-2009, 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_EXTENSIONS_GIS_IO_WKT_WKT_HPP
|
||||
#define BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_WKT_HPP
|
||||
|
||||
|
||||
#if defined(BOOST_MSVC_FULL_VER)
|
||||
#pragma message ("wkt is moved to boost/geometry/domains/gis/io/wkt, please update include file")
|
||||
#else
|
||||
#warning "wkt is moved to boost/geometry/domains/gis/io/wkt, please update include file"
|
||||
#endif
|
||||
|
||||
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
|
||||
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp>
|
||||
|
||||
|
||||
#endif // BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_WKT_HPP
|
||||
Reference in New Issue
Block a user