From fc68031c90b9db0513a61fb8c10fb20ae4cf63c8 Mon Sep 17 00:00:00 2001 From: Bruno Lalande Date: Sat, 23 Apr 2011 22:26:50 +0000 Subject: [PATCH] Removed adapted/tuple_.hpp files and added a macro to use instead. [SVN r71448] --- example/01_point_example.cpp | 4 +- example/04_boost_example.cpp | 5 +- example/c04_b_custom_triangle_example.cpp | 4 +- .../with_external_libs/x03_a_soci_example.cpp | 3 +- .../adapted/{tuple.hpp => boost_tuple.hpp} | 24 ++++++--- .../geometries/adapted/tuple_cartesian.hpp | 49 ------------------- .../geometries/adapted/tuple_geographic.hpp | 49 ------------------- .../boost/geometry/geometries/geometries.hpp | 2 +- test/algorithms/assign.cpp | 4 +- test/algorithms/convert.cpp | 4 +- test/algorithms/distance.cpp | 4 +- test/algorithms/envelope.cpp | 4 +- test/algorithms/expand.cpp | 4 +- test/algorithms/make.cpp | 4 +- test/algorithms/overlay/overlay_common.hpp | 4 +- test/arithmetic/arithmetic.cpp | 4 +- test/arithmetic/dot_product.cpp | 4 +- test/core/access.cpp | 3 +- test/core/coordinate_dimension.cpp | 4 +- test/core/coordinate_system.cpp | 4 +- test/core/coordinate_type.cpp | 4 +- test/core/geometry_id.cpp | 4 +- test/core/point_type.cpp | 4 +- test/core/tag.cpp | 4 +- test/core/topological_dimension.cpp | 4 +- test/geometries/Jamfile.v2 | 3 +- test/geometries/adapted.cpp | 5 +- test/geometries/boost_array_as_point.cpp | 4 +- test/geometries/boost_fusion.cpp | 5 +- ...st_tuple_cartesian.cpp => boost_tuple.cpp} | 6 ++- test/geometries/boost_tuple_geographic.cpp | 36 -------------- test/geometries/box.cpp | 4 +- test/geometries/custom_linestring.cpp | 4 +- test/geometries/segment.cpp | 4 +- test/multi/algorithms/multi_distance.cpp | 4 +- test/multi/algorithms/multi_envelope.cpp | 4 +- test/policies/compare.cpp | 4 +- test/strategies/projected_point.cpp | 3 +- test/strategies/pythagoras.cpp | 3 +- test/strategies/segment_intersection.cpp | 3 +- test/strategies/transformer.cpp | 4 +- test/util/for_each_coordinate.cpp | 4 +- test/views/closeable_view.cpp | 3 +- test/views/reversible_closeable.cpp | 4 +- test/views/reversible_view.cpp | 5 +- 45 files changed, 131 insertions(+), 188 deletions(-) rename include/boost/geometry/geometries/adapted/{tuple.hpp => boost_tuple.hpp} (81%) delete mode 100644 include/boost/geometry/geometries/adapted/tuple_cartesian.hpp delete mode 100644 include/boost/geometry/geometries/adapted/tuple_geographic.hpp rename test/geometries/{boost_tuple_cartesian.cpp => boost_tuple.cpp} (88%) delete mode 100644 test/geometries/boost_tuple_geographic.cpp diff --git a/example/01_point_example.cpp b/example/01_point_example.cpp index 574831e46..80157016c 100644 --- a/example/01_point_example.cpp +++ b/example/01_point_example.cpp @@ -13,11 +13,13 @@ #include #include -#include +#include #include #include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + int main() { diff --git a/example/04_boost_example.cpp b/example/04_boost_example.cpp index 288ea6690..f6d56cdfe 100644 --- a/example/04_boost_example.cpp +++ b/example/04_boost_example.cpp @@ -13,10 +13,11 @@ #include #include -#include +#include -#include +#include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); int main(void) diff --git a/example/c04_b_custom_triangle_example.cpp b/example/c04_b_custom_triangle_example.cpp index 99acaa34e..af06b3068 100644 --- a/example/c04_b_custom_triangle_example.cpp +++ b/example/c04_b_custom_triangle_example.cpp @@ -17,12 +17,12 @@ #include #include -#include -#include +#include #include #include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); template diff --git a/example/with_external_libs/x03_a_soci_example.cpp b/example/with_external_libs/x03_a_soci_example.cpp index 9177d15c4..de75b1831 100644 --- a/example/with_external_libs/x03_a_soci_example.cpp +++ b/example/with_external_libs/x03_a_soci_example.cpp @@ -35,9 +35,10 @@ #include #include -#include +#include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); int main() diff --git a/include/boost/geometry/geometries/adapted/tuple.hpp b/include/boost/geometry/geometries/adapted/boost_tuple.hpp similarity index 81% rename from include/boost/geometry/geometries/adapted/tuple.hpp rename to include/boost/geometry/geometries/adapted/boost_tuple.hpp index 97347b092..b2e18771f 100644 --- a/include/boost/geometry/geometries/adapted/tuple.hpp +++ b/include/boost/geometry/geometries/adapted/boost_tuple.hpp @@ -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 @@ -24,6 +24,7 @@ #include #include + namespace boost { namespace geometry { @@ -86,16 +87,23 @@ struct access }; -// The library user has -// 1) either to specify the coordinate system using a traits class -// 2) or include -// 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 \ + struct coordinate_system > \ + { \ + typedef CoordinateSystem type; \ + }; \ + }}} + + +#endif // BOOST_GEOMETRY_GEOMETRIES_ADAPTED_TUPLE_HPP diff --git a/include/boost/geometry/geometries/adapted/tuple_cartesian.hpp b/include/boost/geometry/geometries/adapted/tuple_cartesian.hpp deleted file mode 100644 index f4969f7be..000000000 --- a/include/boost/geometry/geometries/adapted/tuple_cartesian.hpp +++ /dev/null @@ -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 - - -namespace boost { namespace geometry -{ - - -#ifndef DOXYGEN_NO_TRAITS_SPECIALIZATIONS -namespace traits -{ - - -template -struct coordinate_system > -{ typedef cs::cartesian type; }; - - -} -#endif - - -}} // namespace boost::geometry - - -#endif // BOOST_GEOMETRY_GEOMETRIES_ADAPTED_TUPLE_CARTESIAN_HPP diff --git a/include/boost/geometry/geometries/adapted/tuple_geographic.hpp b/include/boost/geometry/geometries/adapted/tuple_geographic.hpp deleted file mode 100644 index 37cf4b14d..000000000 --- a/include/boost/geometry/geometries/adapted/tuple_geographic.hpp +++ /dev/null @@ -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 - - -namespace boost { namespace geometry -{ - - -#ifndef DOXYGEN_NO_TRAITS_SPECIALIZATIONS -namespace traits -{ - - -template -struct coordinate_system > -{ typedef cs::geographic type; }; - - -} -#endif - - -}} // namespace boost::geometry - - -#endif // BOOST_GEOMETRY_GEOMETRIES_ADAPTED_TUPLE_GEOGRAPHIC_HPP diff --git a/include/boost/geometry/geometries/geometries.hpp b/include/boost/geometry/geometries/geometries.hpp index cef9f6bf1..fd766ff26 100644 --- a/include/boost/geometry/geometries/geometries.hpp +++ b/include/boost/geometry/geometries/geometries.hpp @@ -15,7 +15,7 @@ #define BOOST_GEOMETRY_GEOMETRIES_HPP #include -#include +#include #include #include diff --git a/test/algorithms/assign.cpp b/test/algorithms/assign.cpp index ab4ee31b0..1db48ea38 100644 --- a/test/algorithms/assign.cpp +++ b/test/algorithms/assign.cpp @@ -20,9 +20,11 @@ #include #include -#include +#include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template void check_linestring_2d(Linestring const& line) diff --git a/test/algorithms/convert.cpp b/test/algorithms/convert.cpp index 185aceb11..8af86681b 100644 --- a/test/algorithms/convert.cpp +++ b/test/algorithms/convert.cpp @@ -22,9 +22,11 @@ #include #include -#include +#include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template void test_all() diff --git a/test/algorithms/distance.cpp b/test/algorithms/distance.cpp index aed42dbf2..1fe6c436a 100644 --- a/test/algorithms/distance.cpp +++ b/test/algorithms/distance.cpp @@ -23,12 +23,14 @@ #include #include #include -#include +#include #include #include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template void test_distance_point() diff --git a/test/algorithms/envelope.cpp b/test/algorithms/envelope.cpp index c790c0579..5eaa6c42b 100644 --- a/test/algorithms/envelope.cpp +++ b/test/algorithms/envelope.cpp @@ -17,10 +17,12 @@ #include #include -#include +#include #include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template void test_2d() diff --git a/test/algorithms/expand.cpp b/test/algorithms/expand.cpp index 040f2c3c5..0b8dafa3a 100644 --- a/test/algorithms/expand.cpp +++ b/test/algorithms/expand.cpp @@ -19,10 +19,12 @@ #include #include -#include +#include #include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template void test_point_3d() diff --git a/test/algorithms/make.cpp b/test/algorithms/make.cpp index 65b63fe9e..21587d26b 100644 --- a/test/algorithms/make.cpp +++ b/test/algorithms/make.cpp @@ -21,9 +21,11 @@ #include #include -#include +#include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template void test_point_2d() diff --git a/test/algorithms/overlay/overlay_common.hpp b/test/algorithms/overlay/overlay_common.hpp index de991806b..d821df85c 100644 --- a/test/algorithms/overlay/overlay_common.hpp +++ b/test/algorithms/overlay/overlay_common.hpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include @@ -33,6 +33,8 @@ # include #endif +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template diff --git a/test/arithmetic/arithmetic.cpp b/test/arithmetic/arithmetic.cpp index 1ae1915f4..1c5736424 100644 --- a/test/arithmetic/arithmetic.cpp +++ b/test/arithmetic/arithmetic.cpp @@ -22,9 +22,11 @@ #include #include -#include +#include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template void test_addition() diff --git a/test/arithmetic/dot_product.cpp b/test/arithmetic/dot_product.cpp index 777124ca2..da639ff43 100644 --- a/test/arithmetic/dot_product.cpp +++ b/test/arithmetic/dot_product.cpp @@ -22,9 +22,11 @@ #include #include -#include +#include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template void test_all() diff --git a/test/core/access.cpp b/test/core/access.cpp index f5e2cb033..880e29681 100644 --- a/test/core/access.cpp +++ b/test/core/access.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include @@ -31,6 +31,7 @@ #include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); template diff --git a/test/core/coordinate_dimension.cpp b/test/core/coordinate_dimension.cpp index 7013b3155..d76fd8159 100644 --- a/test/core/coordinate_dimension.cpp +++ b/test/core/coordinate_dimension.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include @@ -25,6 +25,8 @@ #include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template void test_geometry() diff --git a/test/core/coordinate_system.cpp b/test/core/coordinate_system.cpp index d3aa6cdd6..cfa66f8cf 100644 --- a/test/core/coordinate_system.cpp +++ b/test/core/coordinate_system.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include @@ -25,6 +25,8 @@ #include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template void test_geometry() diff --git a/test/core/coordinate_type.cpp b/test/core/coordinate_type.cpp index 71dbc4ae6..81c14a5be 100644 --- a/test/core/coordinate_type.cpp +++ b/test/core/coordinate_type.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include @@ -25,6 +25,8 @@ #include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template void test_geometry() diff --git a/test/core/geometry_id.cpp b/test/core/geometry_id.cpp index d80b4f8fb..9cdf9a397 100644 --- a/test/core/geometry_id.cpp +++ b/test/core/geometry_id.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include @@ -24,6 +24,8 @@ #include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template void test_geometry() diff --git a/test/core/point_type.cpp b/test/core/point_type.cpp index 957b8ebc6..96e7ce9b4 100644 --- a/test/core/point_type.cpp +++ b/test/core/point_type.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include @@ -24,6 +24,8 @@ #include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template void test_geometry() diff --git a/test/core/tag.cpp b/test/core/tag.cpp index 21361d42c..ea2b3bbe9 100644 --- a/test/core/tag.cpp +++ b/test/core/tag.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include @@ -23,6 +23,8 @@ #include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template void test_geometry() diff --git a/test/core/topological_dimension.cpp b/test/core/topological_dimension.cpp index c2edfa47a..4fb36705c 100644 --- a/test/core/topological_dimension.cpp +++ b/test/core/topological_dimension.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include @@ -23,6 +23,8 @@ #include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template void test_geometry() diff --git a/test/geometries/Jamfile.v2 b/test/geometries/Jamfile.v2 index 266980536..de76d1bef 100644 --- a/test/geometries/Jamfile.v2 +++ b/test/geometries/Jamfile.v2 @@ -15,8 +15,7 @@ test-suite boost-geometry-geometries [ 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 diff --git a/test/geometries/adapted.cpp b/test/geometries/adapted.cpp index 6ce4ddf98..973257ee9 100644 --- a/test/geometries/adapted.cpp +++ b/test/geometries/adapted.cpp @@ -46,11 +46,14 @@ #include -#include +#include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian) + + // ---------------------------------------------------------------------------- template diff --git a/test/geometries/boost_array_as_point.cpp b/test/geometries/boost_array_as_point.cpp index a74e4815c..ac2eb0840 100644 --- a/test/geometries/boost_array_as_point.cpp +++ b/test/geometries/boost_array_as_point.cpp @@ -14,9 +14,11 @@ #include #include #include -#include +#include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + int test_main(int, char* []) { diff --git a/test/geometries/boost_fusion.cpp b/test/geometries/boost_fusion.cpp index 6ed8fd056..9035599ba 100644 --- a/test/geometries/boost_fusion.cpp +++ b/test/geometries/boost_fusion.cpp @@ -16,9 +16,12 @@ #include #include #include -#include +#include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + + struct for_fusion_2d { float x,y; diff --git a/test/geometries/boost_tuple_cartesian.cpp b/test/geometries/boost_tuple.cpp similarity index 88% rename from test/geometries/boost_tuple_cartesian.cpp rename to test/geometries/boost_tuple.cpp index d72494b69..281d73b56 100644 --- a/test/geometries/boost_tuple_cartesian.cpp +++ b/test/geometries/boost_tuple.cpp @@ -10,12 +10,16 @@ #include #include -#include +#include #include #include #include + +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian) + + template void test_all() { diff --git a/test/geometries/boost_tuple_geographic.cpp b/test/geometries/boost_tuple_geographic.cpp deleted file mode 100644 index 579c5d497..000000000 --- a/test/geometries/boost_tuple_geographic.cpp +++ /dev/null @@ -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 -#include -#include -#include -#include - -#include - -template -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 >(); - test_all >(); - test_all >(); - test_all >(); - test_all >(); - - return 0; -} diff --git a/test/geometries/box.cpp b/test/geometries/box.cpp index 44a9a012f..f640592b2 100644 --- a/test/geometries/box.cpp +++ b/test/geometries/box.cpp @@ -21,9 +21,11 @@ #include #include #include -#include +#include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template bg::model::box

create_box() diff --git a/test/geometries/custom_linestring.cpp b/test/geometries/custom_linestring.cpp index 7596a7d9f..2bdf70c77 100644 --- a/test/geometries/custom_linestring.cpp +++ b/test/geometries/custom_linestring.cpp @@ -28,9 +28,11 @@ #include #include #include -#include +#include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian) + //#define TEST_FAIL_CLEAR //#define TEST_FAIL_APPEND diff --git a/test/geometries/segment.cpp b/test/geometries/segment.cpp index 9845021d4..0b2ff245f 100644 --- a/test/geometries/segment.cpp +++ b/test/geometries/segment.cpp @@ -23,7 +23,7 @@ #include -#include +#include #include @@ -31,6 +31,8 @@ #include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template void test_all() diff --git a/test/multi/algorithms/multi_distance.cpp b/test/multi/algorithms/multi_distance.cpp index 2eedc5690..51edb8dcc 100644 --- a/test/multi/algorithms/multi_distance.cpp +++ b/test/multi/algorithms/multi_distance.cpp @@ -24,9 +24,11 @@ #include #include -#include +#include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template void test_distance(std::string const& wkt1, std::string const& wkt2, double expected) diff --git a/test/multi/algorithms/multi_envelope.cpp b/test/multi/algorithms/multi_envelope.cpp index 0d033b7d6..2ebec5fed 100644 --- a/test/multi/algorithms/multi_envelope.cpp +++ b/test/multi/algorithms/multi_envelope.cpp @@ -25,10 +25,10 @@ #include #include -#include +#include #include - +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); template diff --git a/test/policies/compare.cpp b/test/policies/compare.cpp index a1e406173..57ed8ab41 100644 --- a/test/policies/compare.cpp +++ b/test/policies/compare.cpp @@ -20,10 +20,12 @@ #include #include -#include +#include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template inline std::string coordinates(Container const& points) diff --git a/test/strategies/projected_point.cpp b/test/strategies/projected_point.cpp index 7ad1e91fb..bfbe5f6e1 100644 --- a/test/strategies/projected_point.cpp +++ b/test/strategies/projected_point.cpp @@ -23,13 +23,14 @@ #include #include -#include +#include #include #ifdef HAVE_TTMATH # include #endif +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); template diff --git a/test/strategies/pythagoras.cpp b/test/strategies/pythagoras.cpp index 204386422..b3d39c363 100644 --- a/test/strategies/pythagoras.cpp +++ b/test/strategies/pythagoras.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include @@ -39,6 +39,7 @@ # include #endif +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); template diff --git a/test/strategies/segment_intersection.cpp b/test/strategies/segment_intersection.cpp index cbf40f278..d68b6ee5c 100644 --- a/test/strategies/segment_intersection.cpp +++ b/test/strategies/segment_intersection.cpp @@ -38,8 +38,9 @@ #include #include -#include +#include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); template diff --git a/test/strategies/transformer.cpp b/test/strategies/transformer.cpp index 3826ce823..7efec562c 100644 --- a/test/strategies/transformer.cpp +++ b/test/strategies/transformer.cpp @@ -25,9 +25,9 @@ #include #include -#include - +#include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); template diff --git a/test/util/for_each_coordinate.cpp b/test/util/for_each_coordinate.cpp index 993c6a4d1..07c85736f 100644 --- a/test/util/for_each_coordinate.cpp +++ b/test/util/for_each_coordinate.cpp @@ -24,9 +24,11 @@ #include #include -#include +#include #include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + struct test_operation { diff --git a/test/views/closeable_view.cpp b/test/views/closeable_view.cpp index 29b626349..991836eac 100644 --- a/test/views/closeable_view.cpp +++ b/test/views/closeable_view.cpp @@ -19,8 +19,9 @@ #include #include #include -#include +#include +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); diff --git a/test/views/reversible_closeable.cpp b/test/views/reversible_closeable.cpp index 4dedb4cd5..87e0dc38d 100644 --- a/test/views/reversible_closeable.cpp +++ b/test/views/reversible_closeable.cpp @@ -21,7 +21,9 @@ #include #include #include -#include +#include + +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); template diff --git a/test/views/reversible_view.cpp b/test/views/reversible_view.cpp index 865c3063f..42ae5c339 100644 --- a/test/views/reversible_view.cpp +++ b/test/views/reversible_view.cpp @@ -19,7 +19,10 @@ #include #include #include -#include +#include + +BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian); + template void test_forward_or_reverse(Range const& range, std::string const& expected)