From d7bc400caf49910c14a50837d92e9db8afa3b3db Mon Sep 17 00:00:00 2001
From: Barend Gehrels <barend@xs4all.nl>
Date: Sun, 13 Mar 2011 00:03:25 +0000
Subject: [PATCH] Moved wkt, phase 2, added warning and renamed include guards

[SVN r69907]
---
 .../domains/gis/io/wkt/detail/wkt.hpp         |  6 ++---
 .../domains/gis/io/wkt/detail/wkt_multi.hpp   |  6 ++---
 .../geometry/domains/gis/io/wkt/read_wkt.hpp  |  6 ++---
 .../domains/gis/io/wkt/read_wkt_multi.hpp     |  6 ++---
 .../boost/geometry/domains/gis/io/wkt/wkt.hpp |  6 ++---
 .../geometry/domains/gis/io/wkt/write_wkt.hpp |  6 ++---
 .../domains/gis/io/wkt/write_wkt_multi.hpp    |  6 ++---
 .../geometry/extensions/gis/io/wkt/readme.txt |  9 +++++++
 .../geometry/extensions/gis/io/wkt/wkt.hpp    | 26 +++++++++++++++++++
 9 files changed, 56 insertions(+), 21 deletions(-)
 create mode 100644 include/boost/geometry/extensions/gis/io/wkt/readme.txt
 create mode 100644 include/boost/geometry/extensions/gis/io/wkt/wkt.hpp

diff --git a/include/boost/geometry/domains/gis/io/wkt/detail/wkt.hpp b/include/boost/geometry/domains/gis/io/wkt/detail/wkt.hpp
index f9bc510f0..1b939669b 100644
--- a/include/boost/geometry/domains/gis/io/wkt/detail/wkt.hpp
+++ b/include/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_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
diff --git a/include/boost/geometry/domains/gis/io/wkt/detail/wkt_multi.hpp b/include/boost/geometry/domains/gis/io/wkt/detail/wkt_multi.hpp
index b1ec6d8a7..2de868597 100644
--- a/include/boost/geometry/domains/gis/io/wkt/detail/wkt_multi.hpp
+++ b/include/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_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
diff --git a/include/boost/geometry/domains/gis/io/wkt/read_wkt.hpp b/include/boost/geometry/domains/gis/io/wkt/read_wkt.hpp
index ac917788a..5241865ff 100644
--- a/include/boost/geometry/domains/gis/io/wkt/read_wkt.hpp
+++ b/include/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_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
diff --git a/include/boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp b/include/boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp
index 797a2d2ea..355cec63a 100644
--- a/include/boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp
+++ b/include/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_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
diff --git a/include/boost/geometry/domains/gis/io/wkt/wkt.hpp b/include/boost/geometry/domains/gis/io/wkt/wkt.hpp
index c7e10b461..a64c20d02 100644
--- a/include/boost/geometry/domains/gis/io/wkt/wkt.hpp
+++ b/include/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_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
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 5caa0fc33..ef597628a 100644
--- a/include/boost/geometry/domains/gis/io/wkt/write_wkt.hpp
+++ b/include/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_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
diff --git a/include/boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp b/include/boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp
index 54dde5c61..2bdcc6204 100644
--- a/include/boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp
+++ b/include/boost/geometry/domains/gis/io/wkt/write_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_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
diff --git a/include/boost/geometry/extensions/gis/io/wkt/readme.txt b/include/boost/geometry/extensions/gis/io/wkt/readme.txt
new file mode 100644
index 000000000..5b42ed4dc
--- /dev/null
+++ b/include/boost/geometry/extensions/gis/io/wkt/readme.txt
@@ -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
diff --git a/include/boost/geometry/extensions/gis/io/wkt/wkt.hpp b/include/boost/geometry/extensions/gis/io/wkt/wkt.hpp
new file mode 100644
index 000000000..62eba8e6d
--- /dev/null
+++ b/include/boost/geometry/extensions/gis/io/wkt/wkt.hpp
@@ -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