From 45d624af9b995a8f9ca4d6204a0dfd0a739c16c3 Mon Sep 17 00:00:00 2001 From: Barend Gehrels Date: Wed, 7 Oct 2020 14:03:45 +0200 Subject: [PATCH] [cleanup] remove HAVE_TTMATH and other occurances of ttmath --- Jamfile | 1 - .../examples/algorithms/assign_2d_point.cpp | 21 ++------------ .../detail/equals/collect_vectors.hpp | 2 +- .../geometry/formulas/vincenty_inverse.hpp | 3 +- include/boost/geometry/io/wkt/wkt.hpp | 2 +- .../strategies/strategy_transform.hpp | 2 +- .../boost/geometry/util/calculation_type.hpp | 2 +- .../boost/geometry/util/coordinate_cast.hpp | 1 - index/test/Jamfile | 1 - index/test/algorithms/content.cpp | 8 ----- .../test/algorithms/intersection_content.cpp | 8 ----- index/test/algorithms/is_valid.cpp | 8 ----- index/test/algorithms/margin.cpp | 8 ----- index/test/algorithms/minmaxdist.cpp | 8 ----- index/test/algorithms/path_intersection.cpp | 11 ------- .../test/algorithms/segment_intersection.cpp | 8 ----- index/test/algorithms/union_content.cpp | 8 ----- test/Jamfile | 1 - test/algorithms/append.cpp | 4 --- test/algorithms/area/area.cpp | 5 ---- test/algorithms/area/area_multi.cpp | 4 --- test/algorithms/area/area_sph_geo.cpp | 1 - test/algorithms/assign.cpp | 12 -------- test/algorithms/centroid.cpp | 5 ---- test/algorithms/centroid_multi.cpp | 4 --- test/algorithms/clear_multi.cpp | 4 --- test/algorithms/comparable_distance.cpp | 7 ----- test/algorithms/convex_hull.cpp | 4 --- test/algorithms/convex_hull_multi.cpp | 4 --- test/algorithms/correct.cpp | 4 --- test/algorithms/correct_multi.cpp | 4 --- test/algorithms/covered_by/covered_by.cpp | 7 ----- .../covered_by/covered_by_multi.cpp | 4 --- test/algorithms/covered_by/covered_by_sph.cpp | 4 --- .../covered_by/covered_by_sph_geo.cpp | 5 ---- test/algorithms/crosses/crosses.cpp | 4 --- test/algorithms/crosses/crosses_sph.cpp | 4 --- test/algorithms/disjoint/disjoint.cpp | 5 ---- .../disjoint/disjoint_coverage_a_a.cpp | 8 ----- .../disjoint/disjoint_coverage_l_a.cpp | 8 ----- .../disjoint/disjoint_coverage_l_l.cpp | 7 ----- .../disjoint/disjoint_coverage_p_a.cpp | 7 ----- .../disjoint/disjoint_coverage_p_l.cpp | 7 ----- .../disjoint/disjoint_coverage_p_p.cpp | 7 ----- test/algorithms/disjoint/disjoint_multi.cpp | 4 --- .../disjoint/disjoint_point_box_geometry.cpp | 4 --- test/algorithms/disjoint/disjoint_seg_box.cpp | 5 ---- test/algorithms/disjoint/disjoint_sph.cpp | 4 --- test/algorithms/distance/distance.cpp | 9 ------ test/algorithms/envelope_expand/envelope.cpp | 5 ---- .../envelope_expand/envelope_multi.cpp | 5 ---- test/algorithms/envelope_expand/expand.cpp | 7 ----- test/algorithms/equals/equals.cpp | 7 ----- test/algorithms/equals/equals_multi.cpp | 4 --- test/algorithms/equals/equals_on_spheroid.cpp | 20 ------------- test/algorithms/equals/equals_sph.cpp | 4 --- test/algorithms/for_each.cpp | 4 --- test/algorithms/for_each_multi.cpp | 4 --- test/algorithms/intersects/intersects.cpp | 4 --- .../intersects/intersects_box_geometry.cpp | 4 --- .../intersects/intersects_multi.cpp | 4 --- .../algorithms/intersects/intersects_self.cpp | 4 --- test/algorithms/intersects/intersects_sph.cpp | 4 --- .../intersects/intersects_sph_geo.cpp | 5 ---- test/algorithms/length/length.cpp | 4 --- test/algorithms/length/length_geo.cpp | 4 --- test/algorithms/length/length_multi.cpp | 4 --- test/algorithms/length/length_sph.cpp | 4 --- test/algorithms/make.cpp | 7 ----- test/algorithms/num_geometries_multi.cpp | 4 --- test/algorithms/num_interior_rings_multi.cpp | 4 --- test/algorithms/num_points_multi.cpp | 4 --- test/algorithms/overlaps/overlaps.cpp | 4 --- test/algorithms/overlaps/overlaps_areal.cpp | 4 --- test/algorithms/overlaps/overlaps_box.cpp | 4 --- test/algorithms/overlaps/overlaps_sph.cpp | 4 --- test/algorithms/overlay/get_turns.cpp | 3 -- .../overlay/get_turns_areal_areal.cpp | 3 -- .../overlay/get_turns_areal_areal_sph.cpp | 3 -- .../overlay/get_turns_linear_areal.cpp | 3 -- .../overlay/get_turns_linear_areal_sph.cpp | 3 -- .../overlay/get_turns_linear_linear.cpp | 3 -- .../overlay/get_turns_linear_linear_sph.cpp | 3 -- test/algorithms/overlay/overlay_cases.hpp | 2 +- test/algorithms/overlay/traverse.cpp | 10 +------ test/algorithms/perimeter.cpp | 4 --- test/algorithms/perimeter/perimeter.cpp | 4 --- test/algorithms/perimeter/perimeter_geo.cpp | 4 --- test/algorithms/perimeter/perimeter_sph.cpp | 4 --- test/algorithms/perimeter_multi.cpp | 4 --- test/algorithms/relate/relate_areal_areal.cpp | 4 --- .../relate/relate_areal_areal_sph.cpp | 4 --- .../algorithms/relate/relate_linear_areal.cpp | 4 --- .../relate/relate_linear_areal_sph.cpp | 4 --- .../relate/relate_linear_linear.cpp | 4 --- .../relate/relate_linear_linear_sph.cpp | 4 --- .../relate/relate_pointlike_geometry.cpp | 4 --- test/algorithms/reverse.cpp | 4 --- test/algorithms/reverse_multi.cpp | 4 --- .../difference/difference_multi_spike.cpp | 2 +- .../intersection/intersection.cpp | 2 +- .../algorithms/set_operations/union/union.cpp | 2 +- test/algorithms/simplify.cpp | 4 --- test/algorithms/simplify_multi.cpp | 4 --- test/algorithms/test_centroid.hpp | 4 --- test/algorithms/touches/touches.cpp | 4 --- test/algorithms/touches/touches_box.cpp | 4 --- test/algorithms/touches/touches_multi.cpp | 4 --- test/algorithms/touches/touches_self.cpp | 4 --- test/algorithms/touches/touches_sph.cpp | 4 --- test/algorithms/transform.cpp | 10 ------- test/algorithms/transform_multi.cpp | 3 -- test/algorithms/unique.cpp | 4 --- test/algorithms/unique_multi.cpp | 4 --- test/algorithms/within/within.cpp | 5 ---- test/algorithms/within/within_areal_areal.cpp | 4 --- .../algorithms/within/within_linear_areal.cpp | 5 ---- .../within/within_linear_linear.cpp | 4 --- test/algorithms/within/within_multi.cpp | 4 --- .../within/within_pointlike_geometry.cpp | 6 ---- test/algorithms/within/within_sph.cpp | 4 --- test/algorithms/within/within_sph_geo.cpp | 5 ---- test/io/svg/svg.cpp | 4 --- test/io/wkt/wkt.cpp | 22 +------------- .../areal_areal/interior_triangles.cpp | 4 --- .../areal_areal/intersection_stars.cpp | 6 ---- .../overlay/areal_areal/intersects.cpp | 4 --- .../areal_areal/random_ellipses_stars.cpp | 6 ---- .../areal_areal/recursive_polygons.cpp | 4 --- .../overlay/areal_areal/star_comb.cpp | 4 --- .../recursive_polygons_linear_areal.cpp | 4 --- test/strategies/andoyer.cpp | 11 ------- test/strategies/cross_track.cpp | 5 ---- test/strategies/crossings_multiply.cpp | 4 --- test/strategies/distance.cpp | 4 --- test/strategies/distance_default_result.cpp | 29 ------------------- test/strategies/franklin.cpp | 4 --- test/strategies/haversine.cpp | 12 -------- test/strategies/point_in_box.cpp | 4 --- test/strategies/projected_point.cpp | 9 ------ test/strategies/projected_point_ax.cpp | 9 ------ test/strategies/pythagoras.cpp | 15 ---------- test/strategies/pythagoras_point_box.cpp | 18 ------------ test/strategies/spherical_side.cpp | 5 ---- test/strategies/test_projected_point.hpp | 4 --- test/strategies/thomas.cpp | 10 ------- test/strategies/vincenty.cpp | 10 ------- test/strategies/winding.cpp | 5 ---- test/util/math_abs.cpp | 20 ------------- test/util/math_sqrt.cpp | 12 -------- test/util/promote_integral.cpp | 5 ---- 151 files changed, 13 insertions(+), 829 deletions(-) diff --git a/Jamfile b/Jamfile index fe4b9b883..2b9f2048c 100644 --- a/Jamfile +++ b/Jamfile @@ -11,7 +11,6 @@ project boost-geometry : requirements - ../../boost/geometry/extensions/contrib/ttmath msvc:on ; diff --git a/doc/src/examples/algorithms/assign_2d_point.cpp b/doc/src/examples/algorithms/assign_2d_point.cpp index b03dc0519..f5604625e 100644 --- a/doc/src/examples/algorithms/assign_2d_point.cpp +++ b/doc/src/examples/algorithms/assign_2d_point.cpp @@ -8,7 +8,7 @@ // http://www.boost.org/LICENSE_1_0.txt) //[assign_2d_point -//` Shows the usage of assign to set point coordinates, and, besides that, shows how you can initialize ttmath points with high precision +//` Shows the usage of assign to set point coordinates #include #include @@ -16,11 +16,6 @@ #include #include -#if defined(HAVE_TTMATH) -# include -#endif - - int main() { using boost::geometry::assign_values; @@ -29,21 +24,9 @@ int main() boost::geometry::model::d2::point_xy p1; assign_values(p1, 1.2345, 2.3456); -#if defined(HAVE_TTMATH) - boost::geometry::model::d2::point_xy > p2; - assign_values(p2, "1.2345", "2.3456"); /*< It is possible to assign coordinates with other types than the coordinate type. - For ttmath, you can e.g. conveniently use strings. The advantage is that it then has higher precision, because - if doubles are used for assignments the double-precision is used. - >*/ -#endif - std::cout << std::setprecision(20) - << boost::geometry::dsv(p1) << std::endl -#if defined(HAVE_TTMATH) - << boost::geometry::dsv(p2) << std::endl -#endif - ; + << boost::geometry::dsv(p1) << std::endl; return 0; } diff --git a/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp b/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp index fd5c3caa4..35ec77a92 100644 --- a/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp +++ b/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp @@ -147,7 +147,7 @@ private: // For high precision arithmetic, we have to be // more relaxed then using == // Because 2/sqrt( (0,0)<->(2,2) ) == 1/sqrt( (0,0)<->(1,1) ) - // is not always true (at least, it is not for ttmath) + // is not always true (at least, not for some user defined types) return math::equals_with_epsilon(dx, other.dx) && math::equals_with_epsilon(dy, other.dy); } diff --git a/include/boost/geometry/formulas/vincenty_inverse.hpp b/include/boost/geometry/formulas/vincenty_inverse.hpp index 7bfcf69a9..a25e5a084 100644 --- a/include/boost/geometry/formulas/vincenty_inverse.hpp +++ b/include/boost/geometry/formulas/vincenty_inverse.hpp @@ -162,8 +162,7 @@ public: if ( BOOST_GEOMETRY_CONDITION(EnableDistance) ) { - // Oops getting hard here - // (again, problem is that ttmath cannot divide by doubles, which is OK) + // Some types cannot divide by doubles CT const c6 = 6; CT const c47 = 47; CT const c74 = 74; diff --git a/include/boost/geometry/io/wkt/wkt.hpp b/include/boost/geometry/io/wkt/wkt.hpp index 28bd1e42a..1aa6650e5 100644 --- a/include/boost/geometry/io/wkt/wkt.hpp +++ b/include/boost/geometry/io/wkt/wkt.hpp @@ -19,7 +19,7 @@ // BSG 2011-02-03 // We don't include stream.hpp by default. That tries to stream anything not known -// by default (such as ttmath) and reports errors. +// by default and reports errors. // Users can include stream.hpp themselves (if they want to) #endif // BOOST_GEOMETRY_IO_WKT_WKT_HPP diff --git a/include/boost/geometry/strategies/strategy_transform.hpp b/include/boost/geometry/strategies/strategy_transform.hpp index 99fcb720c..fe94c14f8 100644 --- a/include/boost/geometry/strategies/strategy_transform.hpp +++ b/include/boost/geometry/strategies/strategy_transform.hpp @@ -191,7 +191,7 @@ namespace detail // Phi = first, theta is second, r is third, see documentation on cs::spherical - // (calculations are splitted to implement ttmath) + // (calculations are splitted to implement user defined types) T r_sin_theta = r; T r_cos_theta = r; diff --git a/include/boost/geometry/util/calculation_type.hpp b/include/boost/geometry/util/calculation_type.hpp index 9b66bd2b7..b238dde37 100644 --- a/include/boost/geometry/util/calculation_type.hpp +++ b/include/boost/geometry/util/calculation_type.hpp @@ -40,7 +40,7 @@ struct default_integral /*! \details Selects the most appropriate: - if calculation type is specified (not void), that one is used - - else if type is non-fundamental (user defined e.g. ttmath), that one + - else if type is non-fundamental (user defined e.g. Boost.Multiprecision), that one - else if type is floating point, the specified default FP is used - else it is integral and the specified default integral is used */ diff --git a/include/boost/geometry/util/coordinate_cast.hpp b/include/boost/geometry/util/coordinate_cast.hpp index 16a15cca5..0c3d99ed4 100644 --- a/include/boost/geometry/util/coordinate_cast.hpp +++ b/include/boost/geometry/util/coordinate_cast.hpp @@ -28,7 +28,6 @@ namespace detail /*! \brief cast coordinates from a string to a coordinate type \detail By default it uses lexical_cast. However, lexical_cast seems not to support - ttmath / partial specializations. Therefore this small utility is added. See also "define_pi" where the same issue is solved */ template diff --git a/index/test/Jamfile b/index/test/Jamfile index 90fcbf425..2b148a771 100644 --- a/index/test/Jamfile +++ b/index/test/Jamfile @@ -13,7 +13,6 @@ project boost-geometry-index-test requirements . # libs/geometry/index/test ../../test # libs/geometry/test - #../../../../boost/geometry/extensions/contrib/ttmath msvc:on msvc:/bigobj windows,intel:/bigobj diff --git a/index/test/algorithms/content.cpp b/index/test/algorithms/content.cpp index 07644656c..9fc00daac 100644 --- a/index/test/algorithms/content.cpp +++ b/index/test/algorithms/content.cpp @@ -57,14 +57,6 @@ int test_main(int, char* []) test_geometry >("POLYGON((0 1 2,2 4 6))", 24.0); test_geometry >("POLYGON((0 1 2,2 4 6))", 24.0); -#ifdef HAVE_TTMATH - typedef bg::model::point P2ttmc; - typedef bg::model::point P3ttmc; - - test_geometry >("POLYGON((0 1,2 4))", 6.0); - test_geometry >("POLYGON((0 1 2,2 4 6))", 24.0); -#endif - test_large_integers(); return 0; diff --git a/index/test/algorithms/intersection_content.cpp b/index/test/algorithms/intersection_content.cpp index a668af790..8dac3536e 100644 --- a/index/test/algorithms/intersection_content.cpp +++ b/index/test/algorithms/intersection_content.cpp @@ -56,14 +56,6 @@ int test_main(int, char* []) test_geometry >("POLYGON((0 1,2 4))", "POLYGON((2 1,3 4))", 0.0); test_geometry >("POLYGON((0 1,2 4))", "POLYGON((2 4,3 5))", 0.0); -#ifdef HAVE_TTMATH - typedef bg::model::point P2ttmc; - typedef bg::model::point P3ttmc; - - test_geometry >("POLYGON((0 1,2 4))", "POLYGON((1 2,3 5))", 2.0); - test_geometry >("POLYGON((0 1 2,2 4 6))", "POLYGON((1 2 3,3 5 7))", 6.0); -#endif - test_large_integers(); return 0; diff --git a/index/test/algorithms/is_valid.cpp b/index/test/algorithms/is_valid.cpp index 4c0584a0f..b4a91bb56 100644 --- a/index/test/algorithms/is_valid.cpp +++ b/index/test/algorithms/is_valid.cpp @@ -96,14 +96,6 @@ int test_main(int, char* []) test_box >("POLYGON((0 1 2,2 4 6))", true); test_box >("POLYGON((0 1 2,2 4 6))", true); -#ifdef HAVE_TTMATH - typedef bg::model::point P2ttmc; - typedef bg::model::point P3ttmc; - - test_geometry >("POLYGON((0 1,2 4))", true); - test_geometry >("POLYGON((0 1 2,2 4 6))", true); -#endif - test_large_integers(); return 0; diff --git a/index/test/algorithms/margin.cpp b/index/test/algorithms/margin.cpp index e1e9eab09..6c4f5f5bd 100644 --- a/index/test/algorithms/margin.cpp +++ b/index/test/algorithms/margin.cpp @@ -50,14 +50,6 @@ int test_main(int, char* []) test_geometry >("POLYGON((0 1 2,2 4 6))", 9.0); test_geometry >("POLYGON((0 1 2,2 4 6))", 9.0); -#ifdef HAVE_TTMATH - typedef bg::model::point P2ttmc; - typedef bg::model::point P3ttmc; - - test_geometry >("POLYGON((0 1,2 4))", 10.0); - test_geometry >("POLYGON((0 1 2,2 4 6))", 52.0); -#endif - test_large_integers(); // test_empty_input >(); diff --git a/index/test/algorithms/minmaxdist.cpp b/index/test/algorithms/minmaxdist.cpp index 4534b2f3c..b082cc431 100644 --- a/index/test/algorithms/minmaxdist.cpp +++ b/index/test/algorithms/minmaxdist.cpp @@ -87,14 +87,6 @@ int test_main(int, char* []) test_indexable >(P2ic(1, 2), "POLYGON((1 2,3 5))", 4.0); -#ifdef HAVE_TTMATH - typedef bg::model::point P2ttmc; - typedef bg::model::point P3ttmc; - - test_indexable >(P2ttmc(1, 2), "POLYGON((0 1,2 4))", 5.0); - test_indexable >(P3ttmc(1, 2, 3), "POLYGON((0 1 2,2 4 6))", 14.0); -#endif - test_large_integers(); return 0; diff --git a/index/test/algorithms/path_intersection.cpp b/index/test/algorithms/path_intersection.cpp index 2670d0775..9c4901ee8 100644 --- a/index/test/algorithms/path_intersection.cpp +++ b/index/test/algorithms/path_intersection.cpp @@ -116,17 +116,6 @@ int test_main(int, char* []) test_geometry, L2fc>("POLYGON((0 1,2 4))", "LINESTRING(0 0, 3 0, 3 2, 0 2)", true, 6); test_geometry, L2fc>("POLYGON((0 1,2 4))", "LINESTRING(1 2, 3 3, 0 3)", true, 0); -#ifdef HAVE_TTMATH - typedef bg::model::point P2ttmc; - typedef bg::model::point P3ttmc; - - typedef bg::model::linestring L2ttmc; - typedef bg::model::linestring L3ttmc; - - test_geometry, L2ttmc>("POLYGON((0 1,2 4))", "LINESTRING(0 0, 2 5)", true, 1.0/5); - test_geometry, L3ttmc>("POLYGON((0 1 2,2 4 6))", "LINESTRING(0 0 0, 2 5 7)", true, 2.0/7); -#endif - test_large_integers(); return 0; diff --git a/index/test/algorithms/segment_intersection.cpp b/index/test/algorithms/segment_intersection.cpp index 1cc6dc22b..8bb8623af 100644 --- a/index/test/algorithms/segment_intersection.cpp +++ b/index/test/algorithms/segment_intersection.cpp @@ -115,14 +115,6 @@ int test_main(int, char* []) test_geometry, P2fc>("POLYGON((0 1,2 4))", "POINT(0.5 2)", "POINT(1.5 3)", true, 0.0f); -#ifdef HAVE_TTMATH - typedef bg::model::point P2ttmc; - typedef bg::model::point P3ttmc; - - test_geometry, P2ttmc>("POLYGON((0 1,2 4))", "POINT(0 0)", "POINT(2 5)", true, 1.0f/5); - test_geometry, P3ttmc>("POLYGON((0 1 2,2 4 6))", "POINT(0 0 0)", "POINT(2 5 7)", true, 2.0f/7); -#endif - test_large_integers(); return 0; diff --git a/index/test/algorithms/union_content.cpp b/index/test/algorithms/union_content.cpp index beaa17136..e27f71836 100644 --- a/index/test/algorithms/union_content.cpp +++ b/index/test/algorithms/union_content.cpp @@ -56,14 +56,6 @@ int test_main(int, char* []) test_geometry >("POLYGON((0 1,2 4))", "POLYGON((2 1,3 4))", 9.0); test_geometry >("POLYGON((0 1,2 4))", "POLYGON((2 4,3 5))", 12.0); -#ifdef HAVE_TTMATH - typedef bg::model::point P2ttmc; - typedef bg::model::point P3ttmc; - - test_geometry >("POLYGON((0 1,2 4))", "POLYGON((1 2,3 5))", 12.0); - test_geometry >("POLYGON((0 1 2,2 4 6))", "POLYGON((1 2 3,3 5 7))", 60.0); -#endif - test_large_integers(); return 0; diff --git a/test/Jamfile b/test/Jamfile index d179fe7c3..023b53f06 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -19,7 +19,6 @@ project boost-geometry-test : requirements . - ../../../boost/geometry/extensions/contrib/ttmath msvc:on msvc:/bigobj clang:-Wno-unneeded-internal-declaration # supress warning by Boost.None diff --git a/test/algorithms/append.cpp b/test/algorithms/append.cpp index 0eda9669c..c4d112167 100644 --- a/test/algorithms/append.cpp +++ b/test/algorithms/append.cpp @@ -167,9 +167,5 @@ int test_main(int, char* []) test_all >(); test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/area/area.cpp b/test/algorithms/area/area.cpp index ce4115049..702d81818 100644 --- a/test/algorithms/area/area.cpp +++ b/test/algorithms/area/area.cpp @@ -227,11 +227,6 @@ int test_main(int, char* []) test_poles_ccw(); test_poles_ccw(); -#ifdef HAVE_TTMATH - test_all >(); - test_spherical_geo(); -#endif - test_large_integers(); test_variant(); diff --git a/test/algorithms/area/area_multi.cpp b/test/algorithms/area/area_multi.cpp index 37ac0cecf..574aa6607 100644 --- a/test/algorithms/area/area_multi.cpp +++ b/test/algorithms/area/area_multi.cpp @@ -47,9 +47,5 @@ int test_main( int , char* [] ) { test_all(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/area/area_sph_geo.cpp b/test/algorithms/area/area_sph_geo.cpp index dc7d9f628..09533a1b5 100644 --- a/test/algorithms/area/area_sph_geo.cpp +++ b/test/algorithms/area/area_sph_geo.cpp @@ -54,7 +54,6 @@ void test_spherical_geo() bg::model::polygon geometry; // unit-sphere has area of 4-PI. Polygon covering 1/8 of it: - // calculations splitted for ttmath std::string poly = "POLYGON((0 0,0 90,90 0,0 0))"; bg::strategy::area::spherical diff --git a/test/algorithms/assign.cpp b/test/algorithms/assign.cpp index aca34a687..89dc6b544 100644 --- a/test/algorithms/assign.cpp +++ b/test/algorithms/assign.cpp @@ -310,17 +310,5 @@ int test_main(int, char* []) test_assign_linestring_2d >(); test_assign_linestring_2d >(); -#ifdef HAVE_TTMATH - // Next 3 need extra traits for c-array with custom type: - // test_assign_point_2d(); - // test_assign_point_3d(); - // test_assign_box_2d(); - - test_assign_point_2d >(); - test_assign_point_3d >(); - test_assign_box_or_segment_2d >(); - test_assign_linestring_2d >(); -#endif - return 0; } diff --git a/test/algorithms/centroid.cpp b/test/algorithms/centroid.cpp index 8f7399230..248ebc72b 100644 --- a/test/algorithms/centroid.cpp +++ b/test/algorithms/centroid.cpp @@ -257,11 +257,6 @@ int test_main(int, char* []) test_5d >(); -#if defined(HAVE_TTMATH) - test_2d >(); - test_3d >(); -#endif - #ifndef NDEBUG // The test currently fails in release mode. TODO: fix this test_large_integers(); diff --git a/test/algorithms/centroid_multi.cpp b/test/algorithms/centroid_multi.cpp index ba946693b..6f471b9aa 100644 --- a/test/algorithms/centroid_multi.cpp +++ b/test/algorithms/centroid_multi.cpp @@ -186,10 +186,6 @@ int test_main(int, char* []) //test_2d >(true); //test_2d >(); -#ifdef HAVE_TTMATH - test_2d >(); -#endif - test_exceptions >(); test_empty >(); diff --git a/test/algorithms/clear_multi.cpp b/test/algorithms/clear_multi.cpp index 44f4716e0..caf038ccf 100644 --- a/test/algorithms/clear_multi.cpp +++ b/test/algorithms/clear_multi.cpp @@ -55,9 +55,5 @@ int test_main( int , char* [] ) { test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/comparable_distance.cpp b/test/algorithms/comparable_distance.cpp index 3a513387c..bb96dc205 100644 --- a/test/algorithms/comparable_distance.cpp +++ b/test/algorithms/comparable_distance.cpp @@ -496,10 +496,6 @@ int test_main(int, char* []) test_all >(); test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - // test variant support test_variant_different_default_strategy::apply(); @@ -511,9 +507,6 @@ int test_main(int, char* []) test_variant_with_strategy::apply(); test_variant_with_strategy::apply(); test_variant_with_strategy::apply(); -#ifdef HAVE_TTMATH - test_variant_with_strategy::apply(); -#endif test_variant_boxes::apply(); test_variant_boxes::apply(); diff --git a/test/algorithms/convex_hull.cpp b/test/algorithms/convex_hull.cpp index 0ca1bcb7b..27d1d7234 100644 --- a/test/algorithms/convex_hull.cpp +++ b/test/algorithms/convex_hull.cpp @@ -81,9 +81,5 @@ int test_main(int, char* []) test_all >(); test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/convex_hull_multi.cpp b/test/algorithms/convex_hull_multi.cpp index eaf0ddc8d..e36041329 100644 --- a/test/algorithms/convex_hull_multi.cpp +++ b/test/algorithms/convex_hull_multi.cpp @@ -83,9 +83,5 @@ int test_main(int, char* []) //test_all >(); test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/correct.cpp b/test/algorithms/correct.cpp index 154117634..69a0cdf0f 100644 --- a/test/algorithms/correct.cpp +++ b/test/algorithms/correct.cpp @@ -175,9 +175,5 @@ int test_main(int, char* []) test_ring_polygon > >(); test_ring_polygon > >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/correct_multi.cpp b/test/algorithms/correct_multi.cpp index be61640cd..a8e0cce0d 100644 --- a/test/algorithms/correct_multi.cpp +++ b/test/algorithms/correct_multi.cpp @@ -52,9 +52,5 @@ int test_main( int , char* [] ) { test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/covered_by/covered_by.cpp b/test/algorithms/covered_by/covered_by.cpp index 2052ea58e..d165784eb 100644 --- a/test/algorithms/covered_by/covered_by.cpp +++ b/test/algorithms/covered_by/covered_by.cpp @@ -186,12 +186,5 @@ int test_main( int , char* [] ) test_mixed(); test_3d(); - -#if defined(HAVE_TTMATH) - test_all >(); - test_eps >(); - //test_spherical > >(); -#endif - return 0; } diff --git a/test/algorithms/covered_by/covered_by_multi.cpp b/test/algorithms/covered_by/covered_by_multi.cpp index 720e72716..fff5de36e 100644 --- a/test/algorithms/covered_by/covered_by_multi.cpp +++ b/test/algorithms/covered_by/covered_by_multi.cpp @@ -48,9 +48,5 @@ int test_main( int , char* [] ) //test_all >(); test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/covered_by/covered_by_sph.cpp b/test/algorithms/covered_by/covered_by_sph.cpp index a80fb2390..06183bbd6 100644 --- a/test/algorithms/covered_by/covered_by_sph.cpp +++ b/test/algorithms/covered_by/covered_by_sph.cpp @@ -312,9 +312,5 @@ int test_main( int , char* [] ) { test_all > >(); -#if defined(HAVE_TTMATH) - test_cs > >(); -#endif - return 0; } diff --git a/test/algorithms/covered_by/covered_by_sph_geo.cpp b/test/algorithms/covered_by/covered_by_sph_geo.cpp index 6c8d5853b..665b2802f 100644 --- a/test/algorithms/covered_by/covered_by_sph_geo.cpp +++ b/test/algorithms/covered_by/covered_by_sph_geo.cpp @@ -123,10 +123,5 @@ int test_main( int , char* [] ) test_cs > >(); test_cs > >(); -#if defined(HAVE_TTMATH) - test_cs > >(); - test_cs > >();; -#endif - return 0; } diff --git a/test/algorithms/crosses/crosses.cpp b/test/algorithms/crosses/crosses.cpp index 21ed78d12..1504c26c0 100644 --- a/test/algorithms/crosses/crosses.cpp +++ b/test/algorithms/crosses/crosses.cpp @@ -97,10 +97,6 @@ int test_main( int , char* [] ) test_2d >(); test_2d >(); -#if defined(HAVE_TTMATH) - test_2d >(); -#endif - //test_3d >(); return 0; diff --git a/test/algorithms/crosses/crosses_sph.cpp b/test/algorithms/crosses/crosses_sph.cpp index 93657eb38..8c36d152e 100644 --- a/test/algorithms/crosses/crosses_sph.cpp +++ b/test/algorithms/crosses/crosses_sph.cpp @@ -111,9 +111,5 @@ int test_main( int , char* [] ) { test_all > >(); -#if defined(HAVE_TTMATH) - test_cs > >(); -#endif - return 0; } diff --git a/test/algorithms/disjoint/disjoint.cpp b/test/algorithms/disjoint/disjoint.cpp index 2d0225daf..bd9bd1627 100644 --- a/test/algorithms/disjoint/disjoint.cpp +++ b/test/algorithms/disjoint/disjoint.cpp @@ -156,10 +156,5 @@ int test_main(int, char* []) test_all >(); test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - - return 0; } diff --git a/test/algorithms/disjoint/disjoint_coverage_a_a.cpp b/test/algorithms/disjoint/disjoint_coverage_a_a.cpp index 25d6c5d77..c50fdadf3 100644 --- a/test/algorithms/disjoint/disjoint_coverage_a_a.cpp +++ b/test/algorithms/disjoint/disjoint_coverage_a_a.cpp @@ -32,11 +32,6 @@ #include - -#ifdef HAVE_TTMATH -#include -#endif - namespace bg = ::boost::geometry; //============================================================================ @@ -381,7 +376,4 @@ BOOST_AUTO_TEST_CASE( test_areal_areal_all ) { test_areal_areal(); test_areal_areal(); -#ifdef HAVE_TTMATH - test_areal_areal(); -#endif } diff --git a/test/algorithms/disjoint/disjoint_coverage_l_a.cpp b/test/algorithms/disjoint/disjoint_coverage_l_a.cpp index cb55aaa8d..eb7039a04 100644 --- a/test/algorithms/disjoint/disjoint_coverage_l_a.cpp +++ b/test/algorithms/disjoint/disjoint_coverage_l_a.cpp @@ -32,11 +32,6 @@ #include - -#ifdef HAVE_TTMATH -#include -#endif - namespace bg = ::boost::geometry; //============================================================================ @@ -532,7 +527,4 @@ BOOST_AUTO_TEST_CASE( test_linear_areal_all ) { test_linear_areal(); test_linear_areal(); -#ifdef HAVE_TTMATH - test_linear_areal(); -#endif } diff --git a/test/algorithms/disjoint/disjoint_coverage_l_l.cpp b/test/algorithms/disjoint/disjoint_coverage_l_l.cpp index 1d1161e1c..bf9843de4 100644 --- a/test/algorithms/disjoint/disjoint_coverage_l_l.cpp +++ b/test/algorithms/disjoint/disjoint_coverage_l_l.cpp @@ -33,10 +33,6 @@ #include -#ifdef HAVE_TTMATH -#include -#endif - namespace bg = ::boost::geometry; //============================================================================ @@ -373,7 +369,4 @@ BOOST_AUTO_TEST_CASE( test_linear_linear_all ) { test_linear_linear(); test_linear_linear(); -#ifdef HAVE_TTMATH - test_linear_linear(); -#endif } diff --git a/test/algorithms/disjoint/disjoint_coverage_p_a.cpp b/test/algorithms/disjoint/disjoint_coverage_p_a.cpp index 9c8437b17..1ecfc7443 100644 --- a/test/algorithms/disjoint/disjoint_coverage_p_a.cpp +++ b/test/algorithms/disjoint/disjoint_coverage_p_a.cpp @@ -34,10 +34,6 @@ #include -#ifdef HAVE_TTMATH -#include -#endif - namespace bg = ::boost::geometry; //============================================================================ @@ -286,7 +282,4 @@ BOOST_AUTO_TEST_CASE( test_pointlike_areal_all ) { test_pointlike_areal(); test_pointlike_areal(); -#ifdef HAVE_TTMATH - test_pointlike_areal(); -#endif } diff --git a/test/algorithms/disjoint/disjoint_coverage_p_l.cpp b/test/algorithms/disjoint/disjoint_coverage_p_l.cpp index ab4b8839a..574c71b33 100644 --- a/test/algorithms/disjoint/disjoint_coverage_p_l.cpp +++ b/test/algorithms/disjoint/disjoint_coverage_p_l.cpp @@ -33,10 +33,6 @@ #include -#ifdef HAVE_TTMATH -#include -#endif - namespace bg = ::boost::geometry; //============================================================================ @@ -385,7 +381,4 @@ BOOST_AUTO_TEST_CASE( test_pointlike_linear_all ) { test_pointlike_linear(); test_pointlike_linear(); -#ifdef HAVE_TTMATH - test_pointlike_linear(); -#endif } diff --git a/test/algorithms/disjoint/disjoint_coverage_p_p.cpp b/test/algorithms/disjoint/disjoint_coverage_p_p.cpp index a634e9291..629de6bf4 100644 --- a/test/algorithms/disjoint/disjoint_coverage_p_p.cpp +++ b/test/algorithms/disjoint/disjoint_coverage_p_p.cpp @@ -33,10 +33,6 @@ #include -#ifdef HAVE_TTMATH -#include -#endif - namespace bg = ::boost::geometry; //============================================================================ @@ -181,7 +177,4 @@ BOOST_AUTO_TEST_CASE( test_pointlike_pointlike_all ) { test_pointlike_pointlike(); test_pointlike_pointlike(); -#ifdef HAVE_TTMATH - test_pointlike_pointlike(); -#endif } diff --git a/test/algorithms/disjoint/disjoint_multi.cpp b/test/algorithms/disjoint/disjoint_multi.cpp index 8bc8a6b55..ad2002c01 100644 --- a/test/algorithms/disjoint/disjoint_multi.cpp +++ b/test/algorithms/disjoint/disjoint_multi.cpp @@ -110,10 +110,6 @@ int test_main(int, char* []) //test_all >(); test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/disjoint/disjoint_point_box_geometry.cpp b/test/algorithms/disjoint/disjoint_point_box_geometry.cpp index 37fb8b15a..e3a983396 100644 --- a/test/algorithms/disjoint/disjoint_point_box_geometry.cpp +++ b/test/algorithms/disjoint/disjoint_point_box_geometry.cpp @@ -118,10 +118,6 @@ int test_main(int, char* []) test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - test_3d >(); return 0; diff --git a/test/algorithms/disjoint/disjoint_seg_box.cpp b/test/algorithms/disjoint/disjoint_seg_box.cpp index 2aa8c3f23..1ccb1b9a7 100644 --- a/test/algorithms/disjoint/disjoint_seg_box.cpp +++ b/test/algorithms/disjoint/disjoint_seg_box.cpp @@ -292,10 +292,5 @@ int test_main( int , char* [] ) test_all(); test_all(); -#ifdef HAVE_TTMATH - common_tests >(); - common_tests >(); -#endif - return 0; } diff --git a/test/algorithms/disjoint/disjoint_sph.cpp b/test/algorithms/disjoint/disjoint_sph.cpp index b6f6f4adb..ebc658e01 100644 --- a/test/algorithms/disjoint/disjoint_sph.cpp +++ b/test/algorithms/disjoint/disjoint_sph.cpp @@ -319,9 +319,5 @@ int test_main( int , char* [] ) test_linestring_linestring_radians(); -#if defined(HAVE_TTMATH) - test_cs > >(); -#endif - return 0; } diff --git a/test/algorithms/distance/distance.cpp b/test/algorithms/distance/distance.cpp index f86969209..30e8eb63f 100644 --- a/test/algorithms/distance/distance.cpp +++ b/test/algorithms/distance/distance.cpp @@ -505,10 +505,6 @@ int test_main(int, char* []) test_all >(); test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - test_empty_input >(); // below are the test cases moved here from the distance unit test @@ -522,11 +518,6 @@ int test_main(int, char* []) test_mixed, bg::model::d2::point_xy >(); -#ifdef HAVE_TTMATH - test_2d >(); - test_mixed, bg::model::d2::point_xy >(); -#endif - test_empty_input >(); test_variant(); diff --git a/test/algorithms/envelope_expand/envelope.cpp b/test/algorithms/envelope_expand/envelope.cpp index 7418b27c6..19c5af588 100644 --- a/test/algorithms/envelope_expand/envelope.cpp +++ b/test/algorithms/envelope_expand/envelope.cpp @@ -226,10 +226,5 @@ int test_main(int, char* []) test_invalid >(); test_invalid >(); -#ifdef HAVE_TTMATH - test_2d >(); - test_3d >(); -#endif - return 0; } diff --git a/test/algorithms/envelope_expand/envelope_multi.cpp b/test/algorithms/envelope_expand/envelope_multi.cpp index 7efebb96b..d53a05955 100644 --- a/test/algorithms/envelope_expand/envelope_multi.cpp +++ b/test/algorithms/envelope_expand/envelope_multi.cpp @@ -54,10 +54,5 @@ int test_main( int , char* [] ) test_3d >(); test_3d >(); -#ifdef HAVE_TTMATH - test_2d >(); - test_2d >(); -#endif - return 0; } diff --git a/test/algorithms/envelope_expand/expand.cpp b/test/algorithms/envelope_expand/expand.cpp index 9ed205027..77d88d931 100644 --- a/test/algorithms/envelope_expand/expand.cpp +++ b/test/algorithms/envelope_expand/expand.cpp @@ -153,12 +153,5 @@ int test_main(int, char* []) test_spherical_degree > >(); test_spherical_radian > >(); - -#if defined(HAVE_TTMATH) - test_3d >(); - test_spherical_degree > >(); - test_spherical_radian > >(); -#endif - return 0; } diff --git a/test/algorithms/equals/equals.cpp b/test/algorithms/equals/equals.cpp index c96b6015f..f1e110140 100644 --- a/test/algorithms/equals/equals.cpp +++ b/test/algorithms/equals/equals.cpp @@ -303,16 +303,9 @@ void verify() int test_main( int , char* [] ) { //verify(); -#if defined(HAVE_TTMATH) - verify(); -#endif test_all >(); test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/equals/equals_multi.cpp b/test/algorithms/equals/equals_multi.cpp index 6984f29e5..e368df473 100644 --- a/test/algorithms/equals/equals_multi.cpp +++ b/test/algorithms/equals/equals_multi.cpp @@ -44,9 +44,5 @@ int test_main( int , char* [] ) { test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/equals/equals_on_spheroid.cpp b/test/algorithms/equals/equals_on_spheroid.cpp index 5e24fdfab..282cbebfe 100644 --- a/test/algorithms/equals/equals_on_spheroid.cpp +++ b/test/algorithms/equals/equals_on_spheroid.cpp @@ -174,10 +174,6 @@ BOOST_AUTO_TEST_CASE( equals_point_point_se ) < bgm::point, bgm::point >::apply("se"); - -#if defined(HAVE_TTMATH) - test_point_point >::apply("se"); -#endif } BOOST_AUTO_TEST_CASE( equals_point_point_with_height_se ) @@ -198,10 +194,6 @@ BOOST_AUTO_TEST_CASE( equals_point_point_with_height_se ) < bgm::point, bgm::point >::apply("seh"); - -#if defined(HAVE_TTMATH) - test_point_point >::apply("seh"); -#endif } BOOST_AUTO_TEST_CASE( equals_point_point_geo ) @@ -222,10 +214,6 @@ BOOST_AUTO_TEST_CASE( equals_point_point_geo ) < bgm::point, bgm::point >::apply("se"); - -#if defined(HAVE_TTMATH) - test_point_point >::apply("geo"); -#endif } BOOST_AUTO_TEST_CASE( equals_segment_segment_se ) @@ -235,10 +223,6 @@ BOOST_AUTO_TEST_CASE( equals_segment_segment_se ) test_segment_segment >("se"); test_segment_segment >("se"); test_segment_segment >("se"); - -#if defined(HAVE_TTMATH) - test_segment_segment >("se"); -#endif } BOOST_AUTO_TEST_CASE( equals_segment_segment_geo ) @@ -248,8 +232,4 @@ BOOST_AUTO_TEST_CASE( equals_segment_segment_geo ) test_segment_segment >("geo"); test_segment_segment >("geo"); test_segment_segment >("geo"); - -#if defined(HAVE_TTMATH) - test_segment_segment >("geo"); -#endif } diff --git a/test/algorithms/equals/equals_sph.cpp b/test/algorithms/equals/equals_sph.cpp index 05e8b8344..45b0227b8 100644 --- a/test/algorithms/equals/equals_sph.cpp +++ b/test/algorithms/equals/equals_sph.cpp @@ -147,9 +147,5 @@ int test_main( int , char* [] ) { test_all > >(); -#if defined(HAVE_TTMATH) - test_cs > >(); -#endif - return 0; } diff --git a/test/algorithms/for_each.cpp b/test/algorithms/for_each.cpp index b0f73fcca..922225674 100644 --- a/test/algorithms/for_each.cpp +++ b/test/algorithms/for_each.cpp @@ -138,9 +138,5 @@ int test_main(int, char* []) { test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/for_each_multi.cpp b/test/algorithms/for_each_multi.cpp index e9c02b685..7756eb0e0 100644 --- a/test/algorithms/for_each_multi.cpp +++ b/test/algorithms/for_each_multi.cpp @@ -89,9 +89,5 @@ int test_main( int , char* [] ) { test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/intersects/intersects.cpp b/test/algorithms/intersects/intersects.cpp index a24872493..ab8e7b5cc 100644 --- a/test/algorithms/intersects/intersects.cpp +++ b/test/algorithms/intersects/intersects.cpp @@ -219,9 +219,5 @@ int test_main( int , char* [] ) test_all > >(); #endif -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/intersects/intersects_box_geometry.cpp b/test/algorithms/intersects/intersects_box_geometry.cpp index 692a0f691..3bcee2c79 100644 --- a/test/algorithms/intersects/intersects_box_geometry.cpp +++ b/test/algorithms/intersects/intersects_box_geometry.cpp @@ -164,9 +164,5 @@ int test_main( int , char* [] ) test_all > >(); #endif -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/intersects/intersects_multi.cpp b/test/algorithms/intersects/intersects_multi.cpp index d2c70d1f8..771885a4a 100644 --- a/test/algorithms/intersects/intersects_multi.cpp +++ b/test/algorithms/intersects/intersects_multi.cpp @@ -54,10 +54,6 @@ int test_main(int, char* []) test_all >(); test_all, bg::model::point >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/intersects/intersects_self.cpp b/test/algorithms/intersects/intersects_self.cpp index 6d6c4172a..0217a6dfe 100644 --- a/test/algorithms/intersects/intersects_self.cpp +++ b/test/algorithms/intersects/intersects_self.cpp @@ -125,9 +125,5 @@ int test_main( int , char* [] ) test_all > >(); #endif -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/intersects/intersects_sph.cpp b/test/algorithms/intersects/intersects_sph.cpp index 0981c0af4..a499ac05f 100644 --- a/test/algorithms/intersects/intersects_sph.cpp +++ b/test/algorithms/intersects/intersects_sph.cpp @@ -261,9 +261,5 @@ int test_main( int , char* [] ) { test_all > >(); -#if defined(HAVE_TTMATH) - test_cs > >(); -#endif - return 0; } diff --git a/test/algorithms/intersects/intersects_sph_geo.cpp b/test/algorithms/intersects/intersects_sph_geo.cpp index c4cd283da..d298e7572 100644 --- a/test/algorithms/intersects/intersects_sph_geo.cpp +++ b/test/algorithms/intersects/intersects_sph_geo.cpp @@ -77,10 +77,5 @@ int test_main( int , char* [] ) test_cs > >(); test_cs > >(); -#if defined(HAVE_TTMATH) - test_cs > >(); - test_cs > >();; -#endif - return 0; } diff --git a/test/algorithms/length/length.cpp b/test/algorithms/length/length.cpp index 11e18d396..637a14091 100644 --- a/test/algorithms/length/length.cpp +++ b/test/algorithms/length/length.cpp @@ -45,10 +45,6 @@ int test_main(int, char* []) test_all >(); test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - // test_empty_input >(); return 0; diff --git a/test/algorithms/length/length_geo.cpp b/test/algorithms/length/length_geo.cpp index 66754eaf0..fe87f6e9e 100644 --- a/test/algorithms/length/length_geo.cpp +++ b/test/algorithms/length/length_geo.cpp @@ -109,10 +109,6 @@ int test_main(int, char* []) test_all > >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - //test_empty_input > >(); diff --git a/test/algorithms/length/length_multi.cpp b/test/algorithms/length/length_multi.cpp index 083349f57..0b4dd4bd7 100644 --- a/test/algorithms/length/length_multi.cpp +++ b/test/algorithms/length/length_multi.cpp @@ -28,10 +28,6 @@ int test_main( int , char* [] ) { test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - // test_empty_input >(); return 0; diff --git a/test/algorithms/length/length_sph.cpp b/test/algorithms/length/length_sph.cpp index 6b2f8944f..b8896b575 100644 --- a/test/algorithms/length/length_sph.cpp +++ b/test/algorithms/length/length_sph.cpp @@ -77,10 +77,6 @@ int test_main(int, char* []) test_all_haversine > >(mean_radius); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - //test_empty_input >(); return 0; diff --git a/test/algorithms/make.cpp b/test/algorithms/make.cpp index fae968a8c..119d83e0b 100644 --- a/test/algorithms/make.cpp +++ b/test/algorithms/make.cpp @@ -124,14 +124,7 @@ int test_main(int, char* []) test_2d >(); test_2d >(); - test_3d >(); -#if defined(HAVE_TTMATH) - test_2d >(); - test_3d >(); -#endif - - return 0; } diff --git a/test/algorithms/num_geometries_multi.cpp b/test/algorithms/num_geometries_multi.cpp index 9c18a9618..4280a9758 100644 --- a/test/algorithms/num_geometries_multi.cpp +++ b/test/algorithms/num_geometries_multi.cpp @@ -49,9 +49,5 @@ int test_main( int , char* [] ) { test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/num_interior_rings_multi.cpp b/test/algorithms/num_interior_rings_multi.cpp index 2ad958d81..d20e5946e 100644 --- a/test/algorithms/num_interior_rings_multi.cpp +++ b/test/algorithms/num_interior_rings_multi.cpp @@ -42,9 +42,5 @@ int test_main( int , char* [] ) { test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/num_points_multi.cpp b/test/algorithms/num_points_multi.cpp index dd96bf3a4..2f0e2da0a 100644 --- a/test/algorithms/num_points_multi.cpp +++ b/test/algorithms/num_points_multi.cpp @@ -62,9 +62,5 @@ int test_main( int , char* [] ) { test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/overlaps/overlaps.cpp b/test/algorithms/overlaps/overlaps.cpp index b305edb5b..b033ec013 100644 --- a/test/algorithms/overlaps/overlaps.cpp +++ b/test/algorithms/overlaps/overlaps.cpp @@ -55,9 +55,5 @@ int test_main( int , char* [] ) test_2d >(); test_2d >(); -#if defined(HAVE_TTMATH) - test_2d >(); -#endif - return 0; } diff --git a/test/algorithms/overlaps/overlaps_areal.cpp b/test/algorithms/overlaps/overlaps_areal.cpp index c7361f203..36a260d85 100644 --- a/test/algorithms/overlaps/overlaps_areal.cpp +++ b/test/algorithms/overlaps/overlaps_areal.cpp @@ -65,9 +65,5 @@ int test_main( int , char* [] ) test_2d >(); test_2d >(); -#if defined(HAVE_TTMATH) - test_2d >(); -#endif - return 0; } diff --git a/test/algorithms/overlaps/overlaps_box.cpp b/test/algorithms/overlaps/overlaps_box.cpp index b58cfa967..1316d3dfc 100644 --- a/test/algorithms/overlaps/overlaps_box.cpp +++ b/test/algorithms/overlaps/overlaps_box.cpp @@ -55,10 +55,6 @@ int test_main( int , char* [] ) test_2d >(); test_2d >(); -#if defined(HAVE_TTMATH) - test_2d >(); -#endif - //test_3d >(); return 0; diff --git a/test/algorithms/overlaps/overlaps_sph.cpp b/test/algorithms/overlaps/overlaps_sph.cpp index 79478ad3d..910d3787d 100644 --- a/test/algorithms/overlaps/overlaps_sph.cpp +++ b/test/algorithms/overlaps/overlaps_sph.cpp @@ -145,9 +145,5 @@ int test_main( int , char* [] ) { test_all > >(); -#if defined(HAVE_TTMATH) - test_cs > >(); -#endif - return 0; } diff --git a/test/algorithms/overlay/get_turns.cpp b/test/algorithms/overlay/get_turns.cpp index b32e2eba3..1b8d279b9 100644 --- a/test/algorithms/overlay/get_turns.cpp +++ b/test/algorithms/overlay/get_turns.cpp @@ -395,9 +395,6 @@ int test_main(int, char* []) test_all(); #endif -#if defined(HAVE_TTMATH) - test_all(); -#endif return 0; } diff --git a/test/algorithms/overlay/get_turns_areal_areal.cpp b/test/algorithms/overlay/get_turns_areal_areal.cpp index a1a93abab..a1317724b 100644 --- a/test/algorithms/overlay/get_turns_areal_areal.cpp +++ b/test/algorithms/overlay/get_turns_areal_areal.cpp @@ -55,8 +55,5 @@ int test_main(int, char* []) test_all(); #endif -#if defined(HAVE_TTMATH) - test_all(); -#endif return 0; } diff --git a/test/algorithms/overlay/get_turns_areal_areal_sph.cpp b/test/algorithms/overlay/get_turns_areal_areal_sph.cpp index 4905e4b53..4362018df 100644 --- a/test/algorithms/overlay/get_turns_areal_areal_sph.cpp +++ b/test/algorithms/overlay/get_turns_areal_areal_sph.cpp @@ -77,8 +77,5 @@ int test_main(int, char* []) // test_all(); //#endif -//#if defined(HAVE_TTMATH) -// test_all(); -//#endif return 0; } diff --git a/test/algorithms/overlay/get_turns_linear_areal.cpp b/test/algorithms/overlay/get_turns_linear_areal.cpp index 1ac88bff1..50bea1c6d 100644 --- a/test/algorithms/overlay/get_turns_linear_areal.cpp +++ b/test/algorithms/overlay/get_turns_linear_areal.cpp @@ -227,8 +227,5 @@ int test_main(int, char* []) test_all(); #endif -#if defined(HAVE_TTMATH) - test_all(); -#endif return 0; } diff --git a/test/algorithms/overlay/get_turns_linear_areal_sph.cpp b/test/algorithms/overlay/get_turns_linear_areal_sph.cpp index be893b34a..86aa7818d 100644 --- a/test/algorithms/overlay/get_turns_linear_areal_sph.cpp +++ b/test/algorithms/overlay/get_turns_linear_areal_sph.cpp @@ -234,8 +234,5 @@ int test_main(int, char* []) // test_all(); //#endif -//#if defined(HAVE_TTMATH) -// test_all(); -//#endif return 0; } diff --git a/test/algorithms/overlay/get_turns_linear_linear.cpp b/test/algorithms/overlay/get_turns_linear_linear.cpp index df543bf2d..b6d0c8266 100644 --- a/test/algorithms/overlay/get_turns_linear_linear.cpp +++ b/test/algorithms/overlay/get_turns_linear_linear.cpp @@ -541,9 +541,6 @@ int test_main(int, char* []) test_all(); #endif -#if defined(HAVE_TTMATH) - test_all(); -#endif return 0; } diff --git a/test/algorithms/overlay/get_turns_linear_linear_sph.cpp b/test/algorithms/overlay/get_turns_linear_linear_sph.cpp index 962bc8c38..a6fdd1330 100644 --- a/test/algorithms/overlay/get_turns_linear_linear_sph.cpp +++ b/test/algorithms/overlay/get_turns_linear_linear_sph.cpp @@ -435,8 +435,5 @@ int test_main(int, char* []) test_all(); #endif -#if defined(HAVE_TTMATH) - test_all(); -#endif return 0; } diff --git a/test/algorithms/overlay/overlay_cases.hpp b/test/algorithms/overlay/overlay_cases.hpp index 65bea7fbb..8b9a3701f 100644 --- a/test/algorithms/overlay/overlay_cases.hpp +++ b/test/algorithms/overlay/overlay_cases.hpp @@ -909,7 +909,7 @@ static std::string ggl_list_20110716_enrico[2] = // Send on ggl-list by Christoph/Angus at 2011-08-19/20 -// This polygon combination fails to union in but do in or +// This polygon combination fails to union in but do in // It had previosly an error which has been fixed at 2011-08-30 static std::string ggl_list_20110820_christophe[2] = { diff --git a/test/algorithms/overlay/traverse.cpp b/test/algorithms/overlay/traverse.cpp index 0367c6716..2e4f801cc 100644 --- a/test/algorithms/overlay/traverse.cpp +++ b/test/algorithms/overlay/traverse.cpp @@ -10,7 +10,6 @@ #define BOOST_GEOMETRY_DEFINE_STREAM_OPERATOR_SEGMENT_RATIO //#define BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE //#define BOOST_GEOMETRY_OVERLAY_NO_THROW -//#define HAVE_TTMATH #include #include @@ -20,10 +19,6 @@ #include -#ifdef HAVE_TTMATH -# include -#endif - #include @@ -891,7 +886,7 @@ void test_all(bool test_self_tangencies = true, bool test_mixed = false) #endif // Calculate intersection/union of two triangles. Robustness case. - // ttmath can form a very small intersection triangle + // some precise types can form a very small intersection triangle // (which is even not accomplished by SQL Server/PostGIS) std::string const caseid = "ggl_list_20110820_christophe"; test_traverse_intersection::apply(caseid, @@ -1028,9 +1023,6 @@ int test_main(int, char* []) test_all(); #endif -#ifdef HAVE_TTMATH - test_all(); -#endif #endif return 0; diff --git a/test/algorithms/perimeter.cpp b/test/algorithms/perimeter.cpp index 54fcd3c57..f24363387 100644 --- a/test/algorithms/perimeter.cpp +++ b/test/algorithms/perimeter.cpp @@ -53,10 +53,6 @@ int test_main(int, char* []) test_open >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - // test_empty_input >(); return 0; diff --git a/test/algorithms/perimeter/perimeter.cpp b/test/algorithms/perimeter/perimeter.cpp index c30389fde..4045e6f97 100644 --- a/test/algorithms/perimeter/perimeter.cpp +++ b/test/algorithms/perimeter/perimeter.cpp @@ -56,10 +56,6 @@ int test_main(int, char* []) test_all >(); test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - // test_empty_input >(); return 0; diff --git a/test/algorithms/perimeter/perimeter_geo.cpp b/test/algorithms/perimeter/perimeter_geo.cpp index 403f87b0b..4869ec436 100644 --- a/test/algorithms/perimeter/perimeter_geo.cpp +++ b/test/algorithms/perimeter/perimeter_geo.cpp @@ -115,10 +115,6 @@ int test_main(int, char* []) test_all > >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/perimeter/perimeter_sph.cpp b/test/algorithms/perimeter/perimeter_sph.cpp index 73cf91800..5bda73b0a 100644 --- a/test/algorithms/perimeter/perimeter_sph.cpp +++ b/test/algorithms/perimeter/perimeter_sph.cpp @@ -80,9 +80,5 @@ int test_main(int, char* []) test_all_haversine > >(mean_radius); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/perimeter_multi.cpp b/test/algorithms/perimeter_multi.cpp index 3ddd8395c..76132f5a7 100644 --- a/test/algorithms/perimeter_multi.cpp +++ b/test/algorithms/perimeter_multi.cpp @@ -29,9 +29,5 @@ int test_main( int , char* [] ) { test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/relate/relate_areal_areal.cpp b/test/algorithms/relate/relate_areal_areal.cpp index 81ced941e..739a37a35 100644 --- a/test/algorithms/relate/relate_areal_areal.cpp +++ b/test/algorithms/relate/relate_areal_areal.cpp @@ -426,9 +426,5 @@ int test_main( int , char* [] ) test_all >(); test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/relate/relate_areal_areal_sph.cpp b/test/algorithms/relate/relate_areal_areal_sph.cpp index 5475a8fe7..34ec5406b 100644 --- a/test/algorithms/relate/relate_areal_areal_sph.cpp +++ b/test/algorithms/relate/relate_areal_areal_sph.cpp @@ -107,9 +107,5 @@ int test_main( int , char* [] ) test_all >(); test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/relate/relate_linear_areal.cpp b/test/algorithms/relate/relate_linear_areal.cpp index 56017f6de..f5b5d3a79 100644 --- a/test/algorithms/relate/relate_linear_areal.cpp +++ b/test/algorithms/relate/relate_linear_areal.cpp @@ -528,9 +528,5 @@ int test_main( int , char* [] ) test_all >(); test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/relate/relate_linear_areal_sph.cpp b/test/algorithms/relate/relate_linear_areal_sph.cpp index ec7b41734..e3034301c 100644 --- a/test/algorithms/relate/relate_linear_areal_sph.cpp +++ b/test/algorithms/relate/relate_linear_areal_sph.cpp @@ -411,9 +411,5 @@ int test_main( int , char* [] ) test_all >(); test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/relate/relate_linear_linear.cpp b/test/algorithms/relate/relate_linear_linear.cpp index d2073a876..d109e8b92 100644 --- a/test/algorithms/relate/relate_linear_linear.cpp +++ b/test/algorithms/relate/relate_linear_linear.cpp @@ -438,9 +438,5 @@ int test_main( int , char* [] ) test_all >(); test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/relate/relate_linear_linear_sph.cpp b/test/algorithms/relate/relate_linear_linear_sph.cpp index dce75f8bf..ec472c68e 100644 --- a/test/algorithms/relate/relate_linear_linear_sph.cpp +++ b/test/algorithms/relate/relate_linear_linear_sph.cpp @@ -443,9 +443,5 @@ int test_main( int , char* [] ) test_all >(); test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/relate/relate_pointlike_geometry.cpp b/test/algorithms/relate/relate_pointlike_geometry.cpp index 8894b6850..c763f5cf7 100644 --- a/test/algorithms/relate/relate_pointlike_geometry.cpp +++ b/test/algorithms/relate/relate_pointlike_geometry.cpp @@ -246,9 +246,5 @@ int test_main( int , char* [] ) test_all >(); test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/reverse.cpp b/test/algorithms/reverse.cpp index d74b756c4..973c6e7bc 100644 --- a/test/algorithms/reverse.cpp +++ b/test/algorithms/reverse.cpp @@ -67,9 +67,5 @@ int test_main(int, char* []) test_all >(); test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/reverse_multi.cpp b/test/algorithms/reverse_multi.cpp index f3a7f574d..be4e7d789 100644 --- a/test/algorithms/reverse_multi.cpp +++ b/test/algorithms/reverse_multi.cpp @@ -43,9 +43,5 @@ int test_main( int , char* [] ) test_all >(); test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/set_operations/difference/difference_multi_spike.cpp b/test/algorithms/set_operations/difference/difference_multi_spike.cpp index a6b2fea1b..a8c711e3c 100644 --- a/test/algorithms/set_operations/difference/difference_multi_spike.cpp +++ b/test/algorithms/set_operations/difference/difference_multi_spike.cpp @@ -34,7 +34,7 @@ void test_spikes_in_ticket_8364() typedef bg::model::polygon polygon; typedef bg::model::multi_polygon multi_polygon; - // The difference of polygons below result in a spike. The spike should be there, it is also generated in ttmath, + // The difference of polygons below result in a spike. The spike should be there, it was also generated in ttmath, // and (e.g.) in SQL Server. However, using int-coordinates, the spike makes the polygon invalid. Therefore it is now (since August 2013) checked and removed. #ifdef BOOST_GEOMETRY_TEST_FAILURES diff --git a/test/algorithms/set_operations/intersection/intersection.cpp b/test/algorithms/set_operations/intersection/intersection.cpp index ec5e985e0..2462645ff 100644 --- a/test/algorithms/set_operations/intersection/intersection.cpp +++ b/test/algorithms/set_operations/intersection/intersection.cpp @@ -213,7 +213,7 @@ void test_areal() if ( BOOST_GEOMETRY_CONDITION(! ccw && open) ) { - // Pointcount for ttmath/double (both 5) or float (4) + // Pointcount for double (5) or float (4) // double returns 5 (since method append_no_dups_or_spikes) // but not for ccw/open. Those cases has to be adapted once, anyway, // because for open always one point too much is generated... diff --git a/test/algorithms/set_operations/union/union.cpp b/test/algorithms/set_operations/union/union.cpp index cdec14a9b..b933cd1bc 100644 --- a/test/algorithms/set_operations/union/union.cpp +++ b/test/algorithms/set_operations/union/union.cpp @@ -61,7 +61,7 @@ void test_areal() test_one("star_ring", example_star, example_ring, 1, 0, 23, 5.67017141); - // This sample was selected because of the border case, and ttmath generates one point more. + // This sample was selected because of the border case. test_one("star_poly", example_star, example_polygon, 1, 1, 27, 5.647949); diff --git a/test/algorithms/simplify.cpp b/test/algorithms/simplify.cpp index 81c7be5da..9ee2fbbdc 100644 --- a/test/algorithms/simplify.cpp +++ b/test/algorithms/simplify.cpp @@ -300,10 +300,6 @@ int test_main(int, char* []) test_zigzag >(); -#if defined(HAVE_TTMATH) - test_all >(); - test_spherical > >(); -#endif #endif diff --git a/test/algorithms/simplify_multi.cpp b/test/algorithms/simplify_multi.cpp index 04591f0df..7afa0e9ae 100644 --- a/test/algorithms/simplify_multi.cpp +++ b/test/algorithms/simplify_multi.cpp @@ -57,9 +57,5 @@ int test_main( int , char* [] ) { test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/test_centroid.hpp b/test/algorithms/test_centroid.hpp index 7e4d99483..803f41c31 100644 --- a/test/algorithms/test_centroid.hpp +++ b/test/algorithms/test_centroid.hpp @@ -82,10 +82,6 @@ void test_centroid(Geometry const& geometry, T const& d1, T const& d2, T const& //test_with_other_calculation_type(geometry, c1); test_with_other_calculation_type(geometry, c1); test_with_other_calculation_type(geometry, c1); -#if defined(HAVE_TTMATH) - test_with_other_calculation_type(geometry, c1); -#endif - #endif } diff --git a/test/algorithms/touches/touches.cpp b/test/algorithms/touches/touches.cpp index 7052c7959..061119355 100644 --- a/test/algorithms/touches/touches.cpp +++ b/test/algorithms/touches/touches.cpp @@ -216,10 +216,6 @@ int test_main( int , char* [] ) { test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/touches/touches_box.cpp b/test/algorithms/touches/touches_box.cpp index 7325bc2c2..588e3d819 100644 --- a/test/algorithms/touches/touches_box.cpp +++ b/test/algorithms/touches/touches_box.cpp @@ -48,10 +48,6 @@ int test_main( int , char* [] ) test_all >(); test_box_3d >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/touches/touches_multi.cpp b/test/algorithms/touches/touches_multi.cpp index 65de6b52c..99b340ae8 100644 --- a/test/algorithms/touches/touches_multi.cpp +++ b/test/algorithms/touches/touches_multi.cpp @@ -72,9 +72,5 @@ int test_main( int , char* [] ) { test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/touches/touches_self.cpp b/test/algorithms/touches/touches_self.cpp index 00ea47daa..8d3585386 100644 --- a/test/algorithms/touches/touches_self.cpp +++ b/test/algorithms/touches/touches_self.cpp @@ -35,9 +35,5 @@ int test_main( int , char* [] ) { test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/touches/touches_sph.cpp b/test/algorithms/touches/touches_sph.cpp index 352a9bff1..aa9292719 100644 --- a/test/algorithms/touches/touches_sph.cpp +++ b/test/algorithms/touches/touches_sph.cpp @@ -231,9 +231,5 @@ int test_main( int , char* [] ) { test_all > >(); -#if defined(HAVE_TTMATH) - test_cs > >(); -#endif - return 0; } diff --git a/test/algorithms/transform.cpp b/test/algorithms/transform.cpp index 68811cf80..bc938845d 100644 --- a/test/algorithms/transform.cpp +++ b/test/algorithms/transform.cpp @@ -151,15 +151,5 @@ int test_main(int, char* []) double, bg::radian >(3 * bg::math::d2r(), 51 * bg::math::d2r(), 1); -#if defined(HAVE_TTMATH) - typedef bg::model::d2::point_xy PT; - test_all(); - test_transformations(4, 52, 1); - test_transformations - < - ttmath_big, bg::radian - >(3 * bg::math::d2r(), 51 * bg::math::d2r(), 1); -#endif - return 0; } diff --git a/test/algorithms/transform_multi.cpp b/test/algorithms/transform_multi.cpp index 66cb8ba6e..497dd3e03 100644 --- a/test/algorithms/transform_multi.cpp +++ b/test/algorithms/transform_multi.cpp @@ -84,8 +84,5 @@ int test_main(int, char* []) { test_all(); -#ifdef HAVE_TTMATH - test_all(); -#endif return 0; } diff --git a/test/algorithms/unique.cpp b/test/algorithms/unique.cpp index 4460029eb..a1a0cdbc9 100644 --- a/test/algorithms/unique.cpp +++ b/test/algorithms/unique.cpp @@ -52,9 +52,5 @@ int test_main(int, char* []) test_all >(); test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/unique_multi.cpp b/test/algorithms/unique_multi.cpp index 9061d7ef3..b3776455c 100644 --- a/test/algorithms/unique_multi.cpp +++ b/test/algorithms/unique_multi.cpp @@ -44,9 +44,5 @@ int test_main( int , char* [] ) test_all >(); test_all >(); -#ifdef HAVE_TTMATH - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/within/within.cpp b/test/algorithms/within/within.cpp index b095d1752..9cd98628e 100644 --- a/test/algorithms/within/within.cpp +++ b/test/algorithms/within/within.cpp @@ -143,10 +143,5 @@ int test_main( int , char* [] ) test_point_box_3d(); test_strategy(); - -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/within/within_areal_areal.cpp b/test/algorithms/within/within_areal_areal.cpp index 625be46d8..9a3051a6f 100644 --- a/test/algorithms/within/within_areal_areal.cpp +++ b/test/algorithms/within/within_areal_areal.cpp @@ -97,9 +97,5 @@ int test_main( int , char* [] ) test_all >(); test_all, bg::model::point >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/within/within_linear_areal.cpp b/test/algorithms/within/within_linear_areal.cpp index 63bb0028a..2f0a5c8b8 100644 --- a/test/algorithms/within/within_linear_areal.cpp +++ b/test/algorithms/within/within_linear_areal.cpp @@ -118,10 +118,5 @@ int test_main( int , char* [] ) test_all >(); test_all, bg::model::point >(); - -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/within/within_linear_linear.cpp b/test/algorithms/within/within_linear_linear.cpp index c4d7d348d..6a50a75ce 100644 --- a/test/algorithms/within/within_linear_linear.cpp +++ b/test/algorithms/within/within_linear_linear.cpp @@ -100,9 +100,5 @@ int test_main( int , char* [] ) test_all >(); test_all, bg::model::point >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/within/within_multi.cpp b/test/algorithms/within/within_multi.cpp index b41529cc0..11a35b9fb 100644 --- a/test/algorithms/within/within_multi.cpp +++ b/test/algorithms/within/within_multi.cpp @@ -46,9 +46,5 @@ int test_main( int , char* [] ) //test_all >(); test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/algorithms/within/within_pointlike_geometry.cpp b/test/algorithms/within/within_pointlike_geometry.cpp index 523e183c0..d04b0762d 100644 --- a/test/algorithms/within/within_pointlike_geometry.cpp +++ b/test/algorithms/within/within_pointlike_geometry.cpp @@ -450,12 +450,6 @@ int test_main( int , char* [] ) test_spherical_geographic > >(); test_spherical_geographic > >(); -#if defined(HAVE_TTMATH) - test_all >(); - test_spherical_geographic > >(); - test_spherical_geographic > >(); -#endif - test_tickets(); return 0; diff --git a/test/algorithms/within/within_sph.cpp b/test/algorithms/within/within_sph.cpp index 455a8db49..6e33d4602 100644 --- a/test/algorithms/within/within_sph.cpp +++ b/test/algorithms/within/within_sph.cpp @@ -265,9 +265,5 @@ int test_main( int , char* [] ) { test_all > >(); -#if defined(HAVE_TTMATH) - test_cs > >(); -#endif - return 0; } diff --git a/test/algorithms/within/within_sph_geo.cpp b/test/algorithms/within/within_sph_geo.cpp index 6b0fb1b2c..128f24dda 100644 --- a/test/algorithms/within/within_sph_geo.cpp +++ b/test/algorithms/within/within_sph_geo.cpp @@ -120,10 +120,5 @@ int test_main( int , char* [] ) test_cs > >(); test_cs > >(); -#if defined(HAVE_TTMATH) - test_cs > >(); - test_cs > >(); -#endif - return 0; } diff --git a/test/io/svg/svg.cpp b/test/io/svg/svg.cpp index 10e8b4fee..d7f6fa825 100644 --- a/test/io/svg/svg.cpp +++ b/test/io/svg/svg.cpp @@ -149,9 +149,5 @@ int test_main(int, char* []) test_all< boost::geometry::model::d2::point_xy >(); test_all< boost::geometry::model::d2::point_xy >(); -#if defined(HAVE_TTMATH) - test_all< boost::geometry::model::d2::point_xy >(); -#endif - return 0; } diff --git a/test/io/wkt/wkt.cpp b/test/io/wkt/wkt.cpp index 8cd629abc..ac418505d 100644 --- a/test/io/wkt/wkt.cpp +++ b/test/io/wkt/wkt.cpp @@ -118,24 +118,8 @@ void test_wrong_wkt(std::string const& wkt, std::string const& start) e = "other exception"; } - bool check = true; - -#if defined(HAVE_TTMATH) - // For ttmath we skip bad lexical casts - typedef typename bg::coordinate_type::type ct; - - if (boost::is_same::type::value - && boost::starts_with(start, "bad lexical cast")) - { - check = false; - } -#endif - - if (check) - { - BOOST_CHECK_MESSAGE(boost::starts_with(e, start), " Expected:" + BOOST_CHECK_MESSAGE(boost::starts_with(e, start), " Expected:" << start << " Got:" << e << " with WKT: " << wkt); - } } template @@ -262,10 +246,6 @@ int test_main(int, char* []) test_all(); test_all(); -#if defined(HAVE_TTMATH) - test_all(); -#endif - return 0; } diff --git a/test/robustness/overlay/areal_areal/interior_triangles.cpp b/test/robustness/overlay/areal_areal/interior_triangles.cpp index e66d5ecae..cf0d578d6 100644 --- a/test/robustness/overlay/areal_areal/interior_triangles.cpp +++ b/test/robustness/overlay/areal_areal/interior_triangles.cpp @@ -143,10 +143,6 @@ int main(int argc, char** argv) { test_all(count, count_x, count_y, offset, settings); } - -#if defined(HAVE_TTMATH) - // test_all(seed, count, max, svg, level); -#endif } catch(std::exception const& e) { diff --git a/test/robustness/overlay/areal_areal/intersection_stars.cpp b/test/robustness/overlay/areal_areal/intersection_stars.cpp index 6c4292662..64765516a 100644 --- a/test/robustness/overlay/areal_areal/intersection_stars.cpp +++ b/test/robustness/overlay/areal_areal/intersection_stars.cpp @@ -117,12 +117,6 @@ void test_all(std::string const& type, int count, int min_points, int max_points { test_type(count, min_points, max_points, rotation, settings); } -#if defined(HAVE_TTMATH) - else if (type == "ttmath") - { - test_type(count, min_points, max_points, rotation, settings); - } -#endif } int main(int argc, char** argv) diff --git a/test/robustness/overlay/areal_areal/intersects.cpp b/test/robustness/overlay/areal_areal/intersects.cpp index d844f4c60..69123366a 100644 --- a/test/robustness/overlay/areal_areal/intersects.cpp +++ b/test/robustness/overlay/areal_areal/intersects.cpp @@ -154,10 +154,6 @@ int main(int argc, char** argv) { test_all(count, count_x, count_y, width_x, settings); } - -#if defined(HAVE_TTMATH) - // test_all(seed, count, max, svg, level); -#endif } catch(std::exception const& e) { diff --git a/test/robustness/overlay/areal_areal/random_ellipses_stars.cpp b/test/robustness/overlay/areal_areal/random_ellipses_stars.cpp index a3d0455fc..ec3d26b81 100644 --- a/test/robustness/overlay/areal_areal/random_ellipses_stars.cpp +++ b/test/robustness/overlay/areal_areal/random_ellipses_stars.cpp @@ -175,12 +175,6 @@ void test_all(std::string const& type, int seed, int count, p_q_settings setting { test_type(seed, count, settings); } -#if defined(HAVE_TTMATH) - else if (type == "ttmath") - { - test_type(seed, count, settings); - } -#endif } diff --git a/test/robustness/overlay/areal_areal/recursive_polygons.cpp b/test/robustness/overlay/areal_areal/recursive_polygons.cpp index 0a6eabbe7..9cca873c9 100644 --- a/test/robustness/overlay/areal_areal/recursive_polygons.cpp +++ b/test/robustness/overlay/areal_areal/recursive_polygons.cpp @@ -200,10 +200,6 @@ int main(int argc, char** argv) { test_all(seed, count, field_size, level, triangular, settings); } - -#if defined(HAVE_TTMATH) - // test_all(seed, count, max, svg, level); -#endif } catch(std::exception const& e) { diff --git a/test/robustness/overlay/areal_areal/star_comb.cpp b/test/robustness/overlay/areal_areal/star_comb.cpp index 90edd4268..1421a1640 100644 --- a/test/robustness/overlay/areal_areal/star_comb.cpp +++ b/test/robustness/overlay/areal_areal/star_comb.cpp @@ -123,10 +123,6 @@ int main(int argc, char** argv) { test_all(count, star_point_count, comb_comb_count, factor1, factor2, do_union, settings); } - -#if defined(HAVE_TTMATH) - // test_all(seed, count, max, svg, level); -#endif } catch(std::exception const& e) { diff --git a/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.cpp b/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.cpp index c29a0df12..b3a5311b4 100644 --- a/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.cpp +++ b/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.cpp @@ -482,10 +482,6 @@ int main(int argc, char** argv) { test_all(seed, count, level, settings); } - -#if defined(HAVE_TTMATH) - // test_all(seed, count, max, svg, level); -#endif } catch(std::exception const& e) { diff --git a/test/strategies/andoyer.cpp b/test/strategies/andoyer.cpp index 515bbf2e8..0e2af6601 100644 --- a/test/strategies/andoyer.cpp +++ b/test/strategies/andoyer.cpp @@ -33,12 +33,6 @@ #include -#ifdef HAVE_TTMATH -# include -#endif - - - double make_deg(double deg, double min, double sec) { return deg + min / 60.0 + sec / 3600.0; @@ -337,10 +331,5 @@ int test_main(int, char* []) //test_all > >(); test_all > >(); -#if defined(HAVE_TTMATH) - test_all, 2, bg::cs::geographic > >(); - test_all > >(); -#endif - return 0; } diff --git a/test/strategies/cross_track.cpp b/test/strategies/cross_track.cpp index 861251e4e..72e132c4c 100644 --- a/test/strategies/cross_track.cpp +++ b/test/strategies/cross_track.cpp @@ -172,10 +172,5 @@ int test_main(int, char* []) // NYI: haversine for mathematical spherical coordinate systems // test_all >, mathematical_policya >(); -#if defined(HAVE_TTMATH) - typedef ttmath::Big<1,4> tt; - //test_all >, geographic_policy>(); -#endif - return 0; } diff --git a/test/strategies/crossings_multiply.cpp b/test/strategies/crossings_multiply.cpp index f57d383f1..4b49dd9af 100644 --- a/test/strategies/crossings_multiply.cpp +++ b/test/strategies/crossings_multiply.cpp @@ -79,9 +79,5 @@ int test_main(int, char* []) test_all >(); test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/strategies/distance.cpp b/test/strategies/distance.cpp index 876e28730..f4dd5381a 100644 --- a/test/strategies/distance.cpp +++ b/test/strategies/distance.cpp @@ -19,10 +19,6 @@ #include -#ifdef HAVE_TTMATH -# include -#endif - typedef bg::srs::spheroid stype; typedef bg::strategy::andoyer andoyer_formula; diff --git a/test/strategies/distance_default_result.cpp b/test/strategies/distance_default_result.cpp index e862d3313..4ee721bbd 100644 --- a/test/strategies/distance_default_result.cpp +++ b/test/strategies/distance_default_result.cpp @@ -31,10 +31,6 @@ #include #include -#if defined(HAVE_TTMATH) -#include -#endif - namespace bg = ::boost::geometry; @@ -183,10 +179,6 @@ struct test_distance_result_box template inline void test_segment_all() { -#if defined(HAVE_TTMATH) - typedef ttmath_big tt; - typedef bg::util::detail::default_integral::type default_integral; -#endif typedef typename boost::mpl::if_ < typename boost::is_same::type, @@ -207,15 +199,6 @@ inline void test_segment_all() test_distance_result_segment(); test_distance_result_segment(); test_distance_result_segment(); - -#if defined(HAVE_TTMATH) - test_distance_result_segment(); - test_distance_result_segment(); - - test_distance_result_segment(); - test_distance_result_segment(); - test_distance_result_segment(); -#endif } //========================================================================= @@ -223,9 +206,6 @@ inline void test_segment_all() template inline void test_box_all() { -#if defined(HAVE_TTMATH) - typedef ttmath_big tt; -#endif typedef bg::util::detail::default_integral::type default_integral; test_distance_result_box(); @@ -241,15 +221,6 @@ inline void test_box_all() test_distance_result_box(); test_distance_result_box(); test_distance_result_box(); - -#if defined(HAVE_TTMATH) - test_distance_result_box(); - test_distance_result_box(); - - test_distance_result_box(); - test_distance_result_box(); - test_distance_result_box(); -#endif } //========================================================================= diff --git a/test/strategies/franklin.cpp b/test/strategies/franklin.cpp index 6a6c5fe17..78d970034 100644 --- a/test/strategies/franklin.cpp +++ b/test/strategies/franklin.cpp @@ -78,9 +78,5 @@ int test_main(int, char* []) test_all >(); test_all >(); -#if defined(HAVE_TTMATH) - test_all >(); -#endif - return 0; } diff --git a/test/strategies/haversine.cpp b/test/strategies/haversine.cpp index b6853954d..0c8231822 100644 --- a/test/strategies/haversine.cpp +++ b/test/strategies/haversine.cpp @@ -26,12 +26,6 @@ #include -#ifdef HAVE_TTMATH -# include -#endif - - - double const average_earth_radius = 6372795.0; @@ -248,12 +242,6 @@ int test_main(int, char* []) //std::cout << "Factor: " << (t1 / t2) << std::endl; //time_compare > >(10000); -#if defined(HAVE_TTMATH) - typedef ttmath::Big<1,4> tt; - test_all >, geographic_policy>(); -#endif - - test_services < bg::model::point >, diff --git a/test/strategies/point_in_box.cpp b/test/strategies/point_in_box.cpp index 50d5f65a3..8ab354cd8 100644 --- a/test/strategies/point_in_box.cpp +++ b/test/strategies/point_in_box.cpp @@ -73,9 +73,5 @@ int test_main(int, char* []) test_box >(); test_box >(); -#if defined(HAVE_TTMATH) - test_box >(); -#endif - return 0; } diff --git a/test/strategies/projected_point.cpp b/test/strategies/projected_point.cpp index c2307eb41..46435db62 100644 --- a/test/strategies/projected_point.cpp +++ b/test/strategies/projected_point.cpp @@ -62,14 +62,5 @@ int test_main(int, char* []) long double >(); - -#if defined(HAVE_TTMATH) - test_all_2d - < - bg::model::point, - bg::model::point - >(); -#endif - return 0; } diff --git a/test/strategies/projected_point_ax.cpp b/test/strategies/projected_point_ax.cpp index e9bd90964..71b71f7b4 100644 --- a/test/strategies/projected_point_ax.cpp +++ b/test/strategies/projected_point_ax.cpp @@ -74,14 +74,5 @@ int test_main(int, char* []) test_all_2d_ax >(); test_all_2d_ax >(); -#if defined(HAVE_TTMATH) - test_all_2d_ax - < - bg::model::point, - bg::model::point - >(); -#endif - - return 0; } diff --git a/test/strategies/pythagoras.cpp b/test/strategies/pythagoras.cpp index 8bb02c038..66fd77634 100644 --- a/test/strategies/pythagoras.cpp +++ b/test/strategies/pythagoras.cpp @@ -36,10 +36,6 @@ #include -#ifdef HAVE_TTMATH -# include -#endif - BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian) BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian) @@ -348,16 +344,5 @@ int test_main(int, char* []) // TODO move this to another non-unit test // time_compare >(10000); -#if defined(HAVE_TTMATH) - - typedef ttmath::Big<1,4> tt; - typedef bg::model::point tt_point; - - //test_all_3d(); - test_all_3d(); - test_all_3d(); - test_big_2d(); - test_big_2d_string(); -#endif return 0; } diff --git a/test/strategies/pythagoras_point_box.cpp b/test/strategies/pythagoras_point_box.cpp index 42fb2db4d..1596454d3 100644 --- a/test/strategies/pythagoras_point_box.cpp +++ b/test/strategies/pythagoras_point_box.cpp @@ -47,10 +47,6 @@ #include -#ifdef HAVE_TTMATH -# include -#endif - // TEST #include #include @@ -495,17 +491,3 @@ BOOST_AUTO_TEST_CASE( test_time_compare ) // time_compare >(10000); } - -#if defined(HAVE_TTMATH) -BOOST_AUTO_TEST_CASE( test_ttmath_all ) -{ - typedef ttmath::Big<1,4> tt; - typedef bg::model::point tt_point; - - //test_all_3d(); - test_all_3d(); - test_all_3d(); - test_big_2d(); - test_big_2d_string(); -} -#endif diff --git a/test/strategies/spherical_side.cpp b/test/strategies/spherical_side.cpp index b834e016a..2e426fa74 100644 --- a/test/strategies/spherical_side.cpp +++ b/test/strategies/spherical_side.cpp @@ -164,10 +164,5 @@ int test_main(int, char* []) test_all > >(); test_all > >(); -#if defined(HAVE_TTMATH) - typedef ttmath::Big<1,4> tt; - test_all > >(); -#endif - return 0; } diff --git a/test/strategies/test_projected_point.hpp b/test/strategies/test_projected_point.hpp index 72a0d906d..b40bc1201 100644 --- a/test/strategies/test_projected_point.hpp +++ b/test/strategies/test_projected_point.hpp @@ -36,10 +36,6 @@ #include #include -#ifdef HAVE_TTMATH -# include -#endif - BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian) BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian) diff --git a/test/strategies/thomas.cpp b/test/strategies/thomas.cpp index 596b35045..23d2f838b 100644 --- a/test/strategies/thomas.cpp +++ b/test/strategies/thomas.cpp @@ -32,11 +32,6 @@ #include -#ifdef HAVE_TTMATH -# include -#endif - - template void test_distance(double lon1, double lat1, double lon2, double lat2, double expected_km) @@ -144,10 +139,5 @@ int test_main(int, char* []) test_all > >(); test_all > >(); -#if defined(HAVE_TTMATH) - test_all, 2, bg::cs::geographic > >(); - test_all > >(); -#endif - return 0; } diff --git a/test/strategies/vincenty.cpp b/test/strategies/vincenty.cpp index 279db4677..e0b0e4059 100644 --- a/test/strategies/vincenty.cpp +++ b/test/strategies/vincenty.cpp @@ -34,10 +34,6 @@ #include -#ifdef HAVE_TTMATH -# include -#endif - template void normalize_deg(T & deg) { @@ -320,11 +316,5 @@ int test_main(int, char* []) test_all > >(); test_all > >(); -#if defined(HAVE_TTMATH) - test_all, 2, bg::cs::geographic > >(); - test_all > >(); -#endif - - return 0; } diff --git a/test/strategies/winding.cpp b/test/strategies/winding.cpp index d19244ae3..ba4ec1b75 100644 --- a/test/strategies/winding.cpp +++ b/test/strategies/winding.cpp @@ -209,10 +209,5 @@ int test_main(int, char* []) test_spherical(); test_spherical(); -#if defined(HAVE_TTMATH) - test_cartesian >(); - test_spherical(); -#endif - return 0; } diff --git a/test/util/math_abs.cpp b/test/util/math_abs.cpp index c1cfbf51e..45d881ab1 100644 --- a/test/util/math_abs.cpp +++ b/test/util/math_abs.cpp @@ -28,10 +28,6 @@ #include #include -#ifdef HAVE_TTMATH -# include -#endif - namespace bg = boost::geometry; namespace bgm = boost::geometry::math; @@ -82,21 +78,5 @@ BOOST_AUTO_TEST_CASE( test_math_abs ) BOOST_CHECK(eq(bgm::abs(n3), p3)); BOOST_CHECK(eq(bgm::abs(n4), p4)); } - -#ifdef HAVE_TTMATH - { - ttmath_big p1 = bgm::pi(); - ttmath::Big<1, 4> p1 = bgm::pi >(); - - BOOST_CHECK(bgm::abs(p1) == p1); - BOOST_CHECK(bgm::abs(p2) == p2); - - ttmath_big n1 = -p1; - ttmath::Big<1, 4> n2 = -p2; - - BOOST_CHECK(bgm::abs(n1) == p1); - BOOST_CHECK(bgm::abs(n2) == p2); - } -#endif } diff --git a/test/util/math_sqrt.cpp b/test/util/math_sqrt.cpp index 2ca4834a1..0907990ab 100644 --- a/test/util/math_sqrt.cpp +++ b/test/util/math_sqrt.cpp @@ -29,10 +29,6 @@ #include #include -#ifdef HAVE_TTMATH -# include -#endif - namespace bg = boost::geometry; @@ -142,12 +138,4 @@ BOOST_AUTO_TEST_CASE( test_math_sqrt_custom ) check_sqrt::apply(custom1(2.0), custom1(sqrt2)); check_sqrt::apply(custom2(2.0), custom2(sqrt2)); check_sqrt::apply(custom3(2.0), custom3(sqrt2)); - -#ifdef HAVE_TTMATH - typedef ttmath_big custom4; - typedef ttmath::Big<1, 4> custom5; - - check_sqrt::apply(custom4(2.0), custom4(sqrt2)); - check_sqrt::apply(custom5(2.0), custom5(sqrt2)); -#endif } diff --git a/test/util/promote_integral.cpp b/test/util/promote_integral.cpp index 307f3e216..670f78904 100644 --- a/test/util/promote_integral.cpp +++ b/test/util/promote_integral.cpp @@ -538,9 +538,4 @@ BOOST_AUTO_TEST_CASE( test_floating_point ) tester2::apply("fp-f"); tester2::apply("fp-d"); tester2::apply("fp-ld"); - -#ifdef HAVE_TTMATH - tester1::apply("fp-tt"); - tester2::apply("fp-tt"); -#endif }