Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r71575 - in trunk: boost/geometry/geometries/adapted libs/geometry/example 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/point_concept libs/geometry/test/policies libs/geometry/test/strategies libs/geometry/test/util
From: bruno.lalande_at_[hidden]
Date: 2011-04-28 17:26:58

Author: bruno.lalande
Date: 2011-04-28 17:26:54 EDT (Thu, 28 Apr 2011)
New Revision: 71575
URL: http://svn.boost.org/trac/boost/changeset/71575

Log:
Aligned adapted C array and Boost Array to the recent changes.
Removed:
   trunk/boost/geometry/geometries/adapted/boost_array_cartesian.hpp
   trunk/boost/geometry/geometries/adapted/boost_array_geographic.hpp
   trunk/boost/geometry/geometries/adapted/c_array_cartesian.hpp
   trunk/boost/geometry/geometries/adapted/c_array_geographic.hpp
Text files modified:
   trunk/boost/geometry/geometries/adapted/boost_array.hpp | 14 +++++++++++---
   trunk/boost/geometry/geometries/adapted/c_array.hpp | 14 +++++++++++---
   trunk/libs/geometry/example/01_point_example.cpp | 8 +++++---
   trunk/libs/geometry/example/02_linestring_example.cpp | 4 ++--
   trunk/libs/geometry/example/03_polygon_example.cpp | 5 ++++-
   trunk/libs/geometry/example/05_a_overlay_polygon_example.cpp | 4 +++-
   trunk/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp | 4 +++-
   trunk/libs/geometry/example/06_a_transformation_example.cpp | 7 +++++--
   trunk/libs/geometry/test/algorithms/assign.cpp | 5 +++--
   trunk/libs/geometry/test/algorithms/centroid.cpp | 5 +++--
   trunk/libs/geometry/test/algorithms/convert.cpp | 5 +++--
   trunk/libs/geometry/test/algorithms/distance.cpp | 5 +++--
   trunk/libs/geometry/test/algorithms/envelope.cpp | 5 +++--
   trunk/libs/geometry/test/algorithms/expand.cpp | 5 +++--
   trunk/libs/geometry/test/algorithms/make.cpp | 5 +++--
   trunk/libs/geometry/test/algorithms/overlay/get_turn_info.cpp | 3 ++-
   trunk/libs/geometry/test/arithmetic/arithmetic.cpp | 5 +++--
   trunk/libs/geometry/test/arithmetic/dot_product.cpp | 5 +++--
   trunk/libs/geometry/test/core/access.cpp | 5 +++--
   trunk/libs/geometry/test/core/coordinate_dimension.cpp | 5 +++--
   trunk/libs/geometry/test/core/coordinate_system.cpp | 5 +++--
   trunk/libs/geometry/test/core/coordinate_type.cpp | 5 +++--
   trunk/libs/geometry/test/core/geometry_id.cpp | 5 +++--
   trunk/libs/geometry/test/core/point_type.cpp | 5 +++--
   trunk/libs/geometry/test/core/tag.cpp | 5 +++--
   trunk/libs/geometry/test/core/topological_dimension.cpp | 5 +++--
   trunk/libs/geometry/test/geometries/adapted.cpp | 4 ++--
   trunk/libs/geometry/test/geometries/boost_array_as_point.cpp | 8 +++++---
   trunk/libs/geometry/test/geometries/boost_fusion.cpp | 7 ++++---
   trunk/libs/geometry/test/geometries/box.cpp | 5 +++--
   trunk/libs/geometry/test/geometries/custom_linestring.cpp | 3 ++-
   trunk/libs/geometry/test/geometries/segment.cpp | 5 +++--
   trunk/libs/geometry/test/multi/algorithms/multi_distance.cpp | 5 +++--
   trunk/libs/geometry/test/multi/algorithms/multi_envelope.cpp | 5 +++--
   trunk/libs/geometry/test/point_concept/array_point.cpp | 5 ++++-
   trunk/libs/geometry/test/policies/compare.cpp | 5 +++--
   trunk/libs/geometry/test/strategies/projected_point.cpp | 5 +++--
   trunk/libs/geometry/test/strategies/pythagoras.cpp | 5 +++--
   trunk/libs/geometry/test/strategies/transformer.cpp | 5 +++--
   trunk/libs/geometry/test/util/for_each_coordinate.cpp | 5 +++--
   40 files changed, 141 insertions(+), 79 deletions(-)

Modified: trunk/boost/geometry/geometries/adapted/boost_array.hpp
==============================================================================
--- trunk/boost/geometry/geometries/adapted/boost_array.hpp (original)
+++ trunk/boost/geometry/geometries/adapted/boost_array.hpp 2011-04-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -98,9 +98,6 @@
}
};

-// The library user has
-// 1) either to specify the coordinate system
-// 2) or include <boost/geometry/geometries/adapted/boost_array__at_.hpp> where @=cartesian,geographic,...

} // namespace traits
#endif // DOXYGEN_NO_TRAITS_SPECIALIZATIONS
@@ -108,5 +105,16 @@

}} // namespace boost::geometry

+
+#define BOOST_GEOMETRY_REGISTER_BOOST_ARRAY_CS(CoordinateSystem) \
+ namespace boost { namespace geometry { namespace traits { \
+ template <class T, std::size_t N> \
+ struct coordinate_system<boost::array<T, N> > \
+ { \
+ typedef CoordinateSystem type; \
+ }; \
+ }}}
+
+
#endif // BOOST_GEOMETRY_GEOMETRIES_ADAPTED_BOOST_ARRAY_HPP

Deleted: trunk/boost/geometry/geometries/adapted/boost_array_cartesian.hpp
==============================================================================
--- trunk/boost/geometry/geometries/adapted/boost_array_cartesian.hpp 2011-04-28 17:26:54 EDT (Thu, 28 Apr 2011)
+++ (empty file)
@@ -1,42 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2010 Alfredo Correa
-// Copyright (c) 2010-2011 Barend Gehrels, 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_BOOST_ARRAY_CARTESIAN_HPP
-#define BOOST_GEOMETRY_GEOMETRIES_ADAPTED_BOOST_ARRAY_CARTESIAN_HPP
-
-#ifdef BOOST_GEOMETRY_ADAPTED_BOOST_ARRAY_COORDINATE_SYSTEM_DEFINED
-#error Include only one headerfile to register coordinate coordinate_system for adapted boost array
-#endif
-
-#define BOOST_GEOMETRY_ADAPTED_BOOST_ARRAY_COORDINATE_SYSTEM_DEFINED
-
-
-#include <boost/geometry/geometries/adapted/boost_array.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_TRAITS_SPECIALIZATIONS
-namespace traits
-{
- template <typename T, std::size_t N>
- struct coordinate_system<boost::array<T, N> >
- { typedef cs::cartesian type; };
-
-}
-#endif
-
-
-}} // namespace boost::geometry
-
-
-#endif // BOOST_GEOMETRY_GEOMETRIES_ADAPTED_BOOST_ARRAY_CARTESIAN_HPP
-

Deleted: trunk/boost/geometry/geometries/adapted/boost_array_geographic.hpp
==============================================================================
--- trunk/boost/geometry/geometries/adapted/boost_array_geographic.hpp 2011-04-28 17:26:54 EDT (Thu, 28 Apr 2011)
+++ (empty file)
@@ -1,40 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2010 Alfredo Correa
-// Copyright (c) 2010-2011 Barend Gehrels, 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_BOOST_ARRAY_GEOGRAPHIC_HPP
-#define BOOST_GEOMETRY_GEOMETRIES_ADAPTED_BOOST_ARRAY_GEOGRAPHIC_HPP
-
-#ifdef BOOST_GEOMETRY_ADAPTED_BOOST_ARRAY_COORDINATE_SYSTEM_DEFINED
-#error Include only one headerfile to register coordinate coordinate_system for adapted boost array
-#endif
-
-#define BOOST_GEOMETRY_ADAPTED_BOOST_ARRAY_COORDINATE_SYSTEM_DEFINED
-
-
-#include <boost/geometry/geometries/adapted/boost_array.hpp>
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_TRAITS_SPECIALIZATIONS
-namespace traits
-{
- template <typename T, std::size_t N>
- struct coordinate_system<boost::array<T, N> >
- { typedef cs::geographic type; };
-
-}
-#endif
-
-
-}} // namespace boost::geometry
-
-
-#endif // BOOST_GEOMETRY_GEOMETRIES_ADAPTED_BOOST_ARRAY_GEOGRAPHIC_HPP

Modified: trunk/boost/geometry/geometries/adapted/c_array.hpp
==============================================================================
--- trunk/boost/geometry/geometries/adapted/c_array.hpp (original)
+++ trunk/boost/geometry/geometries/adapted/c_array.hpp 2011-04-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -90,9 +90,6 @@
}
};

-// The library user has
-// 1) either to specify the coordinate system
-// 2) or include <boost/geometry/geometries/adapted/c_array__at_.hpp> where @=cartesian,geographic,...

} // namespace traits
#endif // DOXYGEN_NO_TRAITS_SPECIALIZATIONS
@@ -100,4 +97,15 @@

}} // namespace boost::geometry

+
+#define BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(CoordinateSystem) \
+ namespace boost { namespace geometry { namespace traits { \
+ template <typename T, std::size_t N> \
+ struct coordinate_system<T[N]> \
+ { \
+ typedef CoordinateSystem type; \
+ }; \
+ }}}
+
+
#endif // BOOST_GEOMETRY_GEOMETRIES_ADAPTED_C_ARRAY_HPP

Deleted: trunk/boost/geometry/geometries/adapted/c_array_cartesian.hpp
==============================================================================
--- trunk/boost/geometry/geometries/adapted/c_array_cartesian.hpp 2011-04-28 17:26:54 EDT (Thu, 28 Apr 2011)
+++ (empty file)
@@ -1,45 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
-// Copyright (c) 2007-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_C_ARRAY_CARTESIAN_HPP
-#define BOOST_GEOMETRY_GEOMETRIES_ADAPTED_C_ARRAY_CARTESIAN_HPP
-
-#ifdef BOOST_GEOMETRY_ADAPTED_C_ARRAY_COORDINATE_SYSTEM_DEFINED
-#error Include only one headerfile to register coordinate coordinate_system for adapted c array
-#endif
-
-#define BOOST_GEOMETRY_ADAPTED_C_ARRAY_COORDINATE_SYSTEM_DEFINED
-
-
-#include <boost/geometry/geometries/adapted/c_array.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_TRAITS_SPECIALIZATIONS
-namespace traits
-{
- template <typename T, int N>
- struct coordinate_system<T[N]>
- { typedef cs::cartesian type; };
-
-}
-#endif
-
-
-}} // namespace boost::geometry
-
-
-#endif // BOOST_GEOMETRY_GEOMETRIES_ADAPTED_C_ARRAY_CARTESIAN_HPP

Deleted: trunk/boost/geometry/geometries/adapted/c_array_geographic.hpp
==============================================================================
--- trunk/boost/geometry/geometries/adapted/c_array_geographic.hpp 2011-04-28 17:26:54 EDT (Thu, 28 Apr 2011)
+++ (empty file)
@@ -1,43 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
-// Copyright (c) 2007-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_C_ARRAY_GEOGRAPHIC_HPP
-#define BOOST_GEOMETRY_GEOMETRIES_ADAPTED_C_ARRAY_GEOGRAPHIC_HPP
-
-#ifdef BOOST_GEOMETRY_ADAPTED_C_ARRAY_COORDINATE_SYSTEM_DEFINED
-#error Include only one headerfile to register coordinate coordinate_system for adapted c array
-#endif
-
-#define BOOST_GEOMETRY_ADAPTED_C_ARRAY_COORDINATE_SYSTEM_DEFINED
-
-#include <boost/geometry/geometries/adapted/c_array.hpp>
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_TRAITS_SPECIALIZATIONS
-namespace traits
-{
- template <typename T, int N>
- struct coordinate_system<T[N]>
- { typedef cs::geographic type; };
-
-}
-#endif
-
-
-}} // namespace boost::geometry
-
-
-#endif // BOOST_GEOMETRY_GEOMETRIES_ADAPTED_C_ARRAY_GEOGRAPHIC_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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -14,11 +14,13 @@

#include <boost/geometry/geometry.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/c_array.hpp>
+#include <boost/geometry/geometries/adapted/boost_array.hpp>
#include <boost/geometry/geometries/adapted/boost_polygon/point.hpp>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

int main()

Modified: trunk/libs/geometry/example/02_linestring_example.cpp
==============================================================================
--- trunk/libs/geometry/example/02_linestring_example.cpp (original)
+++ trunk/libs/geometry/example/02_linestring_example.cpp 2011-04-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -18,9 +18,9 @@

#include <boost/geometry/geometry.hpp>
// Optional includes to handle c-arrays as points, std::vectors as linestrings
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
-
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)

template<typename P>

Modified: trunk/libs/geometry/example/03_polygon_example.cpp
==============================================================================
--- trunk/libs/geometry/example/03_polygon_example.cpp (original)
+++ trunk/libs/geometry/example/03_polygon_example.cpp 2011-04-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -15,10 +15,13 @@
#include <string>

#include <boost/geometry/geometry.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
#include <boost/geometry/multi/multi.hpp>

+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+
+
std::string boolstr(bool v)
{
return v ? "true" : "false";

Modified: trunk/libs/geometry/example/05_a_overlay_polygon_example.cpp
==============================================================================
--- trunk/libs/geometry/example/05_a_overlay_polygon_example.cpp (original)
+++ trunk/libs/geometry/example/05_a_overlay_polygon_example.cpp 2011-04-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -19,12 +19,14 @@

#include <boost/geometry/geometry.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>

#if defined(HAVE_SVG)
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
#endif

+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+

int main(void)
{

Modified: trunk/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp
==============================================================================
--- trunk/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp (original)
+++ trunk/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp 2011-04-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -19,12 +19,14 @@

#include <boost/geometry/geometry.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>

#if defined(HAVE_SVG)
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
#endif

+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian);
+

int main(void)
{

Modified: trunk/libs/geometry/example/06_a_transformation_example.cpp
==============================================================================
--- trunk/libs/geometry/example/06_a_transformation_example.cpp (original)
+++ trunk/libs/geometry/example/06_a_transformation_example.cpp 2011-04-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -13,9 +13,12 @@
#include <iostream>

#include <boost/geometry/geometry.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/std_as_linestring.hpp>

+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+
+
int main()
{
     using namespace boost::geometry;
@@ -34,7 +37,7 @@
     model::polygon<point_2d> poly, poly2;
     const double coor[][2] = { {0, 0}, {0, 7}, {2, 2}, {2, 0}, {0, 0} };
     // note that for this syntax you have to include the two
- // include files above (c_array_cartesian.hpp, std_as_linestring.hpp)
+ // include files above (c_array.hpp, std_as_linestring.hpp)
     assign_points(poly, coor);
     //read_wkt("POLYGON((0 0,0 7,4 2,2 0,0 0))", poly);
     transform(poly, poly2, translate);

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -19,11 +19,12 @@
#include <boost/geometry/algorithms/num_points.hpp>

#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename Linestring>

Modified: trunk/libs/geometry/test/algorithms/centroid.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/centroid.cpp (original)
+++ trunk/libs/geometry/test/algorithms/centroid.cpp 2011-04-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -15,12 +15,13 @@
#include <algorithms/test_centroid.hpp>

#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

#include <test_geometries/all_custom_polygon.hpp>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename Polygon>

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -21,11 +21,12 @@
#include <boost/geometry/algorithms/num_points.hpp>

#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename P>

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -22,14 +22,15 @@

#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/c_array.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);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename P>

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -16,12 +16,13 @@
#include <algorithms/test_envelope.hpp>

#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.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);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename P>

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -18,12 +18,13 @@
#include <boost/geometry/algorithms/make.hpp>

#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.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);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename Point>

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -20,11 +20,12 @@
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>

#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename T, typename P>

Modified: trunk/libs/geometry/test/algorithms/overlay/get_turn_info.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/get_turn_info.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/get_turn_info.cpp 2011-04-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -818,7 +818,8 @@
/***
#include <boost/geometry/geometries/adapted/c_array_as_linestring.hpp>
#include <boost/geometry/geometries/adapted/c_array_as_ring.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)

template <typename G>
void test2(G const& geometry)

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -21,11 +21,12 @@
#include <boost/geometry/algorithms/assign.hpp>

#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename P>

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -21,11 +21,12 @@
#include <boost/geometry/algorithms/assign.hpp>

#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename P>

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -22,7 +22,7 @@
#include <boost/geometry/core/coordinate_type.hpp>
#include <boost/geometry/algorithms/make.hpp>

-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

@@ -31,7 +31,8 @@
#include <boost/geometry/geometries/segment.hpp>
#include <boost/geometry/geometries/box.hpp>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+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-28 17:26:54 EDT (Thu, 28 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/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

#include <boost/geometry/geometries/adapted/boost_array_as_linestring.hpp>
@@ -25,7 +25,8 @@
#include <vector>
#include <deque>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename G, int Expected>

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-28 17:26:54 EDT (Thu, 28 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/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

#include <boost/geometry/geometries/adapted/boost_array_as_linestring.hpp>
@@ -25,7 +25,8 @@
#include <vector>
#include <deque>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename G, typename Expected>

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-28 17:26:54 EDT (Thu, 28 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/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

#include <boost/geometry/geometries/adapted/boost_array_as_linestring.hpp>
@@ -25,7 +25,8 @@
#include <vector>
#include <deque>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename G, typename Expected>

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-28 17:26:54 EDT (Thu, 28 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/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

#include <boost/geometry/geometries/adapted/boost_array_as_linestring.hpp>
@@ -24,7 +24,8 @@
#include <vector>
#include <deque>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename G, int Expected>

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-28 17:26:54 EDT (Thu, 28 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/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

#include <boost/geometry/geometries/adapted/boost_array_as_linestring.hpp>
@@ -24,7 +24,8 @@
#include <vector>
#include <deque>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename G, typename Expected>

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -14,7 +14,7 @@

#include <boost/geometry/geometries/geometries.hpp>

-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

#include <boost/geometry/geometries/adapted/boost_array_as_linestring.hpp>
@@ -23,7 +23,8 @@
#include <vector>
#include <deque>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename G, typename Expected>

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -14,7 +14,7 @@

#include <boost/geometry/geometries/geometries.hpp>

-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

#include <boost/geometry/geometries/adapted/boost_array_as_linestring.hpp>
@@ -23,7 +23,8 @@
#include <vector>
#include <deque>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename G, int Expected>

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -45,12 +45,12 @@
#endif

-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

#include <test_common/test_point.hpp>

-
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -12,12 +12,14 @@

#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/boost_array.hpp>
+#include<boost/geometry/geometries/adapted/c_array.hpp>
#include<boost/geometry/geometries/adapted/boost_tuple.hpp>
#include<iostream>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_ARRAY_CS(cs::cartesian)
+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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -14,12 +14,13 @@

#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/adapted/boost_fusion.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <iostream>

-BOOST_GEOMETRY_REGISTER_BOOST_FUSION_CS(cs::cartesian);
-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_FUSION_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

struct for_fusion_2d

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -20,11 +20,12 @@

#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/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename P>

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -27,10 +27,11 @@
#include <boost/geometry/geometries/geometries.hpp>
#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/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>

+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

//#define TEST_FAIL_CLEAR

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -22,7 +22,7 @@
#include <boost/geometry/geometries/segment.hpp>

-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

#include <boost/geometry/util/write_dsv.hpp>
@@ -31,7 +31,8 @@
#include <test_common/test_point.hpp>
#include <test_geometries/custom_segment.hpp>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename P>

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -23,11 +23,12 @@
#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>

#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename Geometry1, typename Geometry2>

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -24,11 +24,12 @@
#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>

#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename P>

Modified: trunk/libs/geometry/test/point_concept/array_point.cpp
==============================================================================
--- trunk/libs/geometry/test/point_concept/array_point.cpp (original)
+++ trunk/libs/geometry/test/point_concept/array_point.cpp 2011-04-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -14,9 +14,12 @@

#include <test_common/test_point.hpp>

-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include "function_requiring_a_point.hpp"

+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+
+
int main()
{
float p1[3] = { 0, 0, 0 };

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -19,12 +19,13 @@
#include <boost/geometry/strategies/strategies.hpp>

#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

#include <test_common/test_point.hpp>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename Container>

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -22,7 +22,7 @@

#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>

@@ -30,7 +30,8 @@
# include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
#endif

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -30,7 +30,7 @@

#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

#include <test_common/test_point.hpp>
@@ -39,7 +39,8 @@
# include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
#endif

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

template <typename P1, typename P2>

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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -24,10 +24,11 @@
#include <boost/geometry/algorithms/transform.hpp>

#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+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-28 17:26:54 EDT (Thu, 28 Apr 2011)
@@ -23,11 +23,12 @@

#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <test_common/test_point.hpp>

-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)

struct test_operation

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