|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r59786 - in sandbox/geometry/libs/geometry/test: . algorithms algorithms/overlay algorithms/overlay/robustness arithmetic core extensions/algorithms extensions/gis/io/wkt extensions/gis/latlong extensions/gis/projections extensions/nsphere geometries iterators multi/algorithms multi/algorithms/overlay point_concept policies strategies test_common util
From: barend.gehrels_at_[hidden]
Date: 2010-02-20 11:58:49
Author: barendgehrels
Date: 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
New Revision: 59786
URL: http://svn.boost.org/trac/boost/changeset/59786
Log:
Renamed GGL/Geometry in some testfiles
Added:
sandbox/geometry/libs/geometry/test/geometry_test_common.hpp
- copied unchanged from r59784, /sandbox/geometry/libs/geometry/test/ggl_test_common.hpp
Removed:
sandbox/geometry/libs/geometry/test/ggl_test_common.hpp
Text files modified:
sandbox/geometry/libs/geometry/test/algorithms/append.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/area.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/assign.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/buffer.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/convert.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/correct.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/disjoint.cpp | 6 ++--
sandbox/geometry/libs/geometry/test/algorithms/distance.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/intersection_segment.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/is_convex.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/make.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/overlay/assemble.cpp | 20 ++++++++--------
sandbox/geometry/libs/geometry/test/algorithms/overlay/dissolve.cpp | 8 +++---
sandbox/geometry/libs/geometry/test/algorithms/overlay/enrich_intersection_points.cpp | 4 +-
sandbox/geometry/libs/geometry/test/algorithms/overlay/get_turn_info.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/overlay/get_turns.cpp | 4 +-
sandbox/geometry/libs/geometry/test/algorithms/overlay/overlay_cases.hpp | 20 ++++++++--------
sandbox/geometry/libs/geometry/test/algorithms/overlay/relative_order.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/intersection_pies.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/recursive_boxes.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/test_overlay_p_q.hpp | 10 ++++----
sandbox/geometry/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp | 8 +++---
sandbox/geometry/libs/geometry/test/algorithms/overlay/traverse.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp | 4 +-
sandbox/geometry/libs/geometry/test/algorithms/sectionalize.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/test_area.hpp | 4 +-
sandbox/geometry/libs/geometry/test/algorithms/test_centroid.hpp | 2
sandbox/geometry/libs/geometry/test/algorithms/test_combine.hpp | 2
sandbox/geometry/libs/geometry/test/algorithms/test_convex_hull.hpp | 2
sandbox/geometry/libs/geometry/test/algorithms/test_envelope.hpp | 2
sandbox/geometry/libs/geometry/test/algorithms/test_equals.hpp | 2
sandbox/geometry/libs/geometry/test/algorithms/test_for_each.hpp | 2
sandbox/geometry/libs/geometry/test/algorithms/test_intersection.hpp | 2
sandbox/geometry/libs/geometry/test/algorithms/test_intersects.hpp | 2
sandbox/geometry/libs/geometry/test/algorithms/test_length.hpp | 4 +-
sandbox/geometry/libs/geometry/test/algorithms/test_overlaps.hpp | 2
sandbox/geometry/libs/geometry/test/algorithms/test_perimeter.hpp | 4 +-
sandbox/geometry/libs/geometry/test/algorithms/test_simplify.hpp | 2
sandbox/geometry/libs/geometry/test/algorithms/test_union.hpp | 2
sandbox/geometry/libs/geometry/test/algorithms/test_within.hpp | 2
sandbox/geometry/libs/geometry/test/algorithms/transform.cpp | 2
sandbox/geometry/libs/geometry/test/arithmetic/arithmetic.cpp | 2
sandbox/geometry/libs/geometry/test/arithmetic/cross_product.cpp | 4 +-
sandbox/geometry/libs/geometry/test/arithmetic/dot_product.cpp | 2
sandbox/geometry/libs/geometry/test/core/access.cpp | 2
sandbox/geometry/libs/geometry/test/core/coordinate_dimension.cpp | 2
sandbox/geometry/libs/geometry/test/core/coordinate_system.cpp | 2
sandbox/geometry/libs/geometry/test/core/coordinate_type.cpp | 2
sandbox/geometry/libs/geometry/test/core/geometry_id.cpp | 2
sandbox/geometry/libs/geometry/test/core/point_type.cpp | 2
sandbox/geometry/libs/geometry/test/core/radian_access.cpp | 2
sandbox/geometry/libs/geometry/test/core/reverse_dispatch.cpp | 2
sandbox/geometry/libs/geometry/test/core/ring.cpp | 2
sandbox/geometry/libs/geometry/test/core/tag.cpp | 2
sandbox/geometry/libs/geometry/test/core/topological_dimension.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/algorithms/midpoints.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_holes_if.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/algorithms/selected.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/multi_wkt.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/wkt.cpp | 4 +-
sandbox/geometry/libs/geometry/test/extensions/gis/latlong/andoyer.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/gis/latlong/area_ll.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/gis/latlong/distance_mixed.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/gis/latlong/parse.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/gis/latlong/parse_dms.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/gis/latlong/point_ll.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection_epsg.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/gis/projections/projections.cpp | 5 +++
sandbox/geometry/libs/geometry/test/extensions/nsphere/access.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/nsphere/area.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/nsphere/circle.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/nsphere/multi_within.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/nsphere/point_type.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/nsphere/within.cpp | 2
sandbox/geometry/libs/geometry/test/geometries/adapted.cpp | 2
sandbox/geometry/libs/geometry/test/geometries/box.cpp | 2
sandbox/geometry/libs/geometry/test/geometries/custom_linestring.cpp | 2
sandbox/geometry/libs/geometry/test/geometries/segment.cpp | 2
sandbox/geometry/libs/geometry/test/iterators/circular_iterator.cpp | 2
sandbox/geometry/libs/geometry/test/iterators/ever_circling_iterator.cpp | 2
sandbox/geometry/libs/geometry/test/iterators/segment_iterator.cpp | 2
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_correct.cpp | 2
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_distance.cpp | 2
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_for_each.cpp | 2
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_perimeter.cpp | 2
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_simplify.cpp | 2
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_within.cpp | 2
sandbox/geometry/libs/geometry/test/multi/algorithms/overlay/multi_overlay_common.hpp | 6 ++--
sandbox/geometry/libs/geometry/test/multi/algorithms/overlay/multi_svg_mapper.hpp | 6 ++--
sandbox/geometry/libs/geometry/test/point_concept/function_asserting_a_point.hpp | 6 ++--
sandbox/geometry/libs/geometry/test/point_concept/function_requiring_a_point.hpp | 6 ++--
sandbox/geometry/libs/geometry/test/policies/compare.cpp | 2
sandbox/geometry/libs/geometry/test/strategies/cross_track.cpp | 2
sandbox/geometry/libs/geometry/test/strategies/haversine.cpp | 2
sandbox/geometry/libs/geometry/test/strategies/projected_point.cpp | 2
sandbox/geometry/libs/geometry/test/strategies/pythagoras.cpp | 2
sandbox/geometry/libs/geometry/test/strategies/segment_intersection.cpp | 2
sandbox/geometry/libs/geometry/test/strategies/segment_intersection_collinear.cpp | 46 ++++++++++++++++++++--------------------
sandbox/geometry/libs/geometry/test/strategies/side_by_cross_track.cpp | 2
sandbox/geometry/libs/geometry/test/strategies/transformer.cpp | 2
sandbox/geometry/libs/geometry/test/test_common/test_point.hpp | 6 ++--
sandbox/geometry/libs/geometry/test/test_common/with_pointer.hpp | 6 ++--
sandbox/geometry/libs/geometry/test/util/as_range.cpp | 2
sandbox/geometry/libs/geometry/test/util/copy.cpp | 2
sandbox/geometry/libs/geometry/test/util/for_each_coordinate.cpp | 2
sandbox/geometry/libs/geometry/test/util/select_most_precise.cpp | 2
sandbox/geometry/libs/geometry/test/util/write_dsv.cpp | 4 +-
109 files changed, 185 insertions(+), 182 deletions(-)
Modified: sandbox/geometry/libs/geometry/test/algorithms/append.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/append.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/append.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -10,7 +10,7 @@
#include <vector>
#include <boost/concept/requires.hpp>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/core/access.hpp>
#include <boost/geometry/algorithms/make.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/area.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/area.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/area.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -14,7 +14,7 @@
#include <boost/geometry/geometries/linear_ring.hpp>
#include <boost/geometry/geometries/polygon.hpp>
-//#define GGL_TEST_DEBUG
+//#define GEOMETRY_TEST_DEBUG
Modified: sandbox/geometry/libs/geometry/test/algorithms/assign.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/assign.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/assign.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -6,7 +6,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/assign.hpp>
#include <boost/geometry/algorithms/num_points.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/buffer.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/buffer.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/buffer.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/buffer.hpp>
#include <boost/geometry/core/coordinate_type.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/convert.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/convert.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/convert.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -6,7 +6,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/assign.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/correct.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/correct.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/correct.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -8,7 +8,7 @@
#include <sstream>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/correct.hpp>
#include <boost/geometry/strategies/strategies.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/disjoint.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/disjoint.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/disjoint.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -10,7 +10,7 @@
#include <string>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/disjoint.hpp>
#include <boost/geometry/geometries/geometries.hpp>
@@ -24,8 +24,8 @@
template <typename G1, typename G2>
-void test_disjoint(std::string const& id,
- std::string const& wkt1,
+void test_disjoint(std::string const& id,
+ std::string const& wkt1,
std::string const& wkt2, bool expected)
{
G1 g1;
Modified: sandbox/geometry/libs/geometry/test/algorithms/distance.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/distance.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/distance.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -11,7 +11,7 @@
#include <sstream>
#include <boost/mpl/if.hpp>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/distance.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/intersection_segment.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/intersection_segment.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/intersection_segment.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -13,7 +13,7 @@
#include <vector>
#include <boost/config.hpp>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/correct.hpp>
#include <boost/geometry/algorithms/within.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/is_convex.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/is_convex.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/is_convex.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -10,7 +10,7 @@
#include <string>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/convex_hull.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/make.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/make.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/make.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/make.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/assemble.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/assemble.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/assemble.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -10,7 +10,7 @@
#include <string>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/foreach.hpp>
@@ -61,7 +61,7 @@
BOOST_CHECK_CLOSE(diff, 0.0, 0.0001);
if (abs(diff) > 0.001)
{
- std::cout
+ std::cout
<< id << std::endl
<< bg::wkt(p) << std::endl
<< bg::wkt(q) << std::endl;
@@ -80,12 +80,12 @@
mapper.map(q, "fill-opacity:0.6;stroke-opacity:0.9;fill:rgb(0,255,0);stroke:rgb(0,255,0);stroke-width:2");
BOOST_FOREACH(Geometry const& geometry, u)
{
- mapper.map(geometry,
+ mapper.map(geometry,
"stroke-opacity:0.6;fill:none;stroke:rgb(255,0,255);stroke-width:5");
}
BOOST_FOREACH(Geometry const& geometry, i)
{
- mapper.map(geometry,
+ mapper.map(geometry,
"stroke-opacity:0.6;fill:none;stroke:rgb(255,0,0);stroke-width:5");
}
}
@@ -97,7 +97,7 @@
{
namespace bg = boost::geometry;
- typename bg::point_type<Polygon>::type const& pi =
+ typename bg::point_type<Polygon>::type const& pi =
bg::interior_rings(poly)[0].front();
return bg::within(pi, bg::exterior_ring(poly));
@@ -132,21 +132,21 @@
std::string ps = "POLYGON(" + exteriors[pe] + "," + interiors[pi] + ")";
std::string qs = "POLYGON(" + exteriors[qe] + "," + interiors[qi] + ")";
- bg::polygon_2d p, q;
+ bg::polygon_2d p, q;
bg::read_wkt(ps, p);
bg::read_wkt(qs, q);
bg::correct(p);
bg::correct(q);
- if (! intersects(p)
+ if (! intersects(p)
&& ! intersects(q)
- && int_ok(p)
+ && int_ok(p)
&& int_ok(q)
)
{
std::ostringstream out;
out << pe << qe << pi << qi;
test_assemble(out.str(), p, q);
-
+
}
}
}
@@ -155,7 +155,7 @@
}
-#if ! defined(GGL_TEST_MULTI)
+#if ! defined(GEOMETRY_TEST_MULTI)
int test_main(int, char* [])
{
generate();
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/dissolve.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/dissolve.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/dissolve.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -10,7 +10,7 @@
#include <string>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/foreach.hpp>
@@ -75,14 +75,14 @@
std::string caseid = id;
-//#ifdef GGL_DEBUG_INTERSECTION
+//#ifdef GEOMETRY_DEBUG_INTERSECTION
std::cout << std::endl << std::endl << "# " << caseid << std::endl;
//#endif
test_dissolve(caseid, expected_count, expected_area, geometry, precision);
}
-#if ! defined(GGL_TEST_MULTI)
+#if ! defined(GEOMETRY_TEST_MULTI)
template <typename P>
void test_all()
@@ -172,7 +172,7 @@
-#if ! defined(GGL_TEST_MULTI)
+#if ! defined(GEOMETRY_TEST_MULTI)
int test_main(int, char* [])
{
test_all<boost::geometry::point_xy<double> >();
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/enrich_intersection_points.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/enrich_intersection_points.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/enrich_intersection_points.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -8,7 +8,7 @@
#include <iostream>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/intersection.hpp>
@@ -18,7 +18,7 @@
#include <boost/geometry/strategies/strategies.hpp>
-#define GGL_TEST_OVERLAY_NOT_REVERSED
+#define GEOMETRY_TEST_OVERLAY_NOT_REVERSED
#include <overlay_common.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/get_turn_info.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/get_turn_info.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/get_turn_info.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
#include <iostream>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/foreach.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/get_turns.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/get_turns.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/get_turns.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -9,7 +9,7 @@
#include <iostream>
#include <iomanip>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
@@ -138,7 +138,7 @@
};
-#if ! defined(GGL_TEST_MULTI)
+#if ! defined(GEOMETRY_TEST_MULTI)
template <typename T>
void test_all()
{
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/overlay_cases.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/overlay_cases.hpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/overlay_cases.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -210,12 +210,12 @@
// 50, collinear opposite
static std::string case_50[2] = {
- "POLYGON((0 0,0 3,2 3,4 3,4 0,0 0))",
+ "POLYGON((0 0,0 3,2 3,4 3,4 0,0 0))",
"POLYGON((0 3,0 5,5 5,5 0,4 0,4 3,2 3,0 3))" };
// 51, fit
static std::string case_51[2] = {
- "POLYGON((0 0,0 5,5 5,5 0,0 0),(4 1,3 4,1 2,4 1))",
+ "POLYGON((0 0,0 5,5 5,5 0,0 0),(4 1,3 4,1 2,4 1))",
"POLYGON((1 2,3 4,4 1,1 2))" };
// 52, partially equal, touching each other
@@ -223,28 +223,28 @@
"POLYGON((0 0,1 4,3 1,4 4,1 4,5 5,5 0,0 0))",
"POLYGON((0 0,1 4,3 1,4 4,1 4,5 5,4 1,0 0))" };
-// 53, wrapping a box, self-touching
+// 53, wrapping a box, self-touching
static std::string case_53[3] = {
"POLYGON((2 2,2 3,3 3,3 2,2 2))",
// a: self-tangent ext. ring, ST_IsValid=false
- "POLYGON((0 2,0 5,5 5,5 0,2 0,2 2,3 2,3 1,4 1,4 4,1 4,1 3,2 3,2 2,0 2))",
+ "POLYGON((0 2,0 5,5 5,5 0,2 0,2 2,3 2,3 1,4 1,4 4,1 4,1 3,2 3,2 2,0 2))",
// b: tangent ext/int ring, ST_IsValid=true
- "POLYGON((0 2,0 5,5 5,5 0,2 0,2 2,0 2),(1 3,2 3,2 2,3 2,3 1,4 1,4 4,1 4,1 3))"
+ "POLYGON((0 2,0 5,5 5,5 0,2 0,2 2,0 2),(1 3,2 3,2 2,3 2,3 1,4 1,4 4,1 4,1 3))"
};
static std::string case_54[4] = {
// a: self-tangent ext. ring
- "POLYGON((2 2,2 3,4 3,4 0,1 0,1 2,2 2,2 1,3 1,3 2,2 2))",
+ "POLYGON((2 2,2 3,4 3,4 0,1 0,1 2,2 2,2 1,3 1,3 2,2 2))",
// b: tangent ext/int ring
- "POLYGON((2 2,2 3,4 3,4 0,1 0,1 2,2 2),(2 1,3 1,3 2,2 2,2 1))",
+ "POLYGON((2 2,2 3,4 3,4 0,1 0,1 2,2 2),(2 1,3 1,3 2,2 2,2 1))",
case_53[1],
case_53[2]
// other like in case53
};
static std::string case_55[2] = {
- "POLYGON((2 2,3 3,4 3,4 0,1 0,1 1,2 2),(2 1,3 1,3 2,2 2,2 1))",
- "POLYGON((0 2,0 5,5 5,5 0,2 0,2 2,0 2),(1 3,2 2,3 1,4 1,4 4,1 4,1 3))"
+ "POLYGON((2 2,3 3,4 3,4 0,1 0,1 1,2 2),(2 1,3 1,3 2,2 2,2 1))",
+ "POLYGON((0 2,0 5,5 5,5 0,2 0,2 2,0 2),(1 3,2 2,3 1,4 1,4 4,1 4,1 3))"
};
@@ -319,4 +319,4 @@
};
*/
-#endif // GGL_TEST_OVERLAY_CASES_HPP
+#endif // GEOMETRY_TEST_OVERLAY_CASES_HPP
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/relative_order.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/relative_order.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/relative_order.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -8,7 +8,7 @@
#include <iostream>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/foreach.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/intersection_pies.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/intersection_pies.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/intersection_pies.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -18,7 +18,7 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <test_overlay_p_q.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -28,7 +28,7 @@
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <test_overlay_p_q.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/recursive_boxes.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/recursive_boxes.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/recursive_boxes.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -32,7 +32,7 @@
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <test_overlay_p_q.hpp>
template <typename Polygon, typename Generator>
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/test_overlay_p_q.hpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/test_overlay_p_q.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -14,7 +14,7 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
template <typename OutputType, typename CalculationType, typename G1, typename G2>
@@ -65,21 +65,21 @@
{
result = false;
svg = true;
-
+
std::cout
<< "type: " << string_from_type<CalculationType>::name()
<< " id: " << caseid
- << " area i: " << area_i
+ << " area i: " << area_i
<< " area u: " << area_u
<< " area p: " << area_p
<< " area q: " << area_q
- << " diff: " << diff
+ << " diff: " << diff
<< std::endl
<< std::setprecision(20)
<< " p: " << boost::geometry::wkt(p) << std::endl
<< " q: " << boost::geometry::wkt(q) << std::endl
;
-
+
}
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -10,7 +10,7 @@
#include <iomanip>
#include <string>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/intersection.hpp>
@@ -118,14 +118,14 @@
std::string caseid = id;
-//#ifdef GGL_DEBUG_INTERSECTION
+//#ifdef GEOMETRY_DEBUG_INTERSECTION
std::cout << std::endl << std::endl << "# " << caseid << std::endl;
//#endif
test_self_intersection_points::apply(caseid, expected, geometry, precision);
}
-#if ! defined(GGL_TEST_MULTI)
+#if ! defined(GEOMETRY_TEST_MULTI)
template <typename P>
void test_self_all()
@@ -225,7 +225,7 @@
-#if ! defined(GGL_TEST_MULTI)
+#if ! defined(GEOMETRY_TEST_MULTI)
int test_main(int, char* [])
{
test_self_all<boost::geometry::point_xy<double> >();
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/traverse.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/traverse.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/traverse.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -13,7 +13,7 @@
#include <string>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
//#define HAVE_TTMATH
#ifdef HAVE_TTMATH
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -11,7 +11,7 @@
#pragma warning( disable : 4267 )
#endif
-//#define GGL_DEBUG_INTERSECTION
+//#define GEOMETRY_DEBUG_INTERSECTION
#include <iostream>
@@ -159,7 +159,7 @@
}
-#if ! defined(GGL_TEST_MULTI)
+#if ! defined(GEOMETRY_TEST_MULTI)
template <typename P>
void test_traverse_gmp(std::string const& caseid)
Modified: sandbox/geometry/libs/geometry/test/algorithms/sectionalize.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/sectionalize.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/sectionalize.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -10,7 +10,7 @@
#include <string>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/make.hpp>
#include <boost/geometry/algorithms/sectionalize.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/test_area.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/test_area.hpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/test_area.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -9,7 +9,7 @@
#define BOOST_GEOMETRY_TEST_AREA_HPP
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/area.hpp>
#include <boost/geometry/strategies/strategies.hpp>
@@ -22,7 +22,7 @@
{
long double area = boost::geometry::area(geometry);
-#ifdef GGL_TEST_DEBUG
+#ifdef GEOMETRY_TEST_DEBUG
std::ostringstream out;
out << typeid(typename boost::geometry::coordinate_type<Geometry>::type).name()
<< " "
Modified: sandbox/geometry/libs/geometry/test/algorithms/test_centroid.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/test_centroid.hpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/test_centroid.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -10,7 +10,7 @@
// Test-functionality, shared between single and multi tests
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/algorithms/centroid.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/test_combine.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/test_combine.hpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/test_combine.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -9,7 +9,7 @@
#define BOOST_GEOMETRY_TEST_COMBINE_HPP
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/combine.hpp>
#include <boost/geometry/strategies/strategies.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/test_convex_hull.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/test_convex_hull.hpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/test_convex_hull.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -8,7 +8,7 @@
#ifndef BOOST_GEOMETRY_TEST_CONVEX_HULL_HPP
#define BOOST_GEOMETRY_TEST_CONVEX_HULL_HPP
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/convex_hull.hpp>
#include <boost/geometry/algorithms/area.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/test_envelope.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/test_envelope.hpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/test_envelope.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -9,7 +9,7 @@
#define BOOST_GEOMETRY_TEST_ENVELOPE_HPP
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/envelope.hpp>
#include <boost/geometry/geometries/box.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/test_equals.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/test_equals.hpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/test_equals.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -9,7 +9,7 @@
#define BOOST_GEOMETRY_TEST_EQUALS_HPP
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/core/ring_type.hpp>
#include <boost/geometry/algorithms/equals.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/test_for_each.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/test_for_each.hpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/test_for_each.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -8,7 +8,7 @@
#ifndef BOOST_GEOMETRY_TEST_FOR_EACH_HPP
#define BOOST_GEOMETRY_TEST_FOR_EACH_HPP
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/for_each.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/test_intersection.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/test_intersection.hpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/test_intersection.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -12,7 +12,7 @@
#include <iomanip>
#include <boost/foreach.hpp>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/intersection.hpp>
#include <boost/geometry/algorithms/area.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/test_intersects.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/test_intersects.hpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/test_intersects.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -9,7 +9,7 @@
#define BOOST_GEOMETRY_TEST_INTERSECTS_HPP
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/core/ring_type.hpp>
#include <boost/geometry/algorithms/intersects.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/test_length.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/test_length.hpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/test_length.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -8,7 +8,7 @@
#ifndef BOOST_GEOMETRY_TEST_LENGTH_HPP
#define BOOST_GEOMETRY_TEST_LENGTH_HPP
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/length.hpp>
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
@@ -20,7 +20,7 @@
{
long double length = boost::geometry::length(geometry);
-#ifdef GGL_TEST_DEBUG
+#ifdef GEOMETRY_TEST_DEBUG
std::ostringstream out;
out << typeid(typename boost::geometry::coordinate_type<Geometry>::type).name()
<< std::endl
Modified: sandbox/geometry/libs/geometry/test/algorithms/test_overlaps.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/test_overlaps.hpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/test_overlaps.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -9,7 +9,7 @@
#define BOOST_GEOMETRY_TEST_OVERLAPS_HPP
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/core/ring_type.hpp>
#include <boost/geometry/algorithms/overlaps.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/test_perimeter.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/test_perimeter.hpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/test_perimeter.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -9,7 +9,7 @@
#define BOOST_GEOMETRY_TEST_PERIMETER_HPP
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/perimeter.hpp>
#include <boost/geometry/strategies/strategies.hpp>
@@ -23,7 +23,7 @@
{
long double perimeter = boost::geometry::perimeter(geometry);
-#ifdef GGL_TEST_DEBUG
+#ifdef GEOMETRY_TEST_DEBUG
std::ostringstream out;
out << typeid(typename boost::geometry::coordinate_type<Geometry>::type).name()
<< std::endl
Modified: sandbox/geometry/libs/geometry/test/algorithms/test_simplify.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/test_simplify.hpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/test_simplify.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -10,7 +10,7 @@
// Test-functionality, shared between single and multi tests
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/simplify.hpp>
#include <boost/geometry/algorithms/distance.hpp>
#include <boost/geometry/strategies/strategies.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/test_union.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/test_union.hpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/test_union.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -10,7 +10,7 @@
#include <fstream>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/union.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/test_within.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/test_within.hpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/test_within.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -9,7 +9,7 @@
#define BOOST_GEOMETRY_TEST_WITHIN_HPP
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/core/ring_type.hpp>
#include <boost/geometry/algorithms/within.hpp>
Modified: sandbox/geometry/libs/geometry/test/algorithms/transform.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/transform.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/transform.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -10,7 +10,7 @@
#include <sstream>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/make.hpp>
#include <boost/geometry/algorithms/transform.hpp>
Modified: sandbox/geometry/libs/geometry/test/arithmetic/arithmetic.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/arithmetic/arithmetic.cpp (original)
+++ sandbox/geometry/libs/geometry/test/arithmetic/arithmetic.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/arithmetic/arithmetic.hpp>
Modified: sandbox/geometry/libs/geometry/test/arithmetic/cross_product.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/arithmetic/cross_product.cpp (original)
+++ sandbox/geometry/libs/geometry/test/arithmetic/cross_product.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/arithmetic/cross_product.hpp>
@@ -40,7 +40,7 @@
P p2;
boost::geometry::assign(p2, 45, 70, 20);
P c = boost::geometry::cross_product(p1, p2);
-
+
typedef typename boost::geometry::coordinate_type<P>::type scalar_type;
BOOST_CHECK_EQUAL(boost::geometry::get<0>(c), scalar_type(-100));
BOOST_CHECK_EQUAL(boost::geometry::get<1>(c), scalar_type(50));
Modified: sandbox/geometry/libs/geometry/test/arithmetic/dot_product.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/arithmetic/dot_product.cpp (original)
+++ sandbox/geometry/libs/geometry/test/arithmetic/dot_product.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/arithmetic/dot_product.hpp>
Modified: sandbox/geometry/libs/geometry/test/core/access.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/core/access.cpp (original)
+++ sandbox/geometry/libs/geometry/test/core/access.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/core/access.hpp>
Modified: sandbox/geometry/libs/geometry/test/core/coordinate_dimension.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/core/coordinate_dimension.cpp (original)
+++ sandbox/geometry/libs/geometry/test/core/coordinate_dimension.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/core/coordinate_dimension.hpp>
Modified: sandbox/geometry/libs/geometry/test/core/coordinate_system.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/core/coordinate_system.cpp (original)
+++ sandbox/geometry/libs/geometry/test/core/coordinate_system.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/core/coordinate_system.hpp>
Modified: sandbox/geometry/libs/geometry/test/core/coordinate_type.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/core/coordinate_type.cpp (original)
+++ sandbox/geometry/libs/geometry/test/core/coordinate_type.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/core/coordinate_type.hpp>
Modified: sandbox/geometry/libs/geometry/test/core/geometry_id.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/core/geometry_id.cpp (original)
+++ sandbox/geometry/libs/geometry/test/core/geometry_id.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/core/geometry_id.hpp>
Modified: sandbox/geometry/libs/geometry/test/core/point_type.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/core/point_type.cpp (original)
+++ sandbox/geometry/libs/geometry/test/core/point_type.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/core/tag.hpp>
Modified: sandbox/geometry/libs/geometry/test/core/radian_access.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/core/radian_access.cpp (original)
+++ sandbox/geometry/libs/geometry/test/core/radian_access.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/core/radian_access.hpp>
Modified: sandbox/geometry/libs/geometry/test/core/reverse_dispatch.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/core/reverse_dispatch.cpp (original)
+++ sandbox/geometry/libs/geometry/test/core/reverse_dispatch.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/core/reverse_dispatch.hpp>
Modified: sandbox/geometry/libs/geometry/test/core/ring.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/core/ring.cpp (original)
+++ sandbox/geometry/libs/geometry/test/core/ring.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
// To be tested:
Modified: sandbox/geometry/libs/geometry/test/core/tag.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/core/tag.cpp (original)
+++ sandbox/geometry/libs/geometry/test/core/tag.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/core/tag.hpp>
Modified: sandbox/geometry/libs/geometry/test/core/topological_dimension.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/core/topological_dimension.cpp (original)
+++ sandbox/geometry/libs/geometry/test/core/topological_dimension.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/core/topological_dimension.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/algorithms/midpoints.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/algorithms/midpoints.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/algorithms/midpoints.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -11,7 +11,7 @@
#include <string>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/extensions/algorithms/midpoints.hpp>
#include <boost/geometry/algorithms/make.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_holes_if.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_holes_if.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_holes_if.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -11,7 +11,7 @@
#include <string>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/num_points.hpp>
#include <boost/geometry/extensions/algorithms/remove_holes_if.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/algorithms/selected.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/algorithms/selected.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/algorithms/selected.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -13,7 +13,7 @@
#include <string>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/extensions/algorithms/selected.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/multi_wkt.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/multi_wkt.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/multi_wkt.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -38,7 +38,7 @@
// Include the single test
-#define GGL_TEST_MULTI
+#define GEOMETRY_TEST_MULTI
#include "extensions/gis/io/wkt/wkt.cpp"
Modified: sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/wkt.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/wkt.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/wkt.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -12,7 +12,7 @@
#include <boost/algorithm/string.hpp>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/geometries/geometries.hpp>
@@ -114,7 +114,7 @@
}
-#ifndef GGL_TEST_MULTI
+#ifndef GEOMETRY_TEST_MULTI
template <typename T>
void test_all()
{
Modified: sandbox/geometry/libs/geometry/test/extensions/gis/latlong/andoyer.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/latlong/andoyer.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/latlong/andoyer.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/gis/latlong/area_ll.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/latlong/area_ll.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/latlong/area_ll.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -6,7 +6,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/area.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/gis/latlong/distance_mixed.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/latlong/distance_mixed.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/latlong/distance_mixed.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/geometry/algorithms/assign.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/gis/latlong/parse.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/latlong/parse.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/latlong/parse.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -9,7 +9,7 @@
#include <string>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/parse.hpp>
#include <boost/geometry/geometries/point.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/gis/latlong/parse_dms.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/latlong/parse_dms.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/latlong/parse_dms.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -8,7 +8,7 @@
#include <string>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/strategies/strategies.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/gis/latlong/point_ll.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/latlong/point_ll.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/latlong/point_ll.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/transform.hpp>
#include <boost/geometry/extensions/gis/io/wkt/stream_wkt.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -15,7 +15,7 @@
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/extensions/gis/projections/parameters.hpp>
#include <boost/geometry/extensions/gis/projections/projection.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection_epsg.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection_epsg.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection_epsg.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -14,7 +14,7 @@
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/extensions/gis/projections/parameters.hpp>
#include <boost/geometry/extensions/gis/projections/projection.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/gis/projections/projections.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/projections/projections.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/projections/projections.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -6,6 +6,9 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
+ // WARNING: this file takes several minutes to quarters to compile on GCC
+
+
#if defined(_MSC_VER)
#pragma warning( disable : 4305 ) // truncation double -> float
#pragma warning( disable : 4244 ) // loss of data
@@ -15,7 +18,7 @@
#include <sstream>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/extensions/gis/projections/parameters.hpp>
#include <boost/geometry/extensions/gis/projections/projection.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/nsphere/access.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/nsphere/access.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/nsphere/access.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/extensions/nsphere/core/access.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/nsphere/area.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/nsphere/area.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/nsphere/area.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -5,7 +5,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/extensions/nsphere/algorithms/area.hpp>
#include <boost/geometry/extensions/nsphere/geometries/nsphere.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/nsphere/circle.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/nsphere/circle.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/nsphere/circle.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -13,7 +13,7 @@
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/extensions/nsphere/core/access.hpp>
#include <boost/geometry/extensions/nsphere/geometries/concepts/nsphere_concept.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/nsphere/multi_within.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/nsphere/multi_within.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/nsphere/multi_within.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -5,7 +5,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/correct.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/nsphere/point_type.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/nsphere/point_type.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/nsphere/point_type.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/core/tag.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/nsphere/within.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/nsphere/within.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/nsphere/within.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -5,7 +5,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/extensions/nsphere/nsphere.hpp>
Modified: sandbox/geometry/libs/geometry/test/geometries/adapted.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/geometries/adapted.cpp (original)
+++ sandbox/geometry/libs/geometry/test/geometries/adapted.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -8,7 +8,7 @@
#include <deque>
#include <vector>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/multi/multi.hpp>
Modified: sandbox/geometry/libs/geometry/test/geometries/box.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/geometries/box.cpp (original)
+++ sandbox/geometry/libs/geometry/test/geometries/box.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/make.hpp>
Modified: sandbox/geometry/libs/geometry/test/geometries/custom_linestring.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/geometries/custom_linestring.cpp (original)
+++ sandbox/geometry/libs/geometry/test/geometries/custom_linestring.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -9,7 +9,7 @@
#include <deque>
#include <vector>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/append.hpp>
#include <boost/geometry/algorithms/clear.hpp>
Modified: sandbox/geometry/libs/geometry/test/geometries/segment.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/geometries/segment.cpp (original)
+++ sandbox/geometry/libs/geometry/test/geometries/segment.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -8,7 +8,7 @@
#include <iostream>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/geometries/concepts/segment_concept.hpp>
Deleted: sandbox/geometry/libs/geometry/test/ggl_test_common.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/ggl_test_common.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
+++ (empty file)
@@ -1,71 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
-// 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 GEOMETRY_TEST_GEOMETRY_TEST_COMMON_HPP
-#define GEOMETRY_TEST_GEOMETRY_TEST_COMMON_HPP
-
-#if defined(_MSC_VER)
-// We deliberately mix float/double's so turn off warnings
-#pragma warning( disable : 4244 )
-// For (new since Boost 1.40) warning in Boost.Test on putenv/posix
-#pragma warning( disable : 4996 )
-
-//#pragma warning( disable : 4305 )
-#endif // defined(_MSC_VER)
-
-#include <boost/foreach.hpp>
-
-
-// Include some always-included-for-testing files
-#if ! defined(BOOST_GEOMETRY_NO_BOOST_TEST)
-# include <boost/test/floating_point_comparison.hpp>
-# include <boost/test/included/test_exec_monitor.hpp>
-#endif
-
-
-#if defined(HAVE_CLN) || defined(HAVE_GMP)
-# include <boost/numeric_adaptor/numeric_adaptor.hpp>
-#endif
-
-
-#if defined(HAVE_GMP)
-# include <boost/numeric_adaptor/gmp_value_type.hpp>
-#endif
-#if defined(HAVE_CLN)
-# include <boost/numeric_adaptor/cln_value_type.hpp>
-#endif
-
-template <typename T>
-struct string_from_type {};
-
-template <> struct string_from_type<void>
-{ static std::string name() { return "v"; } };
-
-template <> struct string_from_type<float>
-{ static std::string name() { return "f"; } };
-
-template <> struct string_from_type<double>
-{ static std::string name() { return "d"; } };
-
-template <> struct string_from_type<long double>
-{ static std::string name() { return "e"; } };
-
-#if defined(HAVE_GMP)
- template <> struct string_from_type<boost::numeric_adaptor::gmp_value_type>
- { static std::string name() { return "g"; } };
-#endif
-
-#if defined(HAVE_CLN)
- template <> struct string_from_type<boost::numeric_adaptor::cln_value_type>
- { static std::string name() { return "c"; } };
-#endif
-
-
-
-#endif // GEOMETRY_TEST_GEOMETRY_TEST_COMMON_HPP
Modified: sandbox/geometry/libs/geometry/test/iterators/circular_iterator.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/iterators/circular_iterator.cpp (original)
+++ sandbox/geometry/libs/geometry/test/iterators/circular_iterator.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -11,7 +11,7 @@
#include <sstream>
#include <string>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/iterators/circular_iterator.hpp>
Modified: sandbox/geometry/libs/geometry/test/iterators/ever_circling_iterator.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/iterators/ever_circling_iterator.cpp (original)
+++ sandbox/geometry/libs/geometry/test/iterators/ever_circling_iterator.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -9,7 +9,7 @@
#include <sstream>
#include <string>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/iterators/ever_circling_iterator.hpp>
Modified: sandbox/geometry/libs/geometry/test/iterators/segment_iterator.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/iterators/segment_iterator.cpp (original)
+++ sandbox/geometry/libs/geometry/test/iterators/segment_iterator.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -13,7 +13,7 @@
#include <string>
#include <vector>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/core/coordinate_type.hpp>
#include <boost/geometry/geometries/cartesian2d.hpp>
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_correct.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_correct.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_correct.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -5,7 +5,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/correct.hpp>
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_distance.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_distance.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_distance.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -8,7 +8,7 @@
#include <string>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/distance.hpp>
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_for_each.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_for_each.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_for_each.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -5,7 +5,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/for_each.hpp>
#include <boost/geometry/multi/algorithms/for_each.hpp>
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_perimeter.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_perimeter.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_perimeter.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -5,7 +5,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/perimeter.hpp>
#include <boost/geometry/multi/algorithms/perimeter.hpp>
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_simplify.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_simplify.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_simplify.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -5,7 +5,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/simplify.hpp>
#include <boost/geometry/multi/algorithms/simplify.hpp>
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_within.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_within.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_within.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -5,7 +5,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/overlay/multi_overlay_common.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/overlay/multi_overlay_common.hpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/overlay/multi_overlay_common.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -1,5 +1,5 @@
-#ifndef GGL_TEST_MULTI_OVERLAY_COMMON_HPP
-#define GGL_TEST_MULTI_OVERLAY_COMMON_HPP
+#ifndef GEOMETRY_TEST_MULTI_OVERLAY_COMMON_HPP
+#define GEOMETRY_TEST_MULTI_OVERLAY_COMMON_HPP
// Boost.Geometry (aka GGL, Generic Geometry Library) test file
@@ -36,4 +36,4 @@
}
-#endif // GGL_TEST_MULTI_OVERLAY_COMMON_HPP
+#endif // GEOMETRY_TEST_MULTI_OVERLAY_COMMON_HPP
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/overlay/multi_svg_mapper.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/overlay/multi_svg_mapper.hpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/overlay/multi_svg_mapper.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,8 +7,8 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef GGL_TEST_MULTI_UTIL_SVG_MAPPER_HPP
-#define GGL_TEST_MULTI_UTIL_SVG_MAPPER_HPP
+#ifndef GEOMETRY_TEST_MULTI_UTIL_SVG_MAPPER_HPP
+#define GEOMETRY_TEST_MULTI_UTIL_SVG_MAPPER_HPP
#include <boost/geometry/multi/algorithms/envelope.hpp>
#include <boost/geometry/multi/algorithms/transform.hpp>
@@ -41,4 +41,4 @@
-#endif // GGL_TEST_MULTI_UTIL_SVG_MAPPER_HPP
+#endif // GEOMETRY_TEST_MULTI_UTIL_SVG_MAPPER_HPP
Modified: sandbox/geometry/libs/geometry/test/point_concept/function_asserting_a_point.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/point_concept/function_asserting_a_point.hpp (original)
+++ sandbox/geometry/libs/geometry/test/point_concept/function_asserting_a_point.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -6,8 +6,8 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef GGL_TEST_POINT_CONCEPT_FUNCTION_ASSERTING_A_POINT_HPP
-#define GGL_TEST_POINT_CONCEPT_FUNCTION_ASSERTING_A_POINT_HPP
+#ifndef GEOMETRY_TEST_POINT_CONCEPT_FUNCTION_ASSERTING_A_POINT_HPP
+#define GEOMETRY_TEST_POINT_CONCEPT_FUNCTION_ASSERTING_A_POINT_HPP
#include <boost/concept/requires.hpp>
@@ -25,4 +25,4 @@
}
}
-#endif // GGL_TEST_POINT_CONCEPT_FUNCTION_ASSERTING_A_POINT_HPP
+#endif // GEOMETRY_TEST_POINT_CONCEPT_FUNCTION_ASSERTING_A_POINT_HPP
Modified: sandbox/geometry/libs/geometry/test/point_concept/function_requiring_a_point.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/point_concept/function_requiring_a_point.hpp (original)
+++ sandbox/geometry/libs/geometry/test/point_concept/function_requiring_a_point.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -6,8 +6,8 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef GGL_TEST_POINT_CONCEPT_FUNCTION_REQUIRING_A_POINT_HPP
-#define GGL_TEST_POINT_CONCEPT_FUNCTION_REQUIRING_A_POINT_HPP
+#ifndef GEOMETRY_TEST_POINT_CONCEPT_FUNCTION_REQUIRING_A_POINT_HPP
+#define GEOMETRY_TEST_POINT_CONCEPT_FUNCTION_REQUIRING_A_POINT_HPP
#include <boost/concept/requires.hpp>
@@ -27,4 +27,4 @@
}
}
-#endif // GGL_TEST_POINT_CONCEPT_FUNCTION_REQUIRING_A_POINT_HPP
+#endif // GEOMETRY_TEST_POINT_CONCEPT_FUNCTION_REQUIRING_A_POINT_HPP
Modified: sandbox/geometry/libs/geometry/test/policies/compare.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/policies/compare.cpp (original)
+++ sandbox/geometry/libs/geometry/test/policies/compare.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -5,7 +5,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <algorithm>
Modified: sandbox/geometry/libs/geometry/test/strategies/cross_track.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/strategies/cross_track.cpp (original)
+++ sandbox/geometry/libs/geometry/test/strategies/cross_track.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/assign.hpp>
Modified: sandbox/geometry/libs/geometry/test/strategies/haversine.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/strategies/haversine.cpp (original)
+++ sandbox/geometry/libs/geometry/test/strategies/haversine.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/concept/requires.hpp>
#include <boost/concept_check.hpp>
Modified: sandbox/geometry/libs/geometry/test/strategies/projected_point.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/strategies/projected_point.cpp (original)
+++ sandbox/geometry/libs/geometry/test/strategies/projected_point.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/strategies/cartesian/distance_projected_point.hpp>
#include <boost/geometry/strategies/concepts/distance_concept.hpp>
Modified: sandbox/geometry/libs/geometry/test/strategies/pythagoras.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/strategies/pythagoras.cpp (original)
+++ sandbox/geometry/libs/geometry/test/strategies/pythagoras.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/assign.hpp>
#include <boost/geometry/strategies/cartesian/distance_pythagoras.hpp>
Modified: sandbox/geometry/libs/geometry/test/strategies/segment_intersection.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/strategies/segment_intersection.cpp (original)
+++ sandbox/geometry/libs/geometry/test/strategies/segment_intersection.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -15,7 +15,7 @@
#define HAVE_MATRIX_AS_STRING
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/assign.hpp>
Modified: sandbox/geometry/libs/geometry/test/strategies/segment_intersection_collinear.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/strategies/segment_intersection_collinear.cpp (original)
+++ sandbox/geometry/libs/geometry/test/strategies/segment_intersection_collinear.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/assign.hpp>
@@ -26,7 +26,7 @@
#include <boost/geometry/geometries/segment.hpp>
template <typename IntersectionPoints>
-static int check(IntersectionPoints const& is,
+static int check(IntersectionPoints const& is,
std::size_t index, double expected_x, double expected_y)
{
namespace bg = boost::geometry;
@@ -45,7 +45,7 @@
template <typename P>
static void test_segment_intersection(std::string const& case_id,
- int x1, int y1, int x2, int y2,
+ int x1, int y1, int x2, int y2,
int x3, int y3, int x4, int y4,
char expected_how, bool expected_opposite,
int expected_arrival1, int expected_arrival2,
@@ -84,17 +84,17 @@
>::apply(s12, s34);
// Get just a character for Left/Right/intersects/etc, purpose is more for debugging
- bg::policies::relate::direction_type dir
+ bg::policies::relate::direction_type dir
= bg::strategy::intersection::relate_cartesian_segments
<
bg::policies::relate::segments_direction
<
- segment_type,
+ segment_type,
segment_type
>
>::apply(s12, s34);
- int expected_count =
+ int expected_count =
check(is, 0, expected_x1, expected_y1)
+ check(is, 1, expected_x2, expected_y2);
@@ -112,7 +112,7 @@
// Collinear - non opposite
// a1---------->a2
- // b1--->b2
+ // b1--->b2
test_segment_intersection<P>("n1",
2, 0, 6, 0,
0, 0, 2, 0,
@@ -120,7 +120,7 @@
2, 0);
// a1---------->a2
- // b1--->b2
+ // b1--->b2
test_segment_intersection<P>("n2",
2, 0, 6, 0,
1, 0, 3, 0,
@@ -128,7 +128,7 @@
2, 0, 3, 0);
// a1---------->a2
- // b1--->b2
+ // b1--->b2
test_segment_intersection<P>("n3",
2, 0, 6, 0,
2, 0, 4, 0,
@@ -136,15 +136,15 @@
2, 0, 4, 0);
// a1---------->a2
- // b1--->b2
+ // b1--->b2
test_segment_intersection<P>("n4",
2, 0, 6, 0,
- 3, 0, 5, 0,
+ 3, 0, 5, 0,
'c', false, -1, 1,
3, 0, 5, 0);
// a1---------->a2
- // b1--->b2
+ // b1--->b2
test_segment_intersection<P>("n5",
2, 0, 6, 0,
4, 0, 6, 0,
@@ -152,7 +152,7 @@
4, 0, 6, 0);
// a1---------->a2
- // b1--->b2
+ // b1--->b2
test_segment_intersection<P>("n6",
2, 0, 6, 0,
5, 0, 7, 0,
@@ -160,7 +160,7 @@
5, 0, 6, 0);
// a1---------->a2
- // b1--->b2
+ // b1--->b2
test_segment_intersection<P>("n7",
2, 0, 6, 0,
6, 0, 8, 0,
@@ -169,7 +169,7 @@
// Collinear - opposite
// a1---------->a2
- // b2<---b1
+ // b2<---b1
test_segment_intersection<P>("o1",
2, 0, 6, 0,
2, 0, 0, 0,
@@ -177,7 +177,7 @@
2, 0);
// a1---------->a2
- // b2<---b1
+ // b2<---b1
test_segment_intersection<P>("o2",
2, 0, 6, 0,
3, 0, 1, 0,
@@ -185,7 +185,7 @@
2, 0, 3, 0);
// a1---------->a2
- // b2<---b1
+ // b2<---b1
test_segment_intersection<P>("o3",
2, 0, 6, 0,
4, 0, 2, 0,
@@ -193,7 +193,7 @@
2, 0, 4, 0);
// a1---------->a2
- // b2<---b1
+ // b2<---b1
test_segment_intersection<P>("o4",
2, 0, 6, 0,
5, 0, 3, 0,
@@ -201,7 +201,7 @@
3, 0, 5, 0);
// a1---------->a2
- // b2<---b1
+ // b2<---b1
test_segment_intersection<P>("o5",
2, 0, 6, 0,
6, 0, 4, 0,
@@ -209,7 +209,7 @@
4, 0, 6, 0);
// a1---------->a2
- // b2<---b1
+ // b2<---b1
test_segment_intersection<P>("o6",
2, 0, 6, 0,
7, 0, 5, 0,
@@ -217,7 +217,7 @@
5, 0, 6, 0);
// a1---------->a2
- // b2<---b1
+ // b2<---b1
test_segment_intersection<P>("o7",
2, 0, 6, 0,
8, 0, 6, 0,
@@ -225,7 +225,7 @@
6, 0);
// a1---------->a2
- // b1---------->b2
+ // b1---------->b2
test_segment_intersection<P>("e1",
2, 0, 6, 0,
2, 0, 6, 0,
@@ -233,7 +233,7 @@
2, 0, 6, 0);
// a1---------->a2
- // b2<----------b1
+ // b2<----------b1
test_segment_intersection<P>("e1",
2, 0, 6, 0,
6, 0, 2, 0,
Modified: sandbox/geometry/libs/geometry/test/strategies/side_by_cross_track.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/strategies/side_by_cross_track.cpp (original)
+++ sandbox/geometry/libs/geometry/test/strategies/side_by_cross_track.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/assign.hpp>
Modified: sandbox/geometry/libs/geometry/test/strategies/transformer.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/strategies/transformer.cpp (original)
+++ sandbox/geometry/libs/geometry/test/strategies/transformer.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/strategies/transform/inverse_transformer.hpp>
#include <boost/geometry/strategies/transform/map_transformer.hpp>
Modified: sandbox/geometry/libs/geometry/test/test_common/test_point.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/test_common/test_point.hpp (original)
+++ sandbox/geometry/libs/geometry/test/test_common/test_point.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,8 +7,8 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef GGL_TEST_TEST_COMMON_TEST_POINT_HPP
-#define GGL_TEST_TEST_COMMON_TEST_POINT_HPP
+#ifndef GEOMETRY_TEST_TEST_COMMON_TEST_POINT_HPP
+#define GEOMETRY_TEST_TEST_COMMON_TEST_POINT_HPP
#include <boost/geometry/core/access.hpp>
#include <boost/geometry/core/coordinate_type.hpp>
@@ -87,4 +87,4 @@
}}} // namespace boost::geometry::traits
-#endif // GGL_TEST_TEST_COMMON_TEST_POINT_HPP
+#endif // GEOMETRY_TEST_TEST_COMMON_TEST_POINT_HPP
Modified: sandbox/geometry/libs/geometry/test/test_common/with_pointer.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/test_common/with_pointer.hpp (original)
+++ sandbox/geometry/libs/geometry/test/test_common/with_pointer.hpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,8 +7,8 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef GGL_TEST_COMMON_WITH_POINTER_HPP
-#define GGL_TEST_COMMON_WITH_POINTER_HPP
+#ifndef GEOMETRY_TEST_COMMON_WITH_POINTER_HPP
+#define GEOMETRY_TEST_COMMON_WITH_POINTER_HPP
#include <boost/geometry/core/access.hpp>
@@ -78,4 +78,4 @@
}}} // namespace boost::geometry::traits
-#endif // #ifndef GGL_TEST_COMMON_WITH_POINTER_HPP
+#endif // #ifndef GEOMETRY_TEST_COMMON_WITH_POINTER_HPP
Modified: sandbox/geometry/libs/geometry/test/util/as_range.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/util/as_range.cpp (original)
+++ sandbox/geometry/libs/geometry/test/util/as_range.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/iterators/range_type.hpp>
Modified: sandbox/geometry/libs/geometry/test/util/copy.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/util/copy.cpp (original)
+++ sandbox/geometry/libs/geometry/test/util/copy.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -6,7 +6,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/util/copy.hpp>
Modified: sandbox/geometry/libs/geometry/test/util/for_each_coordinate.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/util/for_each_coordinate.cpp (original)
+++ sandbox/geometry/libs/geometry/test/util/for_each_coordinate.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/util/for_each_coordinate.hpp>
Modified: sandbox/geometry/libs/geometry/test/util/select_most_precise.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/util/select_most_precise.cpp (original)
+++ sandbox/geometry/libs/geometry/test/util/select_most_precise.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/util/select_most_precise.hpp>
Modified: sandbox/geometry/libs/geometry/test/util/write_dsv.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/util/write_dsv.cpp (original)
+++ sandbox/geometry/libs/geometry/test/util/write_dsv.cpp 2010-02-20 11:58:38 EST (Sat, 20 Feb 2010)
@@ -9,7 +9,7 @@
#include <sstream>
-#include <ggl_test_common.hpp>
+#include <geometry_test_common.hpp>
#include <boost/geometry/util/write_dsv.hpp>
@@ -33,7 +33,7 @@
}
-#ifndef GGL_TEST_MULTI
+#ifndef GEOMETRY_TEST_MULTI
template <typename T>
void test_all()
{
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