Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r66212 - in sandbox/geometry/boost/geometry: geometries/adapted multi/geometries/adapted
From: barend.gehrels_at_[hidden]
Date: 2010-10-27 06:52:36


Author: barendgehrels
Date: 2010-10-27 06:52:31 EDT (Wed, 27 Oct 2010)
New Revision: 66212
URL: http://svn.boost.org/trac/boost/changeset/66212

Log:
Changed warning for adaption of Boost.Array

Text files modified:
   sandbox/geometry/boost/geometry/geometries/adapted/boost_array.hpp | 10 ++++++++++
   sandbox/geometry/boost/geometry/geometries/adapted/boost_array_as_linestring.hpp | 7 ++++---
   sandbox/geometry/boost/geometry/geometries/adapted/boost_array_as_ring.hpp | 7 ++++---
   sandbox/geometry/boost/geometry/multi/geometries/adapted/boost_array_as_multi_point.hpp | 7 ++++---
   4 files changed, 22 insertions(+), 9 deletions(-)

Modified: sandbox/geometry/boost/geometry/geometries/adapted/boost_array.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/geometries/adapted/boost_array.hpp (original)
+++ sandbox/geometry/boost/geometry/geometries/adapted/boost_array.hpp 2010-10-27 06:52:31 EDT (Wed, 27 Oct 2010)
@@ -10,6 +10,16 @@
 #ifndef BOOST_GEOMETRY_GEOMETRIES_ADAPTED_BOOST_ARRAY_HPP
 #define BOOST_GEOMETRY_GEOMETRIES_ADAPTED_BOOST_ARRAY_HPP
 
+
+#ifdef BOOST_GEOMETRY_ADAPTED_BOOST_ARRAY_TAG_DEFINED
+#error Include either "boost_array_as_point" or \
+ "boost_array_as_linestring" or "boost_array_as_ring" \
+ or "boost_array_as_multi_point" to adapt a boost_array
+#endif
+
+#define BOOST_GEOMETRY_ADAPTED_BOOST_ARRAY_TAG_DEFINED
+
+
 #include <cstddef>
 
 #include <boost/type_traits/is_arithmetic.hpp>

Modified: sandbox/geometry/boost/geometry/geometries/adapted/boost_array_as_linestring.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/geometries/adapted/boost_array_as_linestring.hpp (original)
+++ sandbox/geometry/boost/geometry/geometries/adapted/boost_array_as_linestring.hpp 2010-10-27 06:52:31 EDT (Wed, 27 Oct 2010)
@@ -10,12 +10,13 @@
 #define BOOST_GEOMETRY_GEOMETRIES_ADAPTED_BOOST_ARRAY_AS_LINESTRING_HPP
 
 
-#ifdef BOOST_GEOMETRY_ADAPTED_BOOST_ARRAY_AS_POINT_COLLECTION_TAG_DEFINED
-#error Include either "boost_array_as_linestring" or "boost_array_as_ring" \
+#ifdef BOOST_GEOMETRY_ADAPTED_BOOST_ARRAY_TAG_DEFINED
+#error Include either "boost_array_as_point" or \
+ "boost_array_as_linestring" or "boost_array_as_ring" \
     or "boost_array_as_multi_point" to adapt a boost_array
 #endif
 
-#define BOOST_GEOMETRY_ADAPTED_BOOST_ARRAY_AS_POINT_COLLECTION_TAG_DEFINED
+#define BOOST_GEOMETRY_ADAPTED_BOOST_ARRAY_TAG_DEFINED
 
 
 #include <cstddef>

Modified: sandbox/geometry/boost/geometry/geometries/adapted/boost_array_as_ring.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/geometries/adapted/boost_array_as_ring.hpp (original)
+++ sandbox/geometry/boost/geometry/geometries/adapted/boost_array_as_ring.hpp 2010-10-27 06:52:31 EDT (Wed, 27 Oct 2010)
@@ -10,12 +10,13 @@
 #define BOOST_GEOMETRY_GEOMETRIES_ADAPTED_BOOST_ARRAY_AS_RING_HPP
 
 
-#ifdef BOOST_GEOMETRY_ADAPTED_BOOST_ARRAY_AS_POINT_COLLECTION_TAG_DEFINED
-#error Include either "boost_array_as_linestring" or "boost_array_as_ring" \
+#ifdef BOOST_GEOMETRY_ADAPTED_BOOST_ARRAY_TAG_DEFINED
+#error Include either "boost_array_as_point" or \
+ "boost_array_as_linestring" or "boost_array_as_ring" \
     or "boost_array_as_multi_point" to adapt a boost_array
 #endif
 
-#define BOOST_GEOMETRY_ADAPTED_BOOST_ARRAY_AS_POINT_COLLECTION_TAG_DEFINED
+#define BOOST_GEOMETRY_ADAPTED_BOOST_ARRAY_TAG_DEFINED
 
 
 #include <cstddef>

Modified: sandbox/geometry/boost/geometry/multi/geometries/adapted/boost_array_as_multi_point.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/geometries/adapted/boost_array_as_multi_point.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/geometries/adapted/boost_array_as_multi_point.hpp 2010-10-27 06:52:31 EDT (Wed, 27 Oct 2010)
@@ -9,12 +9,13 @@
 #define BOOST_GEOMETRY_GEOMETRIES_ADAPTED_BOOST_ARRAY_AS_MULTI_POINT_HPP
 
 
-#ifdef BOOST_GEOMETRY_ADAPTED_BOOST_ARRAY_AS_POINT_COLLECTION_TAG_DEFINED
-#error Include either "boost_array_as_linestring" or "boost_array_as_ring" \
+#ifdef BOOST_GEOMETRY_ADAPTED_BOOST_ARRAY_TAG_DEFINED
+#error Include either "boost_array_as_point" or \
+ "boost_array_as_linestring" or "boost_array_as_ring" \
     or "boost_array_as_multi_point" to adapt a boost_array
 #endif
 
-#define BOOST_GEOMETRY_ADAPTED_BOOST_ARRAY_AS_POINT_COLLECTION_TAG_DEFINED
+#define BOOST_GEOMETRY_ADAPTED_BOOST_ARRAY_TAG_DEFINED
 
 
 #include <cstddef>


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