Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r69907 - in trunk/boost/geometry: domains/gis/io/wkt domains/gis/io/wkt/detail extensions/gis/io/wkt
From: barend.gehrels_at_[hidden]
Date: 2011-03-12 19:03:27

Author: barendgehrels
Date: 2011-03-12 19:03:25 EST (Sat, 12 Mar 2011)
New Revision: 69907
URL: http://svn.boost.org/trac/boost/changeset/69907

Log:
Moved wkt, phase 2, added warning and renamed include guards
Added:
   trunk/boost/geometry/extensions/gis/io/wkt/readme.txt (contents, props changed)
   trunk/boost/geometry/extensions/gis/io/wkt/wkt.hpp (contents, props changed)
Text files modified:
   trunk/boost/geometry/domains/gis/io/wkt/detail/wkt.hpp | 6 +++---
   trunk/boost/geometry/domains/gis/io/wkt/detail/wkt_multi.hpp | 6 +++---
   trunk/boost/geometry/domains/gis/io/wkt/read_wkt.hpp | 6 +++---
   trunk/boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp | 6 +++---
   trunk/boost/geometry/domains/gis/io/wkt/wkt.hpp | 6 +++---
   trunk/boost/geometry/domains/gis/io/wkt/write_wkt.hpp | 6 +++---
   trunk/boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp | 6 +++---
   7 files changed, 21 insertions(+), 21 deletions(-)

Modified: trunk/boost/geometry/domains/gis/io/wkt/detail/wkt.hpp
==============================================================================
--- trunk/boost/geometry/domains/gis/io/wkt/detail/wkt.hpp (original)
+++ trunk/boost/geometry/domains/gis/io/wkt/detail/wkt.hpp 2011-03-12 19:03:25 EST (Sat, 12 Mar 2011)
@@ -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 @@
}} // namespace boost::geometry

-#endif // BOOST_GEOMETRY_IO_WKT_DETAIL_WKT_HPP
+#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_DETAIL_WKT_HPP

Modified: trunk/boost/geometry/domains/gis/io/wkt/detail/wkt_multi.hpp
==============================================================================
--- trunk/boost/geometry/domains/gis/io/wkt/detail/wkt_multi.hpp (original)
+++ trunk/boost/geometry/domains/gis/io/wkt/detail/wkt_multi.hpp 2011-03-12 19:03:25 EST (Sat, 12 Mar 2011)
@@ -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 @@

}} // namespace boost::geometry

-#endif // BOOST_GEOMETRY_MULTI_IO_WKT_DETAIL_WKT_HPP
+#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_DETAIL_WKT_MULTI_HPP

Modified: trunk/boost/geometry/domains/gis/io/wkt/read_wkt.hpp
==============================================================================
--- trunk/boost/geometry/domains/gis/io/wkt/read_wkt.hpp (original)
+++ trunk/boost/geometry/domains/gis/io/wkt/read_wkt.hpp 2011-03-12 19:03:25 EST (Sat, 12 Mar 2011)
@@ -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 @@

}} // namespace boost::geometry

-#endif // BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_READ_WKT_HPP
+#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_HPP

Modified: trunk/boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp
==============================================================================
--- trunk/boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp (original)
+++ trunk/boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp 2011-03-12 19:03:25 EST (Sat, 12 Mar 2011)
@@ -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 @@

}} // 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

Modified: trunk/boost/geometry/domains/gis/io/wkt/wkt.hpp
==============================================================================
--- trunk/boost/geometry/domains/gis/io/wkt/wkt.hpp (original)
+++ trunk/boost/geometry/domains/gis/io/wkt/wkt.hpp 2011-03-12 19:03:25 EST (Sat, 12 Mar 2011)
@@ -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

Modified: trunk/boost/geometry/domains/gis/io/wkt/write_wkt.hpp
==============================================================================
--- trunk/boost/geometry/domains/gis/io/wkt/write_wkt.hpp (original)
+++ trunk/boost/geometry/domains/gis/io/wkt/write_wkt.hpp 2011-03-12 19:03:25 EST (Sat, 12 Mar 2011)
@@ -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 @@

}} // namespace boost::geometry

-#endif // BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_WRITE_WKT_HPP
+#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_HPP

Modified: trunk/boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp
==============================================================================
--- trunk/boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp (original)
+++ trunk/boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp 2011-03-12 19:03:25 EST (Sat, 12 Mar 2011)
@@ -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 @@

}} // 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

Added: trunk/boost/geometry/extensions/gis/io/wkt/readme.txt
==============================================================================
--- (empty file)
+++ trunk/boost/geometry/extensions/gis/io/wkt/readme.txt 2011-03-12 19:03:25 EST (Sat, 12 Mar 2011)
@@ -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

Added: trunk/boost/geometry/extensions/gis/io/wkt/wkt.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/geometry/extensions/gis/io/wkt/wkt.hpp 2011-03-12 19:03:25 EST (Sat, 12 Mar 2011)
@@ -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

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