Subject: [Boost-commit] svn:boost r71210 - in trunk/boost/geometry/algorithms: . detail
From: barend.gehrels_at_[hidden]
Date: 2011-04-12 14:41:54
Author: barendgehrels
Date: 2011-04-12 14:41:53 EDT (Tue, 12 Apr 2011)
New Revision: 71210
URL: http://svn.boost.org/trac/boost/changeset/71210
Log:
Temporary solved mutual inclusion assign/convert
Text files modified:
trunk/boost/geometry/algorithms/assign.hpp | 8 +++++++-
trunk/boost/geometry/algorithms/detail/convert.hpp | 3 ++-
2 files changed, 9 insertions(+), 2 deletions(-)
Modified: trunk/boost/geometry/algorithms/assign.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/assign.hpp (original)
+++ trunk/boost/geometry/algorithms/assign.hpp 2011-04-12 14:41:53 EDT (Tue, 12 Apr 2011)
@@ -25,7 +25,6 @@
#include <boost/numeric/conversion/cast.hpp>
#include <boost/type_traits.hpp>
-#include <boost/geometry/algorithms/detail/convert.hpp>
#include <boost/geometry/arithmetic/arithmetic.hpp>
#include <boost/geometry/algorithms/append.hpp>
#include <boost/geometry/algorithms/clear.hpp>
@@ -633,6 +632,13 @@
}
+}} // namespace boost::geometry
+
+#include <boost/geometry/algorithms/detail/convert.hpp>
+
+namespace boost { namespace geometry
+{
+
/*!
\brief Assigns one geometry to another geometry
\details The assign algorithm assigns one geometry, e.g. a BOX, to another geometry, e.g. a RING. This only
Modified: trunk/boost/geometry/algorithms/detail/convert.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/convert.hpp (original)
+++ trunk/boost/geometry/algorithms/detail/convert.hpp 2011-04-12 14:41:53 EDT (Tue, 12 Apr 2011)
@@ -20,8 +20,9 @@
#include <boost/numeric/conversion/cast.hpp>
#include <boost/range.hpp>
+#include <boost/geometry/arithmetic/arithmetic.hpp>
#include <boost/geometry/algorithms/append.hpp>
-#include <boost/geometry/algorithms/assign.hpp>
+#include <boost/geometry/algorithms/clear.hpp>
#include <boost/geometry/algorithms/for_each.hpp>
#include <boost/geometry/algorithms/detail/convert_point_to_point.hpp>