Merge pull request #779 from awulkiew/fix/test_range_includes

[test] Include only necessary headers of Boost.Range.
2026-01-29 19:42:10 +00:00 · 2021-02-12 18:58:25 +01:00
parent 0cfe9ae1d2 4c6f569d2d
commit bec798d60f
25 changed files with 91 additions and 50 deletions
--- a/test/algorithms/distance/distance_brute_force.hpp
+++ b/test/algorithms/distance/distance_brute_force.hpp
@@ -1,10 +1,11 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test

-// Copyright (c) 2014, 2018 Oracle and/or its affiliates.
+// Copyright (c) 2014-2020 Oracle and/or its affiliates.

 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle

 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -16,7 +17,9 @@

 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/or.hpp>
-#include <boost/range.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/value_type.hpp>

 #include <boost/geometry/core/reverse_dispatch.hpp>
 #include <boost/geometry/core/tag.hpp>
--- a/test/algorithms/distance/distance_geo_linear_box.cpp
+++ b/test/algorithms/distance/distance_geo_linear_box.cpp
@@ -1,9 +1,10 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test

-// Copyright (c) 2017, 2018 Oracle and/or its affiliates.
+// Copyright (c) 2017-2020 Oracle and/or its affiliates.

 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle

 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -14,7 +15,6 @@
 #define BOOST_TEST_MODULE test_distance_geographic_linear_areal
 #endif

-#include <boost/range.hpp>
 #include <boost/type_traits/is_same.hpp>

 #include <boost/test/included/unit_test.hpp>
--- a/test/algorithms/distance/distance_se_geo_ar_ar.cpp
+++ b/test/algorithms/distance/distance_se_geo_ar_ar.cpp
@@ -1,9 +1,10 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test

-// Copyright (c) 2017, 2018 Oracle and/or its affiliates.
+// Copyright (c) 2017-2020 Oracle and/or its affiliates.

 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle

 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -12,7 +13,6 @@
 #define BOOST_TEST_MODULE test_distance_geographic_areal_areal
 #endif

-#include <boost/range.hpp>
 #include <boost/type_traits/is_same.hpp>

 #include <boost/test/included/unit_test.hpp>
--- a/test/algorithms/distance/distance_se_geo_l_ar.cpp
+++ b/test/algorithms/distance/distance_se_geo_l_ar.cpp
@@ -1,9 +1,10 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test

-// Copyright (c) 2017, 2018 Oracle and/or its affiliates.
+// Copyright (c) 2017-2020 Oracle and/or its affiliates.

 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle

 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -14,7 +15,6 @@
 #define BOOST_TEST_MODULE test_distance_geographic_linear_areal
 #endif

-#include <boost/range.hpp>
 #include <boost/type_traits/is_same.hpp>

 #include <boost/test/included/unit_test.hpp>
--- a/test/algorithms/distance/distance_se_geo_l_l.cpp
+++ b/test/algorithms/distance/distance_se_geo_l_l.cpp
@@ -1,9 +1,10 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test

-// Copyright (c) 2018 Oracle and/or its affiliates.
+// Copyright (c) 2018-2020 Oracle and/or its affiliates.

 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle

 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -14,7 +15,6 @@
 #define BOOST_TEST_MODULE test_distance_geographic_linear_linear
 #endif

-#include <boost/range.hpp>
 #include <boost/type_traits/is_same.hpp>

 #include <boost/test/included/unit_test.hpp>
--- a/test/algorithms/distance/distance_se_geo_pl_ar.cpp
+++ b/test/algorithms/distance/distance_se_geo_pl_ar.cpp
@@ -1,9 +1,10 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test

-// Copyright (c) 2017-2018, Oracle and/or its affiliates.
+// Copyright (c) 2017-2020, Oracle and/or its affiliates.

 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle

 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -14,7 +15,6 @@
 #define BOOST_TEST_MODULE test_distance_geographic_pointlike_areal
 #endif

-#include <boost/range.hpp>
 #include <boost/type_traits/is_same.hpp>

 #include <boost/test/included/unit_test.hpp>
--- a/test/algorithms/distance/distance_se_pl_pl.cpp
+++ b/test/algorithms/distance/distance_se_pl_pl.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test

-// Copyright (c) 2014-2018, Oracle and/or its affiliates.
+// Copyright (c) 2014-2020, Oracle and/or its affiliates.

 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
@@ -16,8 +16,6 @@
 #define BOOST_TEST_MODULE test_distance_spherical_equatorial_pointlike_pointlike
 #endif

-#include <boost/range.hpp>
-
 #include <boost/test/included/unit_test.hpp>
 #include <boost/geometry/strategies/strategies.hpp>

--- a/test/algorithms/set_operations/check_turn_less.hpp
+++ b/test/algorithms/set_operations/check_turn_less.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)

-// Copyright (c) 2015, 2019, Oracle and/or its affiliates.
+// Copyright (c) 2015-2020, Oracle and/or its affiliates.

 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@@ -11,7 +11,9 @@
 #ifndef BOOST_GEOMETRY_TEST_CHECK_TURN_LESS_HPP
 #define BOOST_GEOMETRY_TEST_CHECK_TURN_LESS_HPP

-#include <boost/range.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/size.hpp>

 #include "test_set_ops_linear_linear.hpp"

--- a/test/algorithms/set_operations/difference/test_difference.hpp
+++ b/test/algorithms/set_operations/difference/test_difference.hpp
@@ -4,8 +4,8 @@
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.

-// This file was modified by Oracle on 2016, 2017, 2019.
-// Modifications copyright (c) 2016-2019, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2016-2020.
+// Modifications copyright (c) 2016-2020, Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle

 // Use, modification and distribution is subject to the Boost Software License,
@@ -28,6 +28,7 @@
 #include <boost/foreach.hpp>

 #include <boost/range/algorithm/copy.hpp>
+#include <boost/range/size.hpp>

 #include <boost/geometry/algorithms/correct.hpp>
 #include <boost/geometry/algorithms/difference.hpp>
--- a/test/algorithms/set_operations/difference/test_difference_linear_linear.hpp
+++ b/test/algorithms/set_operations/difference/test_difference_linear_linear.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)

-// Copyright (c) 2014-2017, Oracle and/or its affiliates.
+// Copyright (c) 2014-2020, Oracle and/or its affiliates.
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle

@@ -13,6 +13,8 @@

 #include <limits>

+#include <boost/range/value_type.hpp>
+
 #include <boost/geometry/geometry.hpp>
 #include "../test_set_ops_linear_linear.hpp"
 #include "../check_turn_less.hpp"
--- a/test/algorithms/set_operations/intersection/intersection_areal_areal_linear.cpp
+++ b/test/algorithms/set_operations/intersection/intersection_areal_areal_linear.cpp
@@ -1,13 +1,14 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit test

-// Copyright (c) 2015, Oracle and/or its affiliates.
+// Copyright (c) 2015-2020, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle

 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html

-// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
-
 #ifndef BOOST_TEST_MODULE
 #define BOOST_TEST_MODULE test_intersection_linear_linear_areal
 #endif
@@ -19,8 +20,6 @@

 #include <boost/test/included/unit_test.hpp>

-#include <boost/range.hpp>
-
 #include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/geometries/multi_linestring.hpp>
 #include <boost/geometry/geometries/ring.hpp>
--- a/test/algorithms/set_operations/intersection/test_intersection.hpp
+++ b/test/algorithms/set_operations/intersection/test_intersection.hpp
@@ -3,8 +3,8 @@

 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.

-// This file was modified by Oracle on 2016, 2017.
-// Modifications copyright (c) 2016-2017, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2016-2020.
+// Modifications copyright (c) 2016-2020, Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle

 // Use, modification and distribution is subject to the Boost Software License,
@@ -18,6 +18,7 @@
 #include <iomanip>

 #include <boost/foreach.hpp>
+#include <boost/range/value_type.hpp>
 #include <boost/variant/variant.hpp>

 #include <boost/geometry/algorithms/intersection.hpp>
--- a/test/algorithms/set_operations/intersection/test_intersection_linear_linear.hpp
+++ b/test/algorithms/set_operations/intersection/test_intersection_linear_linear.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)

-// Copyright (c) 2014-2017, Oracle and/or its affiliates.
+// Copyright (c) 2014-2020, Oracle and/or its affiliates.
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle

@@ -13,6 +13,7 @@

 #include <limits>

+#include <boost/range/value_type.hpp>
 #include <boost/type_traits/is_same.hpp>

 #include <boost/geometry/geometry.hpp>
--- a/test/algorithms/set_operations/sym_difference/test_sym_difference_linear_linear.hpp
+++ b/test/algorithms/set_operations/sym_difference/test_sym_difference_linear_linear.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)

-// Copyright (c) 2014-2017, Oracle and/or its affiliates.
+// Copyright (c) 2014-2020, Oracle and/or its affiliates.
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle

@@ -13,6 +13,8 @@

 #include <limits>

+#include <boost/range/value_type.hpp>
+
 #include <boost/geometry/geometry.hpp>
 #include "../test_set_ops_linear_linear.hpp"
 #include <from_wkt.hpp>
--- a/test/algorithms/set_operations/test_get_turns_ll_invariance.hpp
+++ b/test/algorithms/set_operations/test_get_turns_ll_invariance.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)

-// Copyright (c) 2014, 2019, Oracle and/or its affiliates.
+// Copyright (c) 2014-2020, Oracle and/or its affiliates.

 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@@ -13,6 +13,10 @@

 #include <vector>

+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/size.hpp>
+
 #include <boost/geometry/algorithms/reverse.hpp>

 #include <boost/geometry/algorithms/detail/signed_size_type.hpp>
--- a/test/algorithms/set_operations/test_set_ops_linear_linear.hpp
+++ b/test/algorithms/set_operations/test_set_ops_linear_linear.hpp
@@ -1,12 +1,13 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)

-// Copyright (c) 2014-2015, Oracle and/or its affiliates.
+// Copyright (c) 2014-2020, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle

 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html

-// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
-
 #ifndef BOOST_GEOMETRY_TEST_SET_OPS_LINEAR_LINEAR_HPP
 #define BOOST_GEOMETRY_TEST_SET_OPS_LINEAR_LINEAR_HPP

@@ -17,7 +18,11 @@
 #include <algorithm>

 #include <boost/core/ignore_unused.hpp>
-#include <boost/range.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/iterator.hpp>
+#include <boost/range/size.hpp>
+#include <boost/range/value_type.hpp>
 #include <boost/typeof/typeof.hpp>

 #include <boost/geometry/policies/compare.hpp>
--- a/test/algorithms/set_operations/test_set_ops_pointlike.hpp
+++ b/test/algorithms/set_operations/test_set_ops_pointlike.hpp
@@ -22,6 +22,9 @@ namespace bg = ::boost::geometry;
 #include <algorithm>
 #include <fstream>
 #include <boost/core/ignore_unused.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/size.hpp>
 #include <boost/typeof/typeof.hpp>

 #include <boost/geometry/policies/compare.hpp>
--- a/test/algorithms/set_operations/union/test_union.hpp
+++ b/test/algorithms/set_operations/union/test_union.hpp
@@ -3,8 +3,8 @@

 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.

-// This file was modified by Oracle on 2015, 2016, 2017.
-// Modifications copyright (c) 2015-2017 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2015-2020.
+// Modifications copyright (c) 2015-2020 Oracle and/or its affiliates.
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle

@@ -26,6 +26,9 @@
 #include <boost/core/ignore_unused.hpp>
 #include <boost/foreach.hpp>
 #include <boost/range/algorithm/copy.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/iterator.hpp>

 #include <boost/geometry/algorithms/union.hpp>

--- a/test/algorithms/set_operations/union/test_union_linear_linear.hpp
+++ b/test/algorithms/set_operations/union/test_union_linear_linear.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)

-// Copyright (c) 2014-2017, Oracle and/or its affiliates.
+// Copyright (c) 2014-2020, Oracle and/or its affiliates.
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle

@@ -13,6 +13,8 @@

 #include <limits>

+#include <boost/range/value_type.hpp>
+
 #include <boost/geometry/geometry.hpp>
 #include "../test_set_ops_linear_linear.hpp"
 #include <from_wkt.hpp>
--- a/test/algorithms/test_is_valid.hpp
+++ b/test/algorithms/test_is_valid.hpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test

-// Copyright (c) 2014-2017, Oracle and/or its affiliates.
+// Copyright (c) 2014-2020, Oracle and/or its affiliates.

 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@@ -17,7 +17,10 @@
 #include <string>

 #include <boost/core/ignore_unused.hpp>
-#include <boost/range.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/size.hpp>
+#include <boost/range/value_type.hpp>
 #include <boost/variant/variant.hpp>

 #include <boost/geometry/core/closure.hpp>
--- a/test/geometries/initialization.cpp
+++ b/test/geometries/initialization.cpp
@@ -3,6 +3,10 @@

 // Copyright (c) 2014-2015 Adam Wulkiewicz, Lodz, Poland.

+// This file was modified by Oracle on 2020.
+// Modifications copyright (c) 2020 Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // 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)
@@ -10,7 +14,7 @@
 #include <geometry_test_common.hpp>

 #include <boost/assign.hpp>
-#include <boost/range.hpp>
+#include <boost/range/size.hpp>

 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
--- a/test/test_geometries/all_custom_linestring.hpp
+++ b/test/test_geometries/all_custom_linestring.hpp
@@ -2,6 +2,11 @@
 // Unit Test

 // Copyright (c) 2011-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2020.
+// Modifications copyright (c) 2020 Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // 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)
@@ -11,9 +16,6 @@

 #include <cstddef>

-#include <boost/range.hpp>
-
-
 #include <boost/geometry/core/mutable_range.hpp>
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
--- a/test/test_geometries/all_custom_polygon.hpp
+++ b/test/test_geometries/all_custom_polygon.hpp
@@ -3,6 +3,10 @@

 // Copyright (c) 2011-2012 Barend Gehrels, Amsterdam, the Netherlands.

+// This file was modified by Oracle on 2020.
+// Modifications copyright (c) 2020 Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // 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)
@@ -12,9 +16,6 @@

 #include <cstddef>

-#include <boost/range.hpp>
-
-
 #include <boost/geometry/core/mutable_range.hpp>
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
--- a/test/test_geometries/all_custom_ring.hpp
+++ b/test/test_geometries/all_custom_ring.hpp
@@ -3,6 +3,10 @@

 // Copyright (c) 2011-2012 Barend Gehrels, Amsterdam, the Netherlands.

+// This file was modified by Oracle on 2020.
+// Modifications copyright (c) 2020 Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // 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)
@@ -12,9 +16,6 @@

 #include <cstddef>

-#include <boost/range.hpp>
-
-
 #include <boost/geometry/core/mutable_range.hpp>
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
--- a/test/test_geometries/wrapped_boost_array.hpp
+++ b/test/test_geometries/wrapped_boost_array.hpp
@@ -3,6 +3,10 @@

 // Copyright (c) 2010-2012 Barend Gehrels, Amsterdam, the Netherlands.

+// This file was modified by Oracle on 2020.
+// Modifications copyright (c) 2020 Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // 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)
@@ -14,7 +18,7 @@
 #include <cstddef>

 #include <boost/array.hpp>
-#include <boost/range.hpp>
+#include <boost/range/iterator.hpp>

 #include <boost/geometry/core/mutable_range.hpp>
 #include <boost/geometry/core/tag.hpp>