Subject: [Boost-commit] svn:boost r71448 - in trunk: boost/geometry/geometries boost/geometry/geometries/adapted libs/geometry/example libs/geometry/example/with_external_libs libs/geometry/test/algorithms libs/geometry/test/algorithms/overlay libs/geometry/test/arithmetic libs/geometry/test/core libs/geometry/test/geometries libs/geometry/test/multi/algorithms libs/geometry/test/policies libs/geometry/test/strategies libs/geometry/test/util libs/geometry/test/views
From: bruno.lalande_at_[hidden]
Date: 2011-04-23 18:26:54
Author: bruno.lalande
Date: 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
New Revision: 71448
URL: http://svn.boost.org/trac/boost/changeset/71448
Log:
Removed adapted/tuple_<cs>.hpp files and added a macro to use instead.
Added:
trunk/boost/geometry/geometries/adapted/boost_tuple.hpp
- copied, changed from r71373, /trunk/boost/geometry/geometries/adapted/tuple.hpp
trunk/libs/geometry/test/geometries/boost_tuple.cpp
- copied, changed from r71374, /trunk/libs/geometry/test/geometries/boost_tuple_cartesian.cpp
Removed:
trunk/boost/geometry/geometries/adapted/tuple.hpp
trunk/boost/geometry/geometries/adapted/tuple_cartesian.hpp
trunk/boost/geometry/geometries/adapted/tuple_geographic.hpp
trunk/libs/geometry/test/geometries/boost_tuple_cartesian.cpp
trunk/libs/geometry/test/geometries/boost_tuple_geographic.cpp
Text files modified:
trunk/boost/geometry/geometries/adapted/boost_tuple.hpp | 24 ++++++++++++++++--------
trunk/boost/geometry/geometries/geometries.hpp | 2 +-
trunk/libs/geometry/example/01_point_example.cpp | 4 +++-
trunk/libs/geometry/example/04_boost_example.cpp | 5 +++--
trunk/libs/geometry/example/c04_b_custom_triangle_example.cpp | 4 ++--
trunk/libs/geometry/example/with_external_libs/x03_a_soci_example.cpp | 3 ++-
trunk/libs/geometry/test/algorithms/assign.cpp | 4 +++-
trunk/libs/geometry/test/algorithms/convert.cpp | 4 +++-
trunk/libs/geometry/test/algorithms/distance.cpp | 4 +++-
trunk/libs/geometry/test/algorithms/envelope.cpp | 4 +++-
trunk/libs/geometry/test/algorithms/expand.cpp | 4 +++-
trunk/libs/geometry/test/algorithms/make.cpp | 4 +++-
trunk/libs/geometry/test/algorithms/overlay/overlay_common.hpp | 4 +++-
trunk/libs/geometry/test/arithmetic/arithmetic.cpp | 4 +++-
trunk/libs/geometry/test/arithmetic/dot_product.cpp | 4 +++-
trunk/libs/geometry/test/core/access.cpp | 3 ++-
trunk/libs/geometry/test/core/coordinate_dimension.cpp | 4 +++-
trunk/libs/geometry/test/core/coordinate_system.cpp | 4 +++-
trunk/libs/geometry/test/core/coordinate_type.cpp | 4 +++-
trunk/libs/geometry/test/core/geometry_id.cpp | 4 +++-
trunk/libs/geometry/test/core/point_type.cpp | 4 +++-
trunk/libs/geometry/test/core/tag.cpp | 4 +++-
trunk/libs/geometry/test/core/topological_dimension.cpp | 4 +++-
trunk/libs/geometry/test/geometries/Jamfile.v2 | 3 +--
trunk/libs/geometry/test/geometries/adapted.cpp | 5 ++++-
trunk/libs/geometry/test/geometries/boost_array_as_point.cpp | 4 +++-
trunk/libs/geometry/test/geometries/boost_fusion.cpp | 5 ++++-
trunk/libs/geometry/test/geometries/boost_tuple.cpp | 6 +++++-
trunk/libs/geometry/test/geometries/box.cpp | 4 +++-
trunk/libs/geometry/test/geometries/custom_linestring.cpp | 4 +++-
trunk/libs/geometry/test/geometries/segment.cpp | 4 +++-
trunk/libs/geometry/test/multi/algorithms/multi_distance.cpp | 4 +++-
trunk/libs/geometry/test/multi/algorithms/multi_envelope.cpp | 4 ++--
trunk/libs/geometry/test/policies/compare.cpp | 4 +++-
trunk/libs/geometry/test/strategies/projected_point.cpp | 3 ++-
trunk/libs/geometry/test/strategies/pythagoras.cpp | 3 ++-
trunk/libs/geometry/test/strategies/segment_intersection.cpp | 3 ++-
trunk/libs/geometry/test/strategies/transformer.cpp | 4 ++--
trunk/libs/geometry/test/util/for_each_coordinate.cpp | 4 +++-
trunk/libs/geometry/test/views/closeable_view.cpp | 3 ++-
trunk/libs/geometry/test/views/reversible_closeable.cpp | 4 +++-
trunk/libs/geometry/test/views/reversible_view.cpp | 5 ++++-
42 files changed, 131 insertions(+), 54 deletions(-)
Copied: trunk/boost/geometry/geometries/adapted/boost_tuple.hpp (from r71373, /trunk/boost/geometry/geometries/adapted/tuple.hpp)
==============================================================================
--- /trunk/boost/geometry/geometries/adapted/tuple.hpp (original)
+++ trunk/boost/geometry/geometries/adapted/boost_tuple.hpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -11,8 +11,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_GEOMETRIES_ADAPTED_TUPLE_HPP
-#define BOOST_GEOMETRY_GEOMETRIES_ADAPTED_TUPLE_HPP
+#ifndef BOOST_GEOMETRY_GEOMETRIES_ADAPTED_BOOST_TUPLE_HPP
+#define BOOST_GEOMETRY_GEOMETRIES_ADAPTED_BOOST_TUPLE_HPP
#include <cstddef>
@@ -24,6 +24,7 @@
#include <boost/geometry/core/point_type.hpp>
#include <boost/geometry/core/tags.hpp>
+
namespace boost { namespace geometry
{
@@ -86,16 +87,23 @@
};
-// The library user has
-// 1) either to specify the coordinate system using a traits class
-// 2) or include <boost/geometry/geometries/adapted/tuple__at_.hpp>
-// where @=cartesian,geographic,...
-
} // namespace traits
#endif // DOXYGEN_NO_TRAITS_SPECIALIZATIONS
}} // namespace boost::geometry
-#endif // BOOST_GEOMETRY_GEOMETRIES_ADAPTED_TUPLE_HPP
+// Convenience registration macro to bind boost::tuple to a CS
+#define BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(CoordinateSystem) \
+ namespace boost { namespace geometry { namespace traits { \
+ template <typename T1, typename T2, typename T3, typename T4, typename T5, \
+ typename T6, typename T7, typename T8, typename T9, typename T10> \
+ struct coordinate_system<boost::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> > \
+ { \
+ typedef CoordinateSystem type; \
+ }; \
+ }}}
+
+
+#endif // BOOST_GEOMETRY_GEOMETRIES_ADAPTED_TUPLE_HPP
Deleted: trunk/boost/geometry/geometries/adapted/tuple.hpp
==============================================================================
--- trunk/boost/geometry/geometries/adapted/tuple.hpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
+++ (empty file)
@@ -1,101 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
-
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
-// (geolib/GGL), copyright (c) 1995-2010 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_GEOMETRIES_ADAPTED_TUPLE_HPP
-#define BOOST_GEOMETRY_GEOMETRIES_ADAPTED_TUPLE_HPP
-
-
-#include <cstddef>
-
-#include <boost/tuple/tuple.hpp>
-
-#include <boost/geometry/core/coordinate_dimension.hpp>
-#include <boost/geometry/core/coordinate_type.hpp>
-#include <boost/geometry/core/point_type.hpp>
-#include <boost/geometry/core/tags.hpp>
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_TRAITS_SPECIALIZATIONS
-namespace traits
-{
-
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
- typename T6, typename T7, typename T8, typename T9, typename T10>
-struct tag<boost::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> >
-{
- typedef point_tag type;
-};
-
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
- typename T6, typename T7, typename T8, typename T9, typename T10>
-struct coordinate_type<boost::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> >
-{
- typedef T1 type;
-};
-
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
- typename T6, typename T7, typename T8, typename T9, typename T10>
-struct dimension<boost::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> >
- : boost::mpl::int_
- <
- boost::tuples::length
- <
- boost::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>
- >::value
- >
-{};
-
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
- typename T6, typename T7, typename T8, typename T9, typename T10,
- std::size_t Dimension>
-struct access
- <
- boost::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>,
- Dimension
- >
-{
- static inline T1 get(
- boost::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> const& point)
- {
- return point.template get<Dimension>();
- }
-
- static inline void set(
- boost::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>& point,
- T1 const& value)
- {
- point.template get<Dimension>() = value;
- }
-};
-
-
-// The library user has
-// 1) either to specify the coordinate system using a traits class
-// 2) or include <boost/geometry/geometries/adapted/tuple__at_.hpp>
-// where @=cartesian,geographic,...
-
-} // namespace traits
-#endif // DOXYGEN_NO_TRAITS_SPECIALIZATIONS
-
-
-}} // namespace boost::geometry
-
-#endif // BOOST_GEOMETRY_GEOMETRIES_ADAPTED_TUPLE_HPP
-
Deleted: trunk/boost/geometry/geometries/adapted/tuple_cartesian.hpp
==============================================================================
--- trunk/boost/geometry/geometries/adapted/tuple_cartesian.hpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
+++ (empty file)
@@ -1,49 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
-
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
-// (geolib/GGL), copyright (c) 1995-2010 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_GEOMETRIES_ADAPTED_TUPLE_CARTESIAN_HPP
-#define BOOST_GEOMETRY_GEOMETRIES_ADAPTED_TUPLE_CARTESIAN_HPP
-
-#ifdef BOOST_GEOMETRY_ADAPTED_TUPLE_COORDINATE_SYSTEM_DEFINED
-#error Include only one headerfile to register coordinate coordinate_system for adapted tuple
-#endif
-
-#define BOOST_GEOMETRY_ADAPTED_TUPLE_COORDINATE_SYSTEM_DEFINED
-
-
-#include <boost/geometry/geometries/adapted/tuple.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_TRAITS_SPECIALIZATIONS
-namespace traits
-{
-
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
- typename T6, typename T7, typename T8, typename T9, typename T10>
-struct coordinate_system<boost::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> >
-{ typedef cs::cartesian type; };
-
-
-}
-#endif
-
-
-}} // namespace boost::geometry
-
-
-#endif // BOOST_GEOMETRY_GEOMETRIES_ADAPTED_TUPLE_CARTESIAN_HPP
Deleted: trunk/boost/geometry/geometries/adapted/tuple_geographic.hpp
==============================================================================
--- trunk/boost/geometry/geometries/adapted/tuple_geographic.hpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
+++ (empty file)
@@ -1,49 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
-
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
-// (geolib/GGL), copyright (c) 1995-2010 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_GEOMETRIES_ADAPTED_TUPLE_GEOGRAPHIC_HPP
-#define BOOST_GEOMETRY_GEOMETRIES_ADAPTED_TUPLE_GEOGRAPHIC_HPP
-
-#ifdef BOOST_GEOMETRY_ADAPTED_TUPLE_COORDINATE_SYSTEM_DEFINED
-#error Include only one headerfile to register coordinate coordinate_system for adapted tuple
-#endif
-
-#define BOOST_GEOMETRY_ADAPTED_TUPLE_COORDINATE_SYSTEM_DEFINED
-
-
-#include <boost/geometry/geometries/adapted/tuple.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_TRAITS_SPECIALIZATIONS
-namespace traits
-{
-
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
- typename T6, typename T7, typename T8, typename T9, typename T10>
-struct coordinate_system<boost::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> >
-{ typedef cs::geographic<degree> type; };
-
-
-}
-#endif
-
-
-}} // namespace boost::geometry
-
-
-#endif // BOOST_GEOMETRY_GEOMETRIES_ADAPTED_TUPLE_GEOGRAPHIC_HPP
Modified: trunk/boost/geometry/geometries/geometries.hpp
==============================================================================
--- trunk/boost/geometry/geometries/geometries.hpp (original)
+++ trunk/boost/geometry/geometries/geometries.hpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -15,7 +15,7 @@
#define BOOST_GEOMETRY_GEOMETRIES_HPP
#include <boost/geometry/geometries/adapted/c_array.hpp>
-#include <boost/geometry/geometries/adapted/tuple.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
Modified: trunk/libs/geometry/example/01_point_example.cpp
==============================================================================
--- trunk/libs/geometry/example/01_point_example.cpp (original)
+++ trunk/libs/geometry/example/01_point_example.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -13,11 +13,13 @@
#include <iostream>
#include <boost/geometry/geometry.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
#include <boost/geometry/geometries/adapted/boost_array_cartesian.hpp>
#include <boost/geometry/geometries/adapted/boost_polygon/point.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
int main()
{
Modified: trunk/libs/geometry/example/04_boost_example.cpp
==============================================================================
--- trunk/libs/geometry/example/04_boost_example.cpp (original)
+++ trunk/libs/geometry/example/04_boost_example.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -13,10 +13,11 @@
#include <iostream>
#include <boost/geometry/geometry.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
-#include <boost/assign.hpp>
+#include <boost/assign.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
int main(void)
Modified: trunk/libs/geometry/example/c04_b_custom_triangle_example.cpp
==============================================================================
--- trunk/libs/geometry/example/c04_b_custom_triangle_example.cpp (original)
+++ trunk/libs/geometry/example/c04_b_custom_triangle_example.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -17,12 +17,12 @@
#include <boost/geometry/algorithms/area.hpp>
#include <boost/geometry/algorithms/centroid.hpp>
-#include <boost/geometry/geometries/adapted/tuple.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/geometries/register/ring.hpp>
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/util/write_dsv.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
template <typename P>
Modified: trunk/libs/geometry/example/with_external_libs/x03_a_soci_example.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x03_a_soci_example.cpp (original)
+++ trunk/libs/geometry/example/with_external_libs/x03_a_soci_example.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -35,9 +35,10 @@
#include <exception>
#include <boost/geometry/geometry.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
int main()
Modified: trunk/libs/geometry/test/algorithms/assign.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/assign.cpp (original)
+++ trunk/libs/geometry/test/algorithms/assign.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -20,9 +20,11 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename Linestring>
void check_linestring_2d(Linestring const& line)
Modified: trunk/libs/geometry/test/algorithms/convert.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/convert.cpp (original)
+++ trunk/libs/geometry/test/algorithms/convert.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -22,9 +22,11 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename P>
void test_all()
Modified: trunk/libs/geometry/test/algorithms/distance.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/distance.cpp (original)
+++ trunk/libs/geometry/test/algorithms/distance.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -23,12 +23,14 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/boost_array_as_linestring.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>
#include <test_geometries/custom_segment.hpp>
#include <test_geometries/wrapped_boost_array.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename P>
void test_distance_point()
Modified: trunk/libs/geometry/test/algorithms/envelope.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/envelope.cpp (original)
+++ trunk/libs/geometry/test/algorithms/envelope.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -17,10 +17,12 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/geometries/adapted/std_pair_as_segment.hpp>
#include <test_common/test_point.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename P>
void test_2d()
Modified: trunk/libs/geometry/test/algorithms/expand.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/expand.cpp (original)
+++ trunk/libs/geometry/test/algorithms/expand.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -19,10 +19,12 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/geometries/adapted/std_pair_as_segment.hpp>
#include <test_common/test_point.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename Point>
void test_point_3d()
Modified: trunk/libs/geometry/test/algorithms/make.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/make.cpp (original)
+++ trunk/libs/geometry/test/algorithms/make.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -21,9 +21,11 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename T, typename P>
void test_point_2d()
Modified: trunk/libs/geometry/test/algorithms/overlay/overlay_common.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/overlay_common.hpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/overlay_common.hpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -22,7 +22,7 @@
#include <boost/geometry/algorithms/correct.hpp>
#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
@@ -33,6 +33,8 @@
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
#endif
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename G1, typename G2, typename Functor, typename T>
Modified: trunk/libs/geometry/test/arithmetic/arithmetic.cpp
==============================================================================
--- trunk/libs/geometry/test/arithmetic/arithmetic.cpp (original)
+++ trunk/libs/geometry/test/arithmetic/arithmetic.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -22,9 +22,11 @@
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename P>
void test_addition()
Modified: trunk/libs/geometry/test/arithmetic/dot_product.cpp
==============================================================================
--- trunk/libs/geometry/test/arithmetic/dot_product.cpp (original)
+++ trunk/libs/geometry/test/arithmetic/dot_product.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -22,9 +22,11 @@
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename P>
void test_all()
Modified: trunk/libs/geometry/test/core/access.cpp
==============================================================================
--- trunk/libs/geometry/test/core/access.cpp (original)
+++ trunk/libs/geometry/test/core/access.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -23,7 +23,7 @@
#include <boost/geometry/algorithms/make.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/core/cs.hpp>
@@ -31,6 +31,7 @@
#include <boost/geometry/geometries/segment.hpp>
#include <boost/geometry/geometries/box.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
template <typename G>
Modified: trunk/libs/geometry/test/core/coordinate_dimension.cpp
==============================================================================
--- trunk/libs/geometry/test/core/coordinate_dimension.cpp (original)
+++ trunk/libs/geometry/test/core/coordinate_dimension.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -17,7 +17,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/geometries/adapted/boost_array_as_linestring.hpp>
#include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
@@ -25,6 +25,8 @@
#include <vector>
#include <deque>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename G, int Expected>
void test_geometry()
Modified: trunk/libs/geometry/test/core/coordinate_system.cpp
==============================================================================
--- trunk/libs/geometry/test/core/coordinate_system.cpp (original)
+++ trunk/libs/geometry/test/core/coordinate_system.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -17,7 +17,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/geometries/adapted/boost_array_as_linestring.hpp>
#include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
@@ -25,6 +25,8 @@
#include <vector>
#include <deque>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename G, typename Expected>
void test_geometry()
Modified: trunk/libs/geometry/test/core/coordinate_type.cpp
==============================================================================
--- trunk/libs/geometry/test/core/coordinate_type.cpp (original)
+++ trunk/libs/geometry/test/core/coordinate_type.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -17,7 +17,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/geometries/adapted/boost_array_as_linestring.hpp>
#include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
@@ -25,6 +25,8 @@
#include <vector>
#include <deque>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename G, typename Expected>
void test_geometry()
Modified: trunk/libs/geometry/test/core/geometry_id.cpp
==============================================================================
--- trunk/libs/geometry/test/core/geometry_id.cpp (original)
+++ trunk/libs/geometry/test/core/geometry_id.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/geometries/adapted/boost_array_as_linestring.hpp>
#include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
@@ -24,6 +24,8 @@
#include <vector>
#include <deque>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename G, int Expected>
void test_geometry()
Modified: trunk/libs/geometry/test/core/point_type.cpp
==============================================================================
--- trunk/libs/geometry/test/core/point_type.cpp (original)
+++ trunk/libs/geometry/test/core/point_type.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/geometries/adapted/boost_array_as_linestring.hpp>
#include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
@@ -24,6 +24,8 @@
#include <vector>
#include <deque>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename G, typename Expected>
void test_geometry()
Modified: trunk/libs/geometry/test/core/tag.cpp
==============================================================================
--- trunk/libs/geometry/test/core/tag.cpp (original)
+++ trunk/libs/geometry/test/core/tag.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -15,7 +15,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/geometries/adapted/boost_array_as_linestring.hpp>
#include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
@@ -23,6 +23,8 @@
#include <vector>
#include <deque>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename G, typename Expected>
void test_geometry()
Modified: trunk/libs/geometry/test/core/topological_dimension.cpp
==============================================================================
--- trunk/libs/geometry/test/core/topological_dimension.cpp (original)
+++ trunk/libs/geometry/test/core/topological_dimension.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -15,7 +15,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/geometries/adapted/boost_array_as_linestring.hpp>
#include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
@@ -23,6 +23,8 @@
#include <vector>
#include <deque>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename G, int Expected>
void test_geometry()
Modified: trunk/libs/geometry/test/geometries/Jamfile.v2
==============================================================================
--- trunk/libs/geometry/test/geometries/Jamfile.v2 (original)
+++ trunk/libs/geometry/test/geometries/Jamfile.v2 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -15,8 +15,7 @@
[ run boost_fusion.cpp ]
[ run boost_polygon.cpp ]
[ run boost_range.cpp ]
- [ run boost_tuple_cartesian.cpp ]
- [ run boost_tuple_geographic.cpp ]
+ [ run boost_tuple.cpp ]
[ run box.cpp ]
#[ compile-fail custom_linestring.cpp
# : # requirements
Modified: trunk/libs/geometry/test/geometries/adapted.cpp
==============================================================================
--- trunk/libs/geometry/test/geometries/adapted.cpp (original)
+++ trunk/libs/geometry/test/geometries/adapted.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -46,11 +46,14 @@
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
+
+
// ----------------------------------------------------------------------------
template <typename G>
Modified: trunk/libs/geometry/test/geometries/boost_array_as_point.cpp
==============================================================================
--- trunk/libs/geometry/test/geometries/boost_array_as_point.cpp (original)
+++ trunk/libs/geometry/test/geometries/boost_array_as_point.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -14,9 +14,11 @@
#include<boost/geometry/geometry.hpp>
#include<boost/geometry/geometries/adapted/boost_array_cartesian.hpp>
#include<boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include<boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include<boost/geometry/geometries/adapted/boost_tuple.hpp>
#include<iostream>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
int test_main(int, char* [])
{
Modified: trunk/libs/geometry/test/geometries/boost_fusion.cpp
==============================================================================
--- trunk/libs/geometry/test/geometries/boost_fusion.cpp (original)
+++ trunk/libs/geometry/test/geometries/boost_fusion.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -16,9 +16,12 @@
#include <boost/geometry/geometries/adapted/fusion.hpp>
#include <boost/geometry/geometries/adapted/fusion_cartesian.hpp>
#include<boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <iostream>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
+
struct for_fusion_2d
{
float x,y;
Copied: trunk/libs/geometry/test/geometries/boost_tuple.cpp (from r71374, /trunk/libs/geometry/test/geometries/boost_tuple_cartesian.cpp)
==============================================================================
--- /trunk/libs/geometry/test/geometries/boost_tuple_cartesian.cpp (original)
+++ trunk/libs/geometry/test/geometries/boost_tuple.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -10,12 +10,16 @@
#include <geometry_test_common.hpp>
#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/algorithms/distance.hpp>
#include <boost/geometry/strategies/strategies.hpp>
#include <iostream>
+
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
+
+
template <typename P>
void test_all()
{
Deleted: trunk/libs/geometry/test/geometries/boost_tuple_cartesian.cpp
==============================================================================
--- trunk/libs/geometry/test/geometries/boost_tuple_cartesian.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
+++ (empty file)
@@ -1,35 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-// Unit Test
-
-// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
-
-// 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)
-
-
-#include <geometry_test_common.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
-#include <boost/geometry/algorithms/distance.hpp>
-#include <boost/geometry/strategies/strategies.hpp>
-
-#include <iostream>
-
-template <typename P>
-void test_all()
-{
- P p1, p2;
- bg::distance(p1, p2);
-}
-
-int test_main(int, char* [])
-{
- test_all<boost::tuple<float> >();
- test_all<boost::tuple<int, int> >();
- test_all<boost::tuple<double, double, double> >();
- test_all<boost::tuple<float, float, float, float> >();
- test_all<boost::tuple<float, float, float, float, float> >();
-
- return 0;
-}
Deleted: trunk/libs/geometry/test/geometries/boost_tuple_geographic.cpp
==============================================================================
--- trunk/libs/geometry/test/geometries/boost_tuple_geographic.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
+++ (empty file)
@@ -1,36 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-// Unit Test
-
-// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
-
-// 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)
-
-
-#include <geometry_test_common.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/adapted/tuple_geographic.hpp>
-#include <boost/geometry/algorithms/distance.hpp>
-#include <boost/geometry/strategies/strategies.hpp>
-
-#include <iostream>
-
-template <typename P>
-void test_all()
-{
- P p1, p2;
-// TODO do something applicable for geographic point types
-// bg::distance(p1, p2);
-}
-
-int test_main(int, char* [])
-{
- test_all<boost::tuple<float> >();
- test_all<boost::tuple<int, int> >();
- test_all<boost::tuple<double, double, double> >();
- test_all<boost::tuple<float, float, float, float> >();
- test_all<boost::tuple<float, float, float, float, float> >();
-
- return 0;
-}
Modified: trunk/libs/geometry/test/geometries/box.cpp
==============================================================================
--- trunk/libs/geometry/test/geometries/box.cpp (original)
+++ trunk/libs/geometry/test/geometries/box.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -21,9 +21,11 @@
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename P>
bg::model::box<P> create_box()
Modified: trunk/libs/geometry/test/geometries/custom_linestring.cpp
==============================================================================
--- trunk/libs/geometry/test/geometries/custom_linestring.cpp (original)
+++ trunk/libs/geometry/test/geometries/custom_linestring.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -28,9 +28,11 @@
#include <boost/geometry/geometries/adapted/boost_array_as_linestring.hpp>
#include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
+
//#define TEST_FAIL_CLEAR
//#define TEST_FAIL_APPEND
Modified: trunk/libs/geometry/test/geometries/segment.cpp
==============================================================================
--- trunk/libs/geometry/test/geometries/segment.cpp (original)
+++ trunk/libs/geometry/test/geometries/segment.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -23,7 +23,7 @@
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/util/write_dsv.hpp>
@@ -31,6 +31,8 @@
#include <test_common/test_point.hpp>
#include <test_geometries/custom_segment.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename P>
void test_all()
Modified: trunk/libs/geometry/test/multi/algorithms/multi_distance.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_distance.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_distance.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -24,9 +24,11 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename Geometry1, typename Geometry2>
void test_distance(std::string const& wkt1, std::string const& wkt2, double expected)
Modified: trunk/libs/geometry/test/multi/algorithms/multi_envelope.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_envelope.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_envelope.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -25,10 +25,10 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>
-
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
template <typename P>
Modified: trunk/libs/geometry/test/policies/compare.cpp
==============================================================================
--- trunk/libs/geometry/test/policies/compare.cpp (original)
+++ trunk/libs/geometry/test/policies/compare.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -20,10 +20,12 @@
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <typename Container>
inline std::string coordinates(Container const& points)
Modified: trunk/libs/geometry/test/strategies/projected_point.cpp
==============================================================================
--- trunk/libs/geometry/test/strategies/projected_point.cpp (original)
+++ trunk/libs/geometry/test/strategies/projected_point.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -23,13 +23,14 @@
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>
#ifdef HAVE_TTMATH
# include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
#endif
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
template <typename P, typename PS, typename CalculationType>
Modified: trunk/libs/geometry/test/strategies/pythagoras.cpp
==============================================================================
--- trunk/libs/geometry/test/strategies/pythagoras.cpp (original)
+++ trunk/libs/geometry/test/strategies/pythagoras.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -31,7 +31,7 @@
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>
@@ -39,6 +39,7 @@
# include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
#endif
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
template <typename P1, typename P2>
Modified: trunk/libs/geometry/test/strategies/segment_intersection.cpp
==============================================================================
--- trunk/libs/geometry/test/strategies/segment_intersection.cpp (original)
+++ trunk/libs/geometry/test/strategies/segment_intersection.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -38,8 +38,9 @@
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/segment.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
template <typename R>
Modified: trunk/libs/geometry/test/strategies/transformer.cpp
==============================================================================
--- trunk/libs/geometry/test/strategies/transformer.cpp (original)
+++ trunk/libs/geometry/test/strategies/transformer.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -25,9 +25,9 @@
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
-
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
template <typename P, typename T>
Modified: trunk/libs/geometry/test/util/for_each_coordinate.cpp
==============================================================================
--- trunk/libs/geometry/test/util/for_each_coordinate.cpp (original)
+++ trunk/libs/geometry/test/util/for_each_coordinate.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -24,9 +24,11 @@
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
struct test_operation
{
Modified: trunk/libs/geometry/test/views/closeable_view.cpp
==============================================================================
--- trunk/libs/geometry/test/views/closeable_view.cpp (original)
+++ trunk/libs/geometry/test/views/closeable_view.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -19,8 +19,9 @@
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
#include <boost/geometry/util/write_dsv.hpp>
#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
Modified: trunk/libs/geometry/test/views/reversible_closeable.cpp
==============================================================================
--- trunk/libs/geometry/test/views/reversible_closeable.cpp (original)
+++ trunk/libs/geometry/test/views/reversible_closeable.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -21,7 +21,9 @@
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
#include <boost/geometry/util/write_dsv.hpp>
#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
+
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
template <typename View>
Modified: trunk/libs/geometry/test/views/reversible_view.cpp
==============================================================================
--- trunk/libs/geometry/test/views/reversible_view.cpp (original)
+++ trunk/libs/geometry/test/views/reversible_view.cpp 2011-04-23 18:26:50 EDT (Sat, 23 Apr 2011)
@@ -19,7 +19,10 @@
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/util/write_dsv.hpp>
#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
+
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+
template <bg::iterate_direction Direction, typename Range>
void test_forward_or_reverse(Range const& range, std::string const& expected)