From 7c8c60625cfaa956401fbe03a6576c3e2c68aa59 Mon Sep 17 00:00:00 2001 From: Vissarion Fisikopoulos Date: Tue, 25 Jul 2023 22:56:12 +0300 Subject: [PATCH] Add missing headers so that all headers compile independently (#1154) * Add missing headers so all header files compile independently * Add github actions script to check if all headers compile independently * Remove unused headers from algorithms (not detail) and core and fix headers in tests * Fix typo in headers.yml and missing header in srs --- .github/workflows/headers.yml | 71 +++++++++++++++++++ include/boost/geometry/algorithms/append.hpp | 6 +- include/boost/geometry/algorithms/area.hpp | 7 +- .../boost/geometry/algorithms/area_result.hpp | 11 +-- include/boost/geometry/algorithms/assign.hpp | 26 +++---- include/boost/geometry/algorithms/azimuth.hpp | 10 +-- .../boost/geometry/algorithms/centroid.hpp | 13 ++-- include/boost/geometry/algorithms/clear.hpp | 6 +- include/boost/geometry/algorithms/convert.hpp | 9 +-- include/boost/geometry/algorithms/correct.hpp | 11 +-- .../geometry/algorithms/correct_closure.hpp | 9 +-- include/boost/geometry/algorithms/densify.hpp | 5 +- .../buffer/turn_in_original_visitor.hpp | 6 +- .../closest_points/point_to_geometry.hpp | 4 +- .../range_to_geometry_rtree.hpp | 4 +- .../closest_points/segment_to_segment.hpp | 4 +- .../detail/closest_points/utilities.hpp | 5 +- .../detail/disjoint/multirange_geometry.hpp | 3 +- .../num_distinct_consecutive_points.hpp | 5 +- .../detail/overlay/assign_parents.hpp | 8 ++- .../detail/overlay/cluster_exits.hpp | 6 +- .../overlay/discard_duplicate_turns.hpp | 6 ++ .../detail/overlay/sort_by_side.hpp | 6 +- .../detail/within/within_no_turns.hpp | 7 +- .../boost/geometry/algorithms/difference.hpp | 9 ++- .../algorithms/discrete_frechet_distance.hpp | 10 +-- .../boost/geometry/algorithms/for_each.hpp | 11 +-- .../boost/geometry/algorithms/is_convex.hpp | 10 +-- .../boost/geometry/algorithms/is_empty.hpp | 3 +- include/boost/geometry/algorithms/length.hpp | 13 ++-- .../geometry/algorithms/line_interpolate.hpp | 11 +-- include/boost/geometry/algorithms/make.hpp | 5 +- .../geometry/algorithms/merge_elements.hpp | 4 +- .../geometry/algorithms/num_segments.hpp | 5 +- .../boost/geometry/algorithms/perimeter.hpp | 6 +- .../geometry/algorithms/point_on_surface.hpp | 12 +--- .../geometry/algorithms/remove_spikes.hpp | 10 +-- include/boost/geometry/algorithms/reverse.hpp | 6 +- .../boost/geometry/algorithms/simplify.hpp | 7 +- .../geometry/algorithms/sym_difference.hpp | 10 +-- .../boost/geometry/algorithms/transform.hpp | 12 ++-- include/boost/geometry/algorithms/union.hpp | 10 +-- .../boost/geometry/core/interior_rings.hpp | 6 +- include/boost/geometry/core/mutable_range.hpp | 6 +- .../formulas/interpolate_point_spherical.hpp | 3 +- .../index/detail/algorithms/content.hpp | 6 +- .../index/detail/algorithms/diff_abs.hpp | 6 +- .../index/detail/algorithms/margin.hpp | 6 +- .../detail/algorithms/path_intersection.hpp | 8 ++- .../index/detail/distance_predicates.hpp | 12 +++- .../geometry/index/detail/minmax_heap.hpp | 4 +- .../geometry/index/detail/predicates.hpp | 12 +++- .../detail/rtree/node/variant_dynamic.hpp | 6 +- .../index/detail/rtree/node/weak_dynamic.hpp | 7 +- .../index/detail/rtree/pack_create.hpp | 9 ++- .../index/detail/rtree/rstar/insert.hpp | 6 +- .../detail/rtree/utilities/are_counts_ok.hpp | 6 +- .../detail/rtree/utilities/are_levels_ok.hpp | 6 +- .../index/detail/rtree/utilities/print.hpp | 9 ++- .../detail/rtree/utilities/statistics.hpp | 9 ++- .../detail/rtree/visitors/children_box.hpp | 8 ++- .../index/detail/rtree/visitors/count.hpp | 11 ++- .../index/detail/rtree/visitors/destroy.hpp | 9 ++- .../detail/rtree/visitors/distance_query.hpp | 6 +- .../index/detail/rtree/visitors/insert.hpp | 6 +- .../index/detail/rtree/visitors/iterator.hpp | 6 +- .../index/detail/rtree/visitors/remove.hpp | 9 ++- .../detail/rtree/visitors/spatial_query.hpp | 6 +- .../geometry/index/detail/serialization.hpp | 9 +-- .../predicate_based_interrupt_policy.hpp | 5 +- .../boost/geometry/srs/projections/dpar.hpp | 4 +- .../geometry/srs/projections/proj/cass.hpp | 1 + .../geometry/srs/projections/str_cast.hpp | 8 +-- .../strategies/cartesian/buffer_end_round.hpp | 16 +++-- .../cartesian/centroid_weighted_length.hpp | 8 ++- .../cartesian/closest_points_pt_seg.hpp | 4 +- .../cartesian/side_rounded_input.hpp | 8 +++ .../cartesian/turn_in_ring_winding.hpp | 5 ++ .../spherical/envelope_multipoint.hpp | 3 +- include/boost/geometry/util/sequence.hpp | 6 +- .../boost/geometry/views/closeable_view.hpp | 11 +-- .../views/detail/closed_clockwise_view.hpp | 9 +-- .../views/detail/random_access_view.hpp | 6 +- .../boost/geometry/views/reversible_view.hpp | 11 +-- test/algorithms/merge_elements.cpp | 7 +- test/algorithms/test_simplify.hpp | 10 +-- test/geometries/box.cpp | 8 ++- test/geometries/linestring.cpp | 5 ++ test/geometries/multi_point.cpp | 5 ++ test/geometries/multi_polygon.cpp | 6 ++ test/geometries/polygon.cpp | 22 +++--- test/geometries/ring.cpp | 6 ++ test/headers/Jamfile | 7 +- test/strategies/matrix_transformer.cpp | 7 +- test/strategies/transformer.cpp | 14 ++-- test/util/algorithm.cpp | 5 +- 96 files changed, 493 insertions(+), 313 deletions(-) create mode 100644 .github/workflows/headers.yml diff --git a/.github/workflows/headers.yml b/.github/workflows/headers.yml new file mode 100644 index 0000000000..295f01eb56 --- /dev/null +++ b/.github/workflows/headers.yml @@ -0,0 +1,71 @@ +############################################################################## +# GitHub Actions Workflow for Boost.Geometry to check if all headers compile +# independently +# +# Copyright (c) 2023, Oracle and/or its affiliates. +# Contributed and/or modified by Vissarion Fysikopoulos, 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) +############################################################################## +name: headers + +on: [push, pull_request] + +jobs: + build: + name: Compile headers + runs-on: ubuntu-latest + steps: + - name: Set up environment + id: setenv + run: | + if [[ "$GITHUB_REF" == *master ]]; then + echo "BOOST_BRANCH=master" >> $GITHUB_ENV + else + echo "BOOST_BRANCH=develop" >> $GITHUB_ENV + fi + echo "BOOST_SELF=$(basename $GITHUB_WORKSPACE)" >> $GITHUB_ENV + echo "BOOST_ROOT=$GITHUB_WORKSPACE/boost-root" >> $GITHUB_ENV + echo "::set-output name=boost_self::$(basename $GITHUB_WORKSPACE)" + echo "::set-output name=boost_root::$GITHUB_WORKSPACE/boost-root" + + - name: Clone boostorg/boost + run: | + git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git $BOOST_ROOT + cd $BOOST_ROOT + git submodule update -q --init libs/headers + git submodule update -q --init tools/boost_install + git submodule update -q --init tools/boostbook + git submodule update -q --init tools/boostdep + git submodule update -q --init tools/build + git submodule update -q --init tools/quickbook + mkdir -p libs/$BOOST_SELF + + - uses: actions/checkout@v2 + with: + path: ${{ steps.setenv.outputs.boost_root }}/libs/${{ steps.setenv.outputs.boost_self }} + + - name: Run tools/boostdep/depinst/depinst.py + run: | + cd $BOOST_ROOT + python tools/boostdep/depinst/depinst.py ../tools/quickbook + python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools $BOOST_SELF + + - name: Bootstrap boostorg/boost + run: | + gcc --version + cd $BOOST_ROOT + ./bootstrap.sh --with-toolset=gcc + ./b2 headers + test -f /usr/local/bin/b2 && rm -rf /usr/local/bin/b2 + test -f /usr/local/bin/bjam && rm -rf /usr/local/bin/bjam + sudo cp $BOOST_ROOT/b2 /usr/local/bin/ + ls -l /usr/local/bin/b2 + b2 -v + + - name: Build libs/geometry/test/headers + run: | + cd $BOOST_ROOT + $BOOST_ROOT/b2 libs/geometry/test/headers diff --git a/include/boost/geometry/algorithms/append.hpp b/include/boost/geometry/algorithms/append.hpp index 55dbc6ea16..4bb25fcb11 100644 --- a/include/boost/geometry/algorithms/append.hpp +++ b/include/boost/geometry/algorithms/append.hpp @@ -4,8 +4,9 @@ // Copyright (c) 2008-2014 Bruno Lalande, Paris, France. // Copyright (c) 2009-2014 Mateusz Loskot, London, UK. -// This file was modified by Oracle on 2014-2021. -// Modifications copyright (c) 2014-2021, Oracle and/or its affiliates. +// This file was modified by Oracle on 2014-2023. +// Modifications copyright (c) 2014-2023, 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 @@ -27,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/include/boost/geometry/algorithms/area.hpp b/include/boost/geometry/algorithms/area.hpp index 28ab0a21d6..9b5af61e12 100644 --- a/include/boost/geometry/algorithms/area.hpp +++ b/include/boost/geometry/algorithms/area.hpp @@ -5,8 +5,9 @@ // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. // Copyright (c) 2017-2022 Adam Wulkiewicz, Lodz, Poland. -// This file was modified by Oracle on 2017-2021. -// Modifications copyright (c) 2017-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2017-2023. +// Modifications copyright (c) 2017-2023 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 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library @@ -53,8 +54,6 @@ #include #include -#include - #include diff --git a/include/boost/geometry/algorithms/area_result.hpp b/include/boost/geometry/algorithms/area_result.hpp index 686b26c73e..73d9f52c5d 100644 --- a/include/boost/geometry/algorithms/area_result.hpp +++ b/include/boost/geometry/algorithms/area_result.hpp @@ -2,8 +2,9 @@ // Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland. -// This file was modified by Oracle on 2020-2021. -// Modifications copyright (c) 2020-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2020-2023. +// Modifications copyright (c) 2020-2023 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 // Use, modification and distribution is subject to the Boost Software License, @@ -19,18 +20,12 @@ #include #include -#include -#include -#include -#include #include #include #include #include -#include -#include namespace boost { namespace geometry { diff --git a/include/boost/geometry/algorithms/assign.hpp b/include/boost/geometry/algorithms/assign.hpp index fa621d71aa..dabf1b4a57 100644 --- a/include/boost/geometry/algorithms/assign.hpp +++ b/include/boost/geometry/algorithms/assign.hpp @@ -5,8 +5,9 @@ // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. // Copyright (c) 2014 Samuel Debionne, Grenoble, France. -// This file was modified by Oracle on 2020-2021. -// Modifications copyright (c) 2020-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2020-2023. +// Modifications copyright (c) 2020-2023 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 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library @@ -19,29 +20,18 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_ASSIGN_HPP #define BOOST_GEOMETRY_ALGORITHMS_ASSIGN_HPP - -#include - -#include -#include -#include -#include - -#include #include #include +#include +#include +#include + #include #include #include -#include -#include -#include -#include -#include -#include + #include -#include #include diff --git a/include/boost/geometry/algorithms/azimuth.hpp b/include/boost/geometry/algorithms/azimuth.hpp index 8ba4af4cff..7056c512c9 100644 --- a/include/boost/geometry/algorithms/azimuth.hpp +++ b/include/boost/geometry/algorithms/azimuth.hpp @@ -2,8 +2,8 @@ // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. -// This file was modified by Oracle on 2014-2021. -// Modifications copyright (c) 2014-2021, Oracle and/or its affiliates. +// This file was modified by Oracle on 2014-2023. +// Modifications copyright (c) 2014-2023, 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 @@ -17,11 +17,8 @@ #include -#include -#include #include #include -#include #include @@ -30,9 +27,6 @@ #include #include -#include - - namespace boost { namespace geometry { diff --git a/include/boost/geometry/algorithms/centroid.hpp b/include/boost/geometry/algorithms/centroid.hpp index 93695c08b2..9559f06b92 100644 --- a/include/boost/geometry/algorithms/centroid.hpp +++ b/include/boost/geometry/algorithms/centroid.hpp @@ -5,10 +5,11 @@ // Copyright (c) 2009-2015 Mateusz Loskot, London, UK. // Copyright (c) 2014-2017 Adam Wulkiewicz, Lodz, Poland. -// This file was modified by Oracle on 2014-2021. -// Modifications copyright (c) 2014-2021 Oracle and/or its affiliates. -// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle +// This file was modified by Oracle on 2014-2023. +// Modifications copyright (c) 2014-2023 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 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. @@ -29,22 +30,16 @@ #include #include -#include -#include -#include #include #include #include -#include #include #include #include -#include #include #include #include -#include #include #include diff --git a/include/boost/geometry/algorithms/clear.hpp b/include/boost/geometry/algorithms/clear.hpp index 26d60c57f2..df3acc8bdc 100644 --- a/include/boost/geometry/algorithms/clear.hpp +++ b/include/boost/geometry/algorithms/clear.hpp @@ -4,8 +4,9 @@ // Copyright (c) 2008-2012 Bruno Lalande, Paris, France. // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. -// This file was modified by Oracle on 2020-2021. -// Modifications copyright (c) 2020-2021, Oracle and/or its affiliates. +// This file was modified by Oracle on 2020-2023. +// Modifications copyright (c) 2020-2023, 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 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library @@ -22,7 +23,6 @@ #include #include -#include #include #include #include diff --git a/include/boost/geometry/algorithms/convert.hpp b/include/boost/geometry/algorithms/convert.hpp index 3235768110..2d07ce2b7f 100644 --- a/include/boost/geometry/algorithms/convert.hpp +++ b/include/boost/geometry/algorithms/convert.hpp @@ -5,8 +5,9 @@ // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. // Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland. -// This file was modified by Oracle on 2017-2021. -// Modifications copyright (c) 2017-2021, Oracle and/or its affiliates. +// This file was modified by Oracle on 2017-2023. +// Modifications copyright (c) 2017-2023, 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 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library @@ -28,7 +29,6 @@ #include #include #include -#include #include #include @@ -39,9 +39,6 @@ #include #include -#include - -#include #include #include #include diff --git a/include/boost/geometry/algorithms/correct.hpp b/include/boost/geometry/algorithms/correct.hpp index 263af100a4..20a94de85c 100644 --- a/include/boost/geometry/algorithms/correct.hpp +++ b/include/boost/geometry/algorithms/correct.hpp @@ -5,8 +5,9 @@ // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. // Copyright (c) 2014-2017 Adam Wulkiewicz, Lodz, Poland. -// This file was modified by Oracle on 2017-2021. -// Modifications copyright (c) 2017-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2017-2023. +// Modifications copyright (c) 2017-2023 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 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library @@ -21,24 +22,18 @@ #include -#include #include #include #include -#include #include #include #include #include -#include -#include #include #include -#include -#include #include #include diff --git a/include/boost/geometry/algorithms/correct_closure.hpp b/include/boost/geometry/algorithms/correct_closure.hpp index baa41bc5bc..38d982c91b 100644 --- a/include/boost/geometry/algorithms/correct_closure.hpp +++ b/include/boost/geometry/algorithms/correct_closure.hpp @@ -2,8 +2,9 @@ // Copyright (c) 2017 Barend Gehrels, Amsterdam, the Netherlands. -// This file was modified by Oracle on 2020-2021. -// Modifications copyright (c) 2020-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2020-2023. +// Modifications copyright (c) 2020-2023 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 // Use, modification and distribution is subject to the Boost Software License, @@ -13,22 +14,18 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_CORRECT_CLOSURE_HPP #define BOOST_GEOMETRY_ALGORITHMS_CORRECT_CLOSURE_HPP -#include - #include #include #include #include #include -#include #include #include #include #include -#include namespace boost { namespace geometry { diff --git a/include/boost/geometry/algorithms/densify.hpp b/include/boost/geometry/algorithms/densify.hpp index b8069053a6..3af062ebd3 100644 --- a/include/boost/geometry/algorithms/densify.hpp +++ b/include/boost/geometry/algorithms/densify.hpp @@ -2,7 +2,8 @@ // Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland. -// Copyright (c) 2017-2021, Oracle and/or its affiliates. +// Copyright (c) 2017-2023, 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. @@ -22,9 +23,7 @@ #include #include #include -#include #include -#include #include #include #include diff --git a/include/boost/geometry/algorithms/detail/buffer/turn_in_original_visitor.hpp b/include/boost/geometry/algorithms/detail/buffer/turn_in_original_visitor.hpp index 5ef188c2c6..daa59b618b 100644 --- a/include/boost/geometry/algorithms/detail/buffer/turn_in_original_visitor.hpp +++ b/include/boost/geometry/algorithms/detail/buffer/turn_in_original_visitor.hpp @@ -2,8 +2,9 @@ // Copyright (c) 2014 Barend Gehrels, Amsterdam, the Netherlands. -// This file was modified by Oracle on 2016-2020. -// Modifications copyright (c) 2016-2020 Oracle and/or its affiliates. +// This file was modified by Oracle on 2016-2023. +// Modifications copyright (c) 2016-2023 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 // Use, modification and distribution is subject to the Boost Software License, @@ -18,6 +19,7 @@ #include #include +#include #include #include #include diff --git a/include/boost/geometry/algorithms/detail/closest_points/point_to_geometry.hpp b/include/boost/geometry/algorithms/detail/closest_points/point_to_geometry.hpp index 043f8fcbf8..5771858518 100644 --- a/include/boost/geometry/algorithms/detail/closest_points/point_to_geometry.hpp +++ b/include/boost/geometry/algorithms/detail/closest_points/point_to_geometry.hpp @@ -1,6 +1,6 @@ // Boost.Geometry -// Copyright (c) 2021, Oracle and/or its affiliates. +// Copyright (c) 2021-2023, Oracle and/or its affiliates. // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle @@ -22,10 +22,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include diff --git a/include/boost/geometry/algorithms/detail/closest_points/range_to_geometry_rtree.hpp b/include/boost/geometry/algorithms/detail/closest_points/range_to_geometry_rtree.hpp index 8fa6b4a93a..1bb44b53cd 100644 --- a/include/boost/geometry/algorithms/detail/closest_points/range_to_geometry_rtree.hpp +++ b/include/boost/geometry/algorithms/detail/closest_points/range_to_geometry_rtree.hpp @@ -1,6 +1,6 @@ // Boost.Geometry -// Copyright (c) 2021, Oracle and/or its affiliates. +// Copyright (c) 2021-2023, Oracle and/or its affiliates. // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle @@ -14,9 +14,11 @@ #include #include +#include #include #include #include +#include #include #include diff --git a/include/boost/geometry/algorithms/detail/closest_points/segment_to_segment.hpp b/include/boost/geometry/algorithms/detail/closest_points/segment_to_segment.hpp index b7b8381a88..15d28cd690 100644 --- a/include/boost/geometry/algorithms/detail/closest_points/segment_to_segment.hpp +++ b/include/boost/geometry/algorithms/detail/closest_points/segment_to_segment.hpp @@ -1,6 +1,6 @@ // Boost.Geometry -// Copyright (c) 2021, Oracle and/or its affiliates. +// Copyright (c) 2021-2023, Oracle and/or its affiliates. // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle @@ -16,8 +16,10 @@ #include #include +#include #include #include +#include #include #include diff --git a/include/boost/geometry/algorithms/detail/closest_points/utilities.hpp b/include/boost/geometry/algorithms/detail/closest_points/utilities.hpp index 279a17cfa6..858c86efb8 100644 --- a/include/boost/geometry/algorithms/detail/closest_points/utilities.hpp +++ b/include/boost/geometry/algorithms/detail/closest_points/utilities.hpp @@ -1,6 +1,6 @@ // Boost.Geometry -// Copyright (c) 2021, Oracle and/or its affiliates. +// Copyright (c) 2021-2023, Oracle and/or its affiliates. // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle @@ -10,6 +10,9 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_CLOSEST_POINTS_UTILITIES_HPP #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_CLOSEST_POINTS_UTILITIES_HPP +#include +#include + #include namespace boost { namespace geometry diff --git a/include/boost/geometry/algorithms/detail/disjoint/multirange_geometry.hpp b/include/boost/geometry/algorithms/detail/disjoint/multirange_geometry.hpp index 42750af34b..2dccbae934 100644 --- a/include/boost/geometry/algorithms/detail/disjoint/multirange_geometry.hpp +++ b/include/boost/geometry/algorithms/detail/disjoint/multirange_geometry.hpp @@ -1,6 +1,6 @@ // Boost.Geometry (aka GGL, Generic Geometry Library) -// Copyright (c) 2014-2021, Oracle and/or its affiliates. +// Copyright (c) 2014-2023, 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 @@ -12,6 +12,7 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_MULTIRANGE_GEOMETRY_HPP #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_MULTIRANGE_GEOMETRY_HPP +#include #include #include diff --git a/include/boost/geometry/algorithms/detail/num_distinct_consecutive_points.hpp b/include/boost/geometry/algorithms/detail/num_distinct_consecutive_points.hpp index 508e9b604b..4b94ed4c4f 100644 --- a/include/boost/geometry/algorithms/detail/num_distinct_consecutive_points.hpp +++ b/include/boost/geometry/algorithms/detail/num_distinct_consecutive_points.hpp @@ -1,7 +1,8 @@ // Boost.Geometry (aka GGL, Generic Geometry Library) -// Copyright (c) 2014-2020, Oracle and/or its affiliates. +// Copyright (c) 2014-2023, 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 @@ -19,6 +20,8 @@ #include #include +#include + namespace boost { namespace geometry { diff --git a/include/boost/geometry/algorithms/detail/overlay/assign_parents.hpp b/include/boost/geometry/algorithms/detail/overlay/assign_parents.hpp index 70617cfbc9..fb3ee1bef2 100644 --- a/include/boost/geometry/algorithms/detail/overlay/assign_parents.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/assign_parents.hpp @@ -3,8 +3,9 @@ // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland. -// This file was modified by Oracle on 2017-2022. -// Modifications copyright (c) 2017-2022 Oracle and/or its affiliates. +// This file was modified by Oracle on 2017-2023. +// Modifications copyright (c) 2017-2023 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 // Use, modification and distribution is subject to the Boost Software License, @@ -18,6 +19,8 @@ #include #include + +#include #include #include #include @@ -26,6 +29,7 @@ #include #include + #include namespace boost { namespace geometry diff --git a/include/boost/geometry/algorithms/detail/overlay/cluster_exits.hpp b/include/boost/geometry/algorithms/detail/overlay/cluster_exits.hpp index 6875493cf0..8c4f4c7f31 100644 --- a/include/boost/geometry/algorithms/detail/overlay/cluster_exits.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/cluster_exits.hpp @@ -2,8 +2,9 @@ // Copyright (c) 2020 Barend Gehrels, Amsterdam, the Netherlands. -// This file was modified by Oracle on 2020. -// Modifications copyright (c) 2020 Oracle and/or its affiliates. +// This file was modified by Oracle on 2020-2023. +// Modifications copyright (c) 2020-2023 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 // Use, modification and distribution is subject to the Boost Software License, @@ -22,6 +23,7 @@ #include #include #include +#include #include #include diff --git a/include/boost/geometry/algorithms/detail/overlay/discard_duplicate_turns.hpp b/include/boost/geometry/algorithms/detail/overlay/discard_duplicate_turns.hpp index f5a4a82656..258a815f09 100644 --- a/include/boost/geometry/algorithms/detail/overlay/discard_duplicate_turns.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/discard_duplicate_turns.hpp @@ -2,6 +2,10 @@ // Copyright (c) 2021 Barend Gehrels, Amsterdam, the Netherlands. +// This file was modified by Oracle on 2023. +// Modifications copyright (c) 2023 Oracle and/or its affiliates. +// Contributed and/or modified by Vissarion Fysikopoulos, 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) @@ -9,6 +13,8 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_DISCARD_DUPLICATE_TURNS_HPP #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_DISCARD_DUPLICATE_TURNS_HPP +#include + #include #include diff --git a/include/boost/geometry/algorithms/detail/overlay/sort_by_side.hpp b/include/boost/geometry/algorithms/detail/overlay/sort_by_side.hpp index e30fc4d675..503b36720a 100644 --- a/include/boost/geometry/algorithms/detail/overlay/sort_by_side.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/sort_by_side.hpp @@ -3,9 +3,10 @@ // Copyright (c) 2015 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland. -// This file was modified by Oracle on 2017, 2019. -// Modifications copyright (c) 2017, 2019 Oracle and/or its affiliates. +// This file was modified by Oracle on 2017-2023. +// Modifications copyright (c) 2017-2023 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 // Use, modification and distribution is subject to the Boost Software License, @@ -17,6 +18,7 @@ #include #include +#include #include #include diff --git a/include/boost/geometry/algorithms/detail/within/within_no_turns.hpp b/include/boost/geometry/algorithms/detail/within/within_no_turns.hpp index c344251515..d6d0417c3b 100644 --- a/include/boost/geometry/algorithms/detail/within/within_no_turns.hpp +++ b/include/boost/geometry/algorithms/detail/within/within_no_turns.hpp @@ -4,8 +4,9 @@ // Copyright (c) 2008-2012 Bruno Lalande, Paris, France. // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. -// This file was modified by Oracle on 2013. -// Modifications copyright (c) 2013, Oracle and/or its affiliates. +// This file was modified by Oracle on 2013-2023. +// Modifications copyright (c) 2013-2023, Oracle and/or its affiliates. +// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. @@ -106,7 +107,7 @@ struct within_no_turns } // Now check if holes of G2 aren't inside G1 auto const& rings2 = geometry::interior_rings(geometry2); - for (auto it2 = boost::begin(rings2); it != boost::end(rings2); ++it) + for (auto it2 = boost::begin(rings2); it2 != boost::end(rings2); ++it2) { point2_type p2; if (! geometry::point_on_border(p2, *it2)) diff --git a/include/boost/geometry/algorithms/difference.hpp b/include/boost/geometry/algorithms/difference.hpp index b04e15a318..ec6e4ea734 100644 --- a/include/boost/geometry/algorithms/difference.hpp +++ b/include/boost/geometry/algorithms/difference.hpp @@ -2,9 +2,9 @@ // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. -// This file was modified by Oracle on 2017-2022. -// Modifications copyright (c) 2017-2022, Oracle and/or its affiliates. - +// This file was modified by Oracle on 2017-2023. +// Modifications copyright (c) 2017-2023, 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 // Use, modification and distribution is subject to the Boost Software License, @@ -21,14 +21,13 @@ #include #include #include -#include +#include // For backward compatibility #include #include #include #include #include #include -#include #include #include diff --git a/include/boost/geometry/algorithms/discrete_frechet_distance.hpp b/include/boost/geometry/algorithms/discrete_frechet_distance.hpp index fb264d5b7a..094ae14a3b 100644 --- a/include/boost/geometry/algorithms/discrete_frechet_distance.hpp +++ b/include/boost/geometry/algorithms/discrete_frechet_distance.hpp @@ -4,8 +4,9 @@ // Contributed and/or modified by Yaghyavardhan Singh Khangarot, // as part of Google Summer of Code 2018 program. -// This file was modified by Oracle on 2018-2021. -// Modifications copyright (c) 2018-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2018-2023. +// Modifications copyright (c) 2018-2023 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 // Use, modification and distribution is subject to the Boost Software License, @@ -15,16 +16,11 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_DISCRETE_FRECHET_DISTANCE_HPP #define BOOST_GEOMETRY_ALGORITHMS_DISCRETE_FRECHET_DISTANCE_HPP -#include - #ifdef BOOST_GEOMETRY_DEBUG_FRECHET_DISTANCE #include #endif -#include -#include #include -#include #include #include diff --git a/include/boost/geometry/algorithms/for_each.hpp b/include/boost/geometry/algorithms/for_each.hpp index 5bf2a2caab..d03643ab1b 100644 --- a/include/boost/geometry/algorithms/for_each.hpp +++ b/include/boost/geometry/algorithms/for_each.hpp @@ -5,9 +5,9 @@ // Copyright (c) 2009-2014 Mateusz Loskot, London, UK. // Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland. -// This file was modified by Oracle on 2014-2020. -// Modifications copyright (c) 2014-2020, Oracle and/or its affiliates. - +// This file was modified by Oracle on 2014-2023. +// Modifications copyright (c) 2014-2023, 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 @@ -22,8 +22,6 @@ #define BOOST_GEOMETRY_ALGORITHMS_FOR_EACH_HPP -#include - #include #include #include @@ -41,9 +39,6 @@ #include -#include -#include - #include diff --git a/include/boost/geometry/algorithms/is_convex.hpp b/include/boost/geometry/algorithms/is_convex.hpp index 691b56533f..afde6453f5 100644 --- a/include/boost/geometry/algorithms/is_convex.hpp +++ b/include/boost/geometry/algorithms/is_convex.hpp @@ -2,9 +2,9 @@ // Copyright (c) 2015 Barend Gehrels, Amsterdam, the Netherlands. -// This file was modified by Oracle on 2017-2021. -// Modifications copyright (c) 2017-2021 Oracle and/or its affiliates. - +// This file was modified by Oracle on 2017-2023. +// Modifications copyright (c) 2017-2023 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 // Use, modification and distribution is subject to the Boost Software License, @@ -20,12 +20,8 @@ #include #include #include -#include #include -#include -#include #include -#include #include #include #include // For backward compatibility diff --git a/include/boost/geometry/algorithms/is_empty.hpp b/include/boost/geometry/algorithms/is_empty.hpp index 1961b0b83e..ddb7faaf8b 100644 --- a/include/boost/geometry/algorithms/is_empty.hpp +++ b/include/boost/geometry/algorithms/is_empty.hpp @@ -1,6 +1,6 @@ // Boost.Geometry (aka GGL, Generic Geometry Library) -// Copyright (c) 2015-2021, Oracle and/or its affiliates. +// Copyright (c) 2015-2023, 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 @@ -20,7 +20,6 @@ #include #include -#include #include #include #include diff --git a/include/boost/geometry/algorithms/length.hpp b/include/boost/geometry/algorithms/length.hpp index cc3219f585..6e4533896a 100644 --- a/include/boost/geometry/algorithms/length.hpp +++ b/include/boost/geometry/algorithms/length.hpp @@ -4,9 +4,9 @@ // Copyright (c) 2008-2014 Bruno Lalande, Paris, France. // Copyright (c) 2009-2014 Mateusz Loskot, London, UK. -// This file was modified by Oracle on 2014-2021. -// Modifications copyright (c) 2014-2021, Oracle and/or its affiliates. - +// This file was modified by Oracle on 2014-2023. +// Modifications copyright (c) 2014-2023, 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 @@ -20,22 +20,17 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_LENGTH_HPP #define BOOST_GEOMETRY_ALGORITHMS_LENGTH_HPP -#include - -#include #include #include -#include #include -#include +#include "boost/geometry/algorithms/detail/assign_indexed_point.hpp" #include #include #include // #include #include -#include #include #include #include diff --git a/include/boost/geometry/algorithms/line_interpolate.hpp b/include/boost/geometry/algorithms/line_interpolate.hpp index ad87b1d8a4..5739c444ee 100644 --- a/include/boost/geometry/algorithms/line_interpolate.hpp +++ b/include/boost/geometry/algorithms/line_interpolate.hpp @@ -1,6 +1,6 @@ // Boost.Geometry (aka GGL, Generic Geometry Library) -// Copyright (c) 2018-2021 Oracle and/or its affiliates. +// Copyright (c) 2018-2023 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 @@ -11,21 +11,19 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_LINE_INTERPOLATE_HPP #define BOOST_GEOMETRY_ALGORITHMS_LINE_INTERPOLATE_HPP -#include #include #include #include -#include #include +#include #include #include #include #include -#include -#include +#include #include #include @@ -38,8 +36,11 @@ #include #include +#include #include +#include + namespace boost { namespace geometry { diff --git a/include/boost/geometry/algorithms/make.hpp b/include/boost/geometry/algorithms/make.hpp index b3a3034bf2..40cc5c0e4a 100644 --- a/include/boost/geometry/algorithms/make.hpp +++ b/include/boost/geometry/algorithms/make.hpp @@ -4,7 +4,8 @@ // Copyright (c) 2008-2012 Bruno Lalande, Paris, France. // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. -// Copyright (c) 2020, Oracle and/or its affiliates. +// Copyright (c) 2020-2023, 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 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library @@ -19,7 +20,7 @@ #include -#include +#include "boost/geometry/algorithms/detail/assign_values.hpp" #include diff --git a/include/boost/geometry/algorithms/merge_elements.hpp b/include/boost/geometry/algorithms/merge_elements.hpp index 06a3e1ccf9..c1c12d1b4a 100644 --- a/include/boost/geometry/algorithms/merge_elements.hpp +++ b/include/boost/geometry/algorithms/merge_elements.hpp @@ -1,7 +1,8 @@ // Boost.Geometry -// Copyright (c) 2022, Oracle and/or its affiliates. +// Copyright (c) 2022-2023, 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. @@ -29,7 +30,6 @@ #include #include #include -#include namespace boost { namespace geometry diff --git a/include/boost/geometry/algorithms/num_segments.hpp b/include/boost/geometry/algorithms/num_segments.hpp index 556f8bfe93..d73a8b4fc4 100644 --- a/include/boost/geometry/algorithms/num_segments.hpp +++ b/include/boost/geometry/algorithms/num_segments.hpp @@ -1,7 +1,8 @@ // Boost.Geometry (aka GGL, Generic Geometry Library) -// Copyright (c) 2014-2021, Oracle and/or its affiliates. +// Copyright (c) 2014-2023, 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 @@ -28,8 +29,6 @@ #include // For backward compatibility #include -#include - namespace boost { namespace geometry { diff --git a/include/boost/geometry/algorithms/perimeter.hpp b/include/boost/geometry/algorithms/perimeter.hpp index 290caeb416..3b7f7e693c 100644 --- a/include/boost/geometry/algorithms/perimeter.hpp +++ b/include/boost/geometry/algorithms/perimeter.hpp @@ -4,8 +4,9 @@ // Copyright (c) 2008-2014 Bruno Lalande, Paris, France. // Copyright (c) 2009-2014 Mateusz Loskot, London, UK. -// This file was modified by Oracle on 2014-2021. -// Modifications copyright (c) 2014-2021, Oracle and/or its affiliates. +// This file was modified by Oracle on 2014-2023. +// Modifications copyright (c) 2014-2023, 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 @@ -28,7 +29,6 @@ // #include #include -#include #include #include #include diff --git a/include/boost/geometry/algorithms/point_on_surface.hpp b/include/boost/geometry/algorithms/point_on_surface.hpp index 966cd8535c..5b90db472a 100644 --- a/include/boost/geometry/algorithms/point_on_surface.hpp +++ b/include/boost/geometry/algorithms/point_on_surface.hpp @@ -5,8 +5,9 @@ // Copyright (c) 2009-2013 Mateusz Loskot, London, UK. // Copyright (c) 2013-2017 Adam Wulkiewicz, Lodz, Poland. -// This file was modified by Oracle on 2014-2020. -// Modifications copyright (c) 2014-2020 Oracle and/or its affiliates. +// This file was modified by Oracle on 2014-2023. +// Modifications copyright (c) 2014-2023 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 // Use, modification and distribution is subject to the Boost Software License, @@ -16,23 +17,16 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_POINT_ON_SURFACE_HPP #define BOOST_GEOMETRY_ALGORITHMS_POINT_ON_SURFACE_HPP - -#include -#include - -#include #include #include #include -#include #include #include #include -#include #include diff --git a/include/boost/geometry/algorithms/remove_spikes.hpp b/include/boost/geometry/algorithms/remove_spikes.hpp index 533d43330b..7a144db154 100644 --- a/include/boost/geometry/algorithms/remove_spikes.hpp +++ b/include/boost/geometry/algorithms/remove_spikes.hpp @@ -5,9 +5,9 @@ // Copyright (c) 2009-2013 Mateusz Loskot, London, UK. // Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland. -// This file was modified by Oracle on 2017-2020. -// Modifications copyright (c) 2017-2020 Oracle and/or its affiliates. - +// This file was modified by Oracle on 2017-2023. +// Modifications copyright (c) 2017-2023 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 // Use, modification and distribution is subject to the Boost Software License, @@ -17,8 +17,6 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_REMOVE_SPIKES_HPP #define BOOST_GEOMETRY_ALGORITHMS_REMOVE_SPIKES_HPP -#include - #include #include #include @@ -28,10 +26,8 @@ #include #include -#include #include #include -#include #include #include diff --git a/include/boost/geometry/algorithms/reverse.hpp b/include/boost/geometry/algorithms/reverse.hpp index 45b16b2bf5..307f8294fa 100644 --- a/include/boost/geometry/algorithms/reverse.hpp +++ b/include/boost/geometry/algorithms/reverse.hpp @@ -5,8 +5,9 @@ // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. // Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland. -// This file was modified by Oracle on 2020-2021. -// Modifications copyright (c) 2020-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2020-2023. +// Modifications copyright (c) 2020-2023 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 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library @@ -31,7 +32,6 @@ #include #include // For backward compatibility #include -#include namespace boost { namespace geometry diff --git a/include/boost/geometry/algorithms/simplify.hpp b/include/boost/geometry/algorithms/simplify.hpp index 312de9636e..40c66e91a8 100644 --- a/include/boost/geometry/algorithms/simplify.hpp +++ b/include/boost/geometry/algorithms/simplify.hpp @@ -5,8 +5,9 @@ // Copyright (c) 2009-2015 Mateusz Loskot, London, UK. // Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland. -// This file was modified by Oracle on 2018-2022. -// Modifications copyright (c) 2018-2022 Oracle and/or its affiliates. +// This file was modified by Oracle on 2018-2023. +// Modifications copyright (c) 2018-2023 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 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library @@ -27,7 +28,6 @@ #include #include -#include #include #include #include @@ -54,7 +54,6 @@ #include // For backward compatibility #include -#include #include #include #include diff --git a/include/boost/geometry/algorithms/sym_difference.hpp b/include/boost/geometry/algorithms/sym_difference.hpp index 60ff8f64cd..894e88c7cc 100644 --- a/include/boost/geometry/algorithms/sym_difference.hpp +++ b/include/boost/geometry/algorithms/sym_difference.hpp @@ -2,9 +2,9 @@ // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands. -// This file was modified by Oracle on 2015-2022. -// Modifications copyright (c) 2015-2022 Oracle and/or its affiliates. - +// This file was modified by Oracle on 2015-2023. +// Modifications copyright (c) 2015-2023 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 @@ -16,12 +16,9 @@ #define BOOST_GEOMETRY_ALGORITHMS_SYM_DIFFERENCE_HPP -#include #include -#include #include -#include #include #include #include @@ -31,7 +28,6 @@ #include #include #include -#include namespace boost { namespace geometry diff --git a/include/boost/geometry/algorithms/transform.hpp b/include/boost/geometry/algorithms/transform.hpp index 12120eb28c..66d56d7143 100644 --- a/include/boost/geometry/algorithms/transform.hpp +++ b/include/boost/geometry/algorithms/transform.hpp @@ -5,8 +5,9 @@ // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. // Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland. -// This file was modified by Oracle on 2020. -// Modifications copyright (c) 2020 Oracle and/or its affiliates. +// This file was modified by Oracle on 2020-2023. +// Modifications copyright (c) 2020-2023 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 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library @@ -19,8 +20,6 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_TRANSFORM_HPP #define BOOST_GEOMETRY_ALGORITHMS_TRANSFORM_HPP -#include -#include #include #include @@ -28,19 +27,18 @@ #include #include -#include #include #include -#include #include +#include "boost/geometry/algorithms/detail/assign_indexed_point.hpp" +#include "boost/geometry/algorithms/detail/assign_values.hpp" #include #include #include #include #include -#include #include #include #include diff --git a/include/boost/geometry/algorithms/union.hpp b/include/boost/geometry/algorithms/union.hpp index 395292d022..3d88cc1414 100644 --- a/include/boost/geometry/algorithms/union.hpp +++ b/include/boost/geometry/algorithms/union.hpp @@ -2,9 +2,9 @@ // Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands. -// This file was modified by Oracle on 2014-2022. -// Modifications copyright (c) 2014-2022 Oracle and/or its affiliates. - +// This file was modified by Oracle on 2014-2023. +// Modifications copyright (c) 2014-2023 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 @@ -16,11 +16,8 @@ #define BOOST_GEOMETRY_ALGORITHMS_UNION_HPP -#include - #include #include -#include #include #include #include @@ -36,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/include/boost/geometry/core/interior_rings.hpp b/include/boost/geometry/core/interior_rings.hpp index 52e6b756af..b8b5c6280d 100644 --- a/include/boost/geometry/core/interior_rings.hpp +++ b/include/boost/geometry/core/interior_rings.hpp @@ -4,8 +4,9 @@ // Copyright (c) 2008-2012 Bruno Lalande, Paris, France. // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. -// This file was modified by Oracle on 2020. -// Modifications copyright (c) 2020, Oracle and/or its affiliates. +// This file was modified by Oracle on 2020-2023. +// Modifications copyright (c) 2020-2023, 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 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library @@ -18,7 +19,6 @@ #ifndef BOOST_GEOMETRY_CORE_INTERIOR_RINGS_HPP #define BOOST_GEOMETRY_CORE_INTERIOR_RINGS_HPP -#include #include #include diff --git a/include/boost/geometry/core/mutable_range.hpp b/include/boost/geometry/core/mutable_range.hpp index d6a4a44fbf..365beb7ae9 100644 --- a/include/boost/geometry/core/mutable_range.hpp +++ b/include/boost/geometry/core/mutable_range.hpp @@ -4,8 +4,9 @@ // Copyright (c) 2008-2012 Bruno Lalande, Paris, France. // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. -// This file was modified by Oracle on 2020-2021. -// Modifications copyright (c) 2020-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2020-2023. +// Modifications copyright (c) 2020-2023 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 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library @@ -19,7 +20,6 @@ #define BOOST_GEOMETRY_CORE_MUTABLE_RANGE_HPP -#include #include #include diff --git a/include/boost/geometry/formulas/interpolate_point_spherical.hpp b/include/boost/geometry/formulas/interpolate_point_spherical.hpp index 5c2d03a72b..ad0b746997 100644 --- a/include/boost/geometry/formulas/interpolate_point_spherical.hpp +++ b/include/boost/geometry/formulas/interpolate_point_spherical.hpp @@ -1,6 +1,6 @@ // Boost.Geometry -// Copyright (c) 2019-2021 Oracle and/or its affiliates. +// Copyright (c) 2019-2023 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 @@ -12,6 +12,7 @@ #ifndef BOOST_GEOMETRY_FORMULAS_INTERPOLATE_POINT_SPHERICAL_HPP #define BOOST_GEOMETRY_FORMULAS_INTERPOLATE_POINT_SPHERICAL_HPP +#include #include #include diff --git a/include/boost/geometry/index/detail/algorithms/content.hpp b/include/boost/geometry/index/detail/algorithms/content.hpp index e7944f8a85..f7dfe373d8 100644 --- a/include/boost/geometry/index/detail/algorithms/content.hpp +++ b/include/boost/geometry/index/detail/algorithms/content.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2020-2022. -// Modifications copyright (c) 2020-2022 Oracle and/or its affiliates. +// This file was modified by Oracle on 2020-2023. +// Modifications copyright (c) 2020-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -15,6 +16,7 @@ #ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_CONTENT_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_CONTENT_HPP +#include #include #include #include diff --git a/include/boost/geometry/index/detail/algorithms/diff_abs.hpp b/include/boost/geometry/index/detail/algorithms/diff_abs.hpp index 96304acc51..e696ac581d 100644 --- a/include/boost/geometry/index/detail/algorithms/diff_abs.hpp +++ b/include/boost/geometry/index/detail/algorithms/diff_abs.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2020. -// Modifications copyright (c) 2020, Oracle and/or its affiliates. +// This file was modified by Oracle on 2020-2023. +// Modifications copyright (c) 2020-2023, 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -15,6 +16,7 @@ #ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_DIFF_ABS_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_DIFF_ABS_HPP +#include #include namespace boost { namespace geometry { namespace index { namespace detail diff --git a/include/boost/geometry/index/detail/algorithms/margin.hpp b/include/boost/geometry/index/detail/algorithms/margin.hpp index 2b9b77a012..dc86a511ee 100644 --- a/include/boost/geometry/index/detail/algorithms/margin.hpp +++ b/include/boost/geometry/index/detail/algorithms/margin.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2020-2022. -// Modifications copyright (c) 2020-2022 Oracle and/or its affiliates. +// This file was modified by Oracle on 2020-2023. +// Modifications copyright (c) 2020-2023, 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -15,6 +16,7 @@ #ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_MARGIN_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_MARGIN_HPP +#include #include #include #include diff --git a/include/boost/geometry/index/detail/algorithms/path_intersection.hpp b/include/boost/geometry/index/detail/algorithms/path_intersection.hpp index baa1d3f1a7..831efe5046 100644 --- a/include/boost/geometry/index/detail/algorithms/path_intersection.hpp +++ b/include/boost/geometry/index/detail/algorithms/path_intersection.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2017 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2020-2021. -// Modifications copyright (c) 2020-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2020-2023. +// Modifications copyright (c) 2020-2023, 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -16,6 +17,9 @@ #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_PATH_INTERSECTION_HPP +#include +#include + #include #include diff --git a/include/boost/geometry/index/detail/distance_predicates.hpp b/include/boost/geometry/index/detail/distance_predicates.hpp index 69ce456333..e8420cc6ba 100644 --- a/include/boost/geometry/index/detail/distance_predicates.hpp +++ b/include/boost/geometry/index/detail/distance_predicates.hpp @@ -5,8 +5,9 @@ // // Copyright (c) 2011-2015 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2019-2021. -// Modifications copyright (c) 2019-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2019-2023. +// Modifications copyright (c) 2019-2023, 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -18,6 +19,13 @@ #include +#include +#include +#include +#include +#include +#include + #include #include #include diff --git a/include/boost/geometry/index/detail/minmax_heap.hpp b/include/boost/geometry/index/detail/minmax_heap.hpp index 7d03c09f0b..4864ce8f5f 100644 --- a/include/boost/geometry/index/detail/minmax_heap.hpp +++ b/include/boost/geometry/index/detail/minmax_heap.hpp @@ -1,6 +1,7 @@ // Boost.Geometry -// Copyright (c) 2021, Oracle and/or its affiliates. +// Copyright (c) 2021-2023, 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. @@ -10,6 +11,7 @@ #define BOOST_GEOMETRY_INDEX_DETAIL_MINMAX_HEAP_HPP #include +#include #include #include diff --git a/include/boost/geometry/index/detail/predicates.hpp b/include/boost/geometry/index/detail/predicates.hpp index bba53aa25e..e6f2401982 100644 --- a/include/boost/geometry/index/detail/predicates.hpp +++ b/include/boost/geometry/index/detail/predicates.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2015 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2019-2021. -// Modifications copyright (c) 2019-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2019-2023. +// Modifications copyright (c) 2019-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -19,6 +20,13 @@ #include //#include +#include +#include +#include +#include +#include +#include + #include #include #include diff --git a/include/boost/geometry/index/detail/rtree/node/variant_dynamic.hpp b/include/boost/geometry/index/detail/rtree/node/variant_dynamic.hpp index 05d909ab76..c545a4160a 100644 --- a/include/boost/geometry/index/detail/rtree/node/variant_dynamic.hpp +++ b/include/boost/geometry/index/detail/rtree/node/variant_dynamic.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2023 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2021. -// Modifications copyright (c) 2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2021-2023. +// Modifications copyright (c) 2021-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -24,6 +25,7 @@ #include #include #include +#include namespace boost { namespace geometry { namespace index { diff --git a/include/boost/geometry/index/detail/rtree/node/weak_dynamic.hpp b/include/boost/geometry/index/detail/rtree/node/weak_dynamic.hpp index b5680fa580..8c2ec41475 100644 --- a/include/boost/geometry/index/detail/rtree/node/weak_dynamic.hpp +++ b/include/boost/geometry/index/detail/rtree/node/weak_dynamic.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2023 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2021. -// Modifications copyright (c) 2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2021-2023. +// Modifications copyright (c) 2021-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -18,10 +19,12 @@ #include #include #include +#include #include #include #include +#include #include namespace boost { namespace geometry { namespace index { diff --git a/include/boost/geometry/index/detail/rtree/pack_create.hpp b/include/boost/geometry/index/detail/rtree/pack_create.hpp index 0556c1085c..33600a4c93 100644 --- a/include/boost/geometry/index/detail/rtree/pack_create.hpp +++ b/include/boost/geometry/index/detail/rtree/pack_create.hpp @@ -5,8 +5,9 @@ // Copyright (c) 2011-2023 Adam Wulkiewicz, Lodz, Poland. // Copyright (c) 2020 Caian Benedicto, Campinas, Brazil. // -// This file was modified by Oracle on 2019-2021. -// Modifications copyright (c) 2019-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2019-2023. +// Modifications copyright (c) 2019-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -18,11 +19,13 @@ #include +#include #include #include -#include #include +#include +#include #include #include #include diff --git a/include/boost/geometry/index/detail/rtree/rstar/insert.hpp b/include/boost/geometry/index/detail/rtree/rstar/insert.hpp index bac010fa24..b3ad01c345 100644 --- a/include/boost/geometry/index/detail/rtree/rstar/insert.hpp +++ b/include/boost/geometry/index/detail/rtree/rstar/insert.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2015 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2019-2021. -// Modifications copyright (c) 2019-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2019-2023. +// Modifications copyright (c) 2019-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -19,6 +20,7 @@ #include +#include #include #include diff --git a/include/boost/geometry/index/detail/rtree/utilities/are_counts_ok.hpp b/include/boost/geometry/index/detail/rtree/utilities/are_counts_ok.hpp index 3ed6db496b..30a55dd4f5 100644 --- a/include/boost/geometry/index/detail/rtree/utilities/are_counts_ok.hpp +++ b/include/boost/geometry/index/detail/rtree/utilities/are_counts_ok.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2015 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2019. -// Modifications copyright (c) 2019 Oracle and/or its affiliates. +// This file was modified by Oracle on 2019-2023. +// Modifications copyright (c) 2019-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -16,6 +17,7 @@ #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_UTILITIES_ARE_COUNTS_OK_HPP #include +#include namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree { namespace utilities { diff --git a/include/boost/geometry/index/detail/rtree/utilities/are_levels_ok.hpp b/include/boost/geometry/index/detail/rtree/utilities/are_levels_ok.hpp index 2c9cec32cc..c107e91138 100644 --- a/include/boost/geometry/index/detail/rtree/utilities/are_levels_ok.hpp +++ b/include/boost/geometry/index/detail/rtree/utilities/are_levels_ok.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2019. -// Modifications copyright (c) 2019 Oracle and/or its affiliates. +// This file was modified by Oracle on 2019-2023. +// Modifications copyright (c) 2019-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -16,6 +17,7 @@ #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_UTILITIES_ARE_LEVELS_OK_HPP #include +#include namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree { namespace utilities { diff --git a/include/boost/geometry/index/detail/rtree/utilities/print.hpp b/include/boost/geometry/index/detail/rtree/utilities/print.hpp index fb885496f3..ddb2d9cb5c 100644 --- a/include/boost/geometry/index/detail/rtree/utilities/print.hpp +++ b/include/boost/geometry/index/detail/rtree/utilities/print.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2019-2021. -// Modifications copyright (c) 2019-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2019-2023. +// Modifications copyright (c) 2019-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -23,6 +24,10 @@ #include #include +#include +#include +#include + namespace boost { namespace geometry { namespace index { namespace detail { namespace utilities { diff --git a/include/boost/geometry/index/detail/rtree/utilities/statistics.hpp b/include/boost/geometry/index/detail/rtree/utilities/statistics.hpp index 84380443be..53be32cca5 100644 --- a/include/boost/geometry/index/detail/rtree/utilities/statistics.hpp +++ b/include/boost/geometry/index/detail/rtree/utilities/statistics.hpp @@ -5,8 +5,9 @@ // Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland. // Copyright (c) 2013 Mateusz Loskot, London, UK. // -// This file was modified by Oracle on 2019-2020. -// Modifications copyright (c) 2019-2020 Oracle and/or its affiliates. +// This file was modified by Oracle on 2019-2023. +// Modifications copyright (c) 2019-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -19,6 +20,10 @@ #include #include +#include +#include +#include + namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree { namespace utilities { namespace visitors { diff --git a/include/boost/geometry/index/detail/rtree/visitors/children_box.hpp b/include/boost/geometry/index/detail/rtree/visitors/children_box.hpp index 1dde1408c9..61bf7d69af 100644 --- a/include/boost/geometry/index/detail/rtree/visitors/children_box.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/children_box.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2015 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2019. -// Modifications copyright (c) 2019 Oracle and/or its affiliates. +// This file was modified by Oracle on 2019-2023. +// Modifications copyright (c) 2019-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -15,6 +16,9 @@ #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_CHILDREN_BOX_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_CHILDREN_BOX_HPP +#include +#include + namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree { namespace visitors { diff --git a/include/boost/geometry/index/detail/rtree/visitors/count.hpp b/include/boost/geometry/index/detail/rtree/visitors/count.hpp index c166fe3e36..2e4353fe52 100644 --- a/include/boost/geometry/index/detail/rtree/visitors/count.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/count.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2019. -// Modifications copyright (c) 2019 Oracle and/or its affiliates. +// This file was modified by Oracle on 2019-2023. +// Modifications copyright (c) 2019-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -15,6 +16,12 @@ #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_COUNT_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_COUNT_HPP +#include +#include +#include +#include +#include + namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree { namespace visitors { diff --git a/include/boost/geometry/index/detail/rtree/visitors/destroy.hpp b/include/boost/geometry/index/detail/rtree/visitors/destroy.hpp index 4afb867cdf..f217a4ab1b 100644 --- a/include/boost/geometry/index/detail/rtree/visitors/destroy.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/destroy.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2019. -// Modifications copyright (c) 2019 Oracle and/or its affiliates. +// This file was modified by Oracle on 2019-2023. +// Modifications copyright (c) 2019-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -15,6 +16,10 @@ #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_DELETE_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_DELETE_HPP +#include +#include +#include + namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree { namespace visitors { diff --git a/include/boost/geometry/index/detail/rtree/visitors/distance_query.hpp b/include/boost/geometry/index/detail/rtree/visitors/distance_query.hpp index 9ebc999413..de2f68f88a 100644 --- a/include/boost/geometry/index/detail/rtree/visitors/distance_query.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/distance_query.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2019-2021. -// Modifications copyright (c) 2019-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2019-2023. +// Modifications copyright (c) 2019-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -20,6 +21,7 @@ #include #include #include +#include #include #include #include diff --git a/include/boost/geometry/index/detail/rtree/visitors/insert.hpp b/include/boost/geometry/index/detail/rtree/visitors/insert.hpp index a2fa697696..2d87e21a17 100644 --- a/include/boost/geometry/index/detail/rtree/visitors/insert.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/insert.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2023 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2019-2021. -// Modifications copyright (c) 2019-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2019-2023. +// Modifications copyright (c) 2019-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -24,6 +25,7 @@ #include #include +#include #include #include #include diff --git a/include/boost/geometry/index/detail/rtree/visitors/iterator.hpp b/include/boost/geometry/index/detail/rtree/visitors/iterator.hpp index 71127dcbe2..1a08f2b3f0 100644 --- a/include/boost/geometry/index/detail/rtree/visitors/iterator.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/iterator.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2015 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2021. -// Modifications copyright (c) 2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2021-2023. +// Modifications copyright (c) 2021-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -17,6 +18,7 @@ #include #include +#include namespace boost { namespace geometry { namespace index { diff --git a/include/boost/geometry/index/detail/rtree/visitors/remove.hpp b/include/boost/geometry/index/detail/rtree/visitors/remove.hpp index f6ab0b0450..4e8e9078f2 100644 --- a/include/boost/geometry/index/detail/rtree/visitors/remove.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/remove.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2017 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2019-2021. -// Modifications copyright (c) 2019-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2019-2023. +// Modifications copyright (c) 2019-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -17,9 +18,13 @@ #include +#include +#include +#include #include #include #include +#include #include namespace boost { namespace geometry { namespace index { diff --git a/include/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp b/include/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp index 3da964b4be..678f9ddd74 100644 --- a/include/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp @@ -4,8 +4,9 @@ // // Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2019-2021. -// Modifications copyright (c) 2019-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2019-2023. +// Modifications copyright (c) 2019-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -16,6 +17,7 @@ #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_SPATIAL_QUERY_HPP #include +#include #include #include diff --git a/include/boost/geometry/index/detail/serialization.hpp b/include/boost/geometry/index/detail/serialization.hpp index 6c0aa06a55..acb8cde2aa 100644 --- a/include/boost/geometry/index/detail/serialization.hpp +++ b/include/boost/geometry/index/detail/serialization.hpp @@ -2,8 +2,9 @@ // // Copyright (c) 2011-2023 Adam Wulkiewicz, Lodz, Poland. // -// This file was modified by Oracle on 2021. -// Modifications copyright (c) 2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2021-2023. +// Modifications copyright (c) 2021-2023 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 // // Use, modification and distribution is subject to the Boost Software License, @@ -16,10 +17,10 @@ #include #include -//#include +#include #include #include -//#include +#include #include #include diff --git a/include/boost/geometry/policies/predicate_based_interrupt_policy.hpp b/include/boost/geometry/policies/predicate_based_interrupt_policy.hpp index e72cd17f4e..79f420790e 100644 --- a/include/boost/geometry/policies/predicate_based_interrupt_policy.hpp +++ b/include/boost/geometry/policies/predicate_based_interrupt_policy.hpp @@ -1,6 +1,6 @@ // Boost.Geometry (aka GGL, Generic Geometry Library) -// Copyright (c) 2014-2021, Oracle and/or its affiliates. +// Copyright (c) 2014-2023, 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 @@ -12,7 +12,10 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_POLICIES_PREDICATE_BASED_INTERRUPT_POLICY_HPP #define BOOST_GEOMETRY_ALGORITHMS_POLICIES_PREDICATE_BASED_INTERRUPT_POLICY_HPP +#include + #include +#include #include diff --git a/include/boost/geometry/srs/projections/dpar.hpp b/include/boost/geometry/srs/projections/dpar.hpp index 21c7040a74..696246c18f 100644 --- a/include/boost/geometry/srs/projections/dpar.hpp +++ b/include/boost/geometry/srs/projections/dpar.hpp @@ -2,7 +2,7 @@ // Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland. -// Copyright (c) 2017-2022, Oracle and/or its affiliates. +// Copyright (c) 2017-2023, 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 @@ -33,6 +33,8 @@ #include #include #include + +#include #include diff --git a/include/boost/geometry/srs/projections/proj/cass.hpp b/include/boost/geometry/srs/projections/proj/cass.hpp index 50f20493a4..2cca32882c 100644 --- a/include/boost/geometry/srs/projections/proj/cass.hpp +++ b/include/boost/geometry/srs/projections/proj/cass.hpp @@ -47,6 +47,7 @@ #include #include #include +#include namespace boost { namespace geometry { diff --git a/include/boost/geometry/srs/projections/str_cast.hpp b/include/boost/geometry/srs/projections/str_cast.hpp index 81c49434ff..e3729e2be5 100644 --- a/include/boost/geometry/srs/projections/str_cast.hpp +++ b/include/boost/geometry/srs/projections/str_cast.hpp @@ -1,6 +1,7 @@ // Boost.Geometry -// Copyright (c) 2018-2020, Oracle and/or its affiliates. +// Copyright (c) 2018-2023, 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 // Use, modification and distribution is subject to the Boost Software License, @@ -10,13 +11,10 @@ #ifndef BOOST_GEOMETRY_SRS_PROJECTIONS_STR_CAST_HPP #define BOOST_GEOMETRY_SRS_PROJECTIONS_STR_CAST_HPP -#include -#include -#include - #include #include #include +#include namespace boost { namespace geometry { diff --git a/include/boost/geometry/strategies/cartesian/buffer_end_round.hpp b/include/boost/geometry/strategies/cartesian/buffer_end_round.hpp index 6cee14bcad..47ecb22e72 100644 --- a/include/boost/geometry/strategies/cartesian/buffer_end_round.hpp +++ b/include/boost/geometry/strategies/cartesian/buffer_end_round.hpp @@ -2,9 +2,9 @@ // Copyright (c) 2012-2015 Barend Gehrels, Amsterdam, the Netherlands. -// This file was modified by Oracle on 2015. -// Modifications copyright (c) 2015, Oracle and/or its affiliates. - +// This file was modified by Oracle on 2015-2023. +// Modifications copyright (c) 2015-2023, 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 // Use, modification and distribution is subject to the Boost Software License, @@ -16,7 +16,9 @@ #include +#include #include +#include #include #include #include @@ -80,8 +82,8 @@ private : for (std::size_t i = 0; i < point_buffer_count; i++, alpha -= diff) { typename boost::range_value::type p; - set<0>(p, get<0>(point) + buffer_distance * cos(alpha)); - set<1>(p, get<1>(point) + buffer_distance * sin(alpha)); + geometry::set<0>(p, geometry::get<0>(point) + buffer_distance * cos(alpha)); + geometry::set<1>(p, geometry::get<1>(point) + buffer_distance * sin(alpha)); range_out.push_back(p); } } @@ -144,8 +146,8 @@ public : : (dist_left - dist_right)) / two; Point shifted_point; - set<0>(shifted_point, get<0>(ultimate_point) + dist_half * cos(alpha)); - set<1>(shifted_point, get<1>(ultimate_point) + dist_half * sin(alpha)); + geometry::set<0>(shifted_point, geometry::get<0>(ultimate_point) + dist_half * cos(alpha)); + geometry::set<1>(shifted_point, geometry::get<1>(ultimate_point) + dist_half * sin(alpha)); generate_points(shifted_point, alpha, dist_average, range_out); } diff --git a/include/boost/geometry/strategies/cartesian/centroid_weighted_length.hpp b/include/boost/geometry/strategies/cartesian/centroid_weighted_length.hpp index c536d5bc24..477d68b892 100644 --- a/include/boost/geometry/strategies/cartesian/centroid_weighted_length.hpp +++ b/include/boost/geometry/strategies/cartesian/centroid_weighted_length.hpp @@ -3,9 +3,9 @@ // Copyright (c) 2009-2015 Mateusz Loskot, London, UK. // Copyright (c) 2009-2015 Barend Gehrels, Amsterdam, the Netherlands. -// This file was modified by Oracle on 2015-2021. -// Modifications copyright (c) 2015-2021, Oracle and/or its affiliates. - +// This file was modified by Oracle on 2015-2023. +// Modifications copyright (c) 2015-2023, 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 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library @@ -21,6 +21,8 @@ #include #include +#include + #include // Helper geometry diff --git a/include/boost/geometry/strategies/cartesian/closest_points_pt_seg.hpp b/include/boost/geometry/strategies/cartesian/closest_points_pt_seg.hpp index 5ead8add90..557cd48dd6 100644 --- a/include/boost/geometry/strategies/cartesian/closest_points_pt_seg.hpp +++ b/include/boost/geometry/strategies/cartesian/closest_points_pt_seg.hpp @@ -1,6 +1,6 @@ // Boost.Geometry -// Copyright (c) 2021, Oracle and/or its affiliates. +// Copyright (c) 2021-2023, Oracle and/or its affiliates. // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle @@ -10,6 +10,8 @@ #ifndef BOOST_GEOMETRY_STRATEGIES_CARTESIAN_CLOSEST_POINTS_PT_SEG_HPP #define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_CLOSEST_POINTS_PT_SEG_HPP +#include + #include #include diff --git a/include/boost/geometry/strategies/cartesian/side_rounded_input.hpp b/include/boost/geometry/strategies/cartesian/side_rounded_input.hpp index 9c7fcafbb0..fc1543008f 100644 --- a/include/boost/geometry/strategies/cartesian/side_rounded_input.hpp +++ b/include/boost/geometry/strategies/cartesian/side_rounded_input.hpp @@ -2,6 +2,10 @@ // Copyright (c) 2021 Tinko Bartels, Berlin, Germany. +// This file was modified by Oracle on 2023. +// Modifications copyright (c) 2023 Oracle and/or its affiliates. +// Contributed and/or modified by Vissarion Fysikopoulos, 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) @@ -9,9 +13,13 @@ #ifndef BOOST_GEOMETRY_STRATEGY_CARTESIAN_SIDE_ROUNDED_INPUT_HPP #define BOOST_GEOMETRY_STRATEGY_CARTESIAN_SIDE_ROUNDED_INPUT_HPP +#include +#include #include +#include + #include #include diff --git a/include/boost/geometry/strategies/cartesian/turn_in_ring_winding.hpp b/include/boost/geometry/strategies/cartesian/turn_in_ring_winding.hpp index a029535d51..fcbc03bca9 100644 --- a/include/boost/geometry/strategies/cartesian/turn_in_ring_winding.hpp +++ b/include/boost/geometry/strategies/cartesian/turn_in_ring_winding.hpp @@ -3,6 +3,10 @@ // Copyright (c) 2020 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland. +// This file was modified by Oracle on 2023. +// Modifications copyright (c) 2023 Oracle and/or its affiliates. +// Contributed and/or modified by Vissarion Fysikopoulos, 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,6 +14,7 @@ #ifndef BOOST_GEOMETRY_STRATEGIES_CARTESIAN_TURN_IN_RING_WINDING_HPP #define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_TURN_IN_RING_WINDING_HPP +#include #include #include #include diff --git a/include/boost/geometry/strategy/spherical/envelope_multipoint.hpp b/include/boost/geometry/strategy/spherical/envelope_multipoint.hpp index 1f31321e55..7302c41bea 100644 --- a/include/boost/geometry/strategy/spherical/envelope_multipoint.hpp +++ b/include/boost/geometry/strategy/spherical/envelope_multipoint.hpp @@ -2,7 +2,7 @@ // Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland. -// Copyright (c) 2015-2020, Oracle and/or its affiliates. +// Copyright (c) 2015-2023, 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 @@ -42,6 +42,7 @@ #include #include +#include #include #include #include diff --git a/include/boost/geometry/util/sequence.hpp b/include/boost/geometry/util/sequence.hpp index 3f643ef6c5..d6c31c9a69 100644 --- a/include/boost/geometry/util/sequence.hpp +++ b/include/boost/geometry/util/sequence.hpp @@ -1,7 +1,7 @@ // Boost.Geometry -// Copyright (c) 2020-2021, Oracle and/or its affiliates. - +// Copyright (c) 2020-2023, 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. @@ -10,7 +10,7 @@ #ifndef BOOST_GEOMETRY_UTIL_SEQUENCE_HPP #define BOOST_GEOMETRY_UTIL_SEQUENCE_HPP - +#include #include diff --git a/include/boost/geometry/views/closeable_view.hpp b/include/boost/geometry/views/closeable_view.hpp index 08e2f19a7d..c3c4b14085 100644 --- a/include/boost/geometry/views/closeable_view.hpp +++ b/include/boost/geometry/views/closeable_view.hpp @@ -4,8 +4,9 @@ // Copyright (c) 2008-2012 Bruno Lalande, Paris, France. // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. -// This file was modified by Oracle on 2020-2021. -// Modifications copyright (c) 2020-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2020-2023. +// Modifications copyright (c) 2020-2023 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 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library @@ -124,17 +125,17 @@ namespace traits template -struct tag > +struct tag > : geometry::tag {}; template -struct point_order > +struct point_order > : geometry::point_order {}; template -struct closure > +struct closure > { static const closure_selector value = closed; }; diff --git a/include/boost/geometry/views/detail/closed_clockwise_view.hpp b/include/boost/geometry/views/detail/closed_clockwise_view.hpp index 071f85f5dc..2d76409d2e 100644 --- a/include/boost/geometry/views/detail/closed_clockwise_view.hpp +++ b/include/boost/geometry/views/detail/closed_clockwise_view.hpp @@ -5,7 +5,8 @@ // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. // This file was modified by Oracle on 2014-2021. -// Modifications copyright (c) 2014-2021 Oracle and/or its affiliates. +// Modifications copyright (c) 2014-2023 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 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library @@ -72,18 +73,18 @@ namespace traits { template -struct tag > +struct tag > : geometry::tag {}; template -struct point_order > +struct point_order > { static const order_selector value = clockwise; }; template -struct closure > +struct closure > { static const closure_selector value = closed; }; diff --git a/include/boost/geometry/views/detail/random_access_view.hpp b/include/boost/geometry/views/detail/random_access_view.hpp index 575a90f12a..e7c1227554 100644 --- a/include/boost/geometry/views/detail/random_access_view.hpp +++ b/include/boost/geometry/views/detail/random_access_view.hpp @@ -1,7 +1,7 @@ // Boost.Geometry -// Copyright (c) 2022, Oracle and/or its affiliates. - +// Copyright (c) 2022-2023, 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. @@ -10,6 +10,8 @@ #ifndef BOOST_GEOMETRY_VIEWS_DETAIL_RANDOM_ACCESS_VIEW_HPP #define BOOST_GEOMETRY_VIEWS_DETAIL_RANDOM_ACCESS_VIEW_HPP +#include + #include #include #include diff --git a/include/boost/geometry/views/reversible_view.hpp b/include/boost/geometry/views/reversible_view.hpp index 25b22f8e15..5aad54382c 100644 --- a/include/boost/geometry/views/reversible_view.hpp +++ b/include/boost/geometry/views/reversible_view.hpp @@ -4,8 +4,9 @@ // Copyright (c) 2008-2012 Bruno Lalande, Paris, France. // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. -// This file was modified by Oracle on 2020-2021. -// Modifications copyright (c) 2020-2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2020-2023. +// Modifications copyright (c) 2020-2023 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 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library @@ -102,18 +103,18 @@ namespace traits template -struct tag > +struct tag > : geometry::tag {}; template -struct point_order > +struct point_order > { static const order_selector value = clockwise; }; template -struct closure > +struct closure > : geometry::closure {}; diff --git a/test/algorithms/merge_elements.cpp b/test/algorithms/merge_elements.cpp index 7bc3cb0d06..2c4a472cb4 100644 --- a/test/algorithms/merge_elements.cpp +++ b/test/algorithms/merge_elements.cpp @@ -1,8 +1,9 @@ // Boost.Geometry // Unit Test -// Copyright (c) 2022, Oracle and/or its affiliates. +// Copyright (c) 2022-2023, 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. @@ -62,7 +63,7 @@ void test_all(std::size_t points_count, std::size_t linestrings_count, std::size decltype(a) a_expected = area; BOOST_CHECK_CLOSE(l, l_expected, 0.000001); BOOST_CHECK_CLOSE(p, p_expected, 0.000001); - BOOST_CHECK_CLOSE(a, a_expected, 0.000001); + BOOST_CHECK_CLOSE(a, a_expected, 0.000001); } int test_main(int, char* []) @@ -72,6 +73,6 @@ int test_main(int, char* []) // only different geometries stored in a GC. Hence duplicated point in the result. test_all>>(4, 6, 2, 0.48141804683843953, 1.2506937915396685, 0.029392562222852522); test_all>>(4, 6, 2, 3058383.6297531724, 7951118.1434133006, 1187967114570.5911); - + return 0; } diff --git a/test/algorithms/test_simplify.hpp b/test/algorithms/test_simplify.hpp index 352c5e8815..0439a4313c 100644 --- a/test/algorithms/test_simplify.hpp +++ b/test/algorithms/test_simplify.hpp @@ -3,8 +3,9 @@ // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. -// This file was modified by Oracle on 2021. -// Modifications copyright (c) 2021 Oracle and/or its affiliates. +// This file was modified by Oracle on 2021-2023. +// Modifications copyright (c) 2021-2023 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 // Use, modification and distribution is subject to the Boost Software License, @@ -24,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -178,7 +180,7 @@ void test_geometry(std::string const& wkt, using variant_t = typename boost_variant_type::type; variant_t v(geometry); - + // Define default strategy for testing typedef bg::strategy::simplify::douglas_peucker < @@ -190,7 +192,7 @@ void test_geometry(std::string const& wkt, check_geometry(geometry, expected, distance); check_geometry(v, expected, distance); - + check_geometry(geometry, expected, distance, dp()); check_geometry(v, expected, distance, dp()); diff --git a/test/geometries/box.cpp b/test/geometries/box.cpp index ab7d271ce0..cfe5fbfdca 100644 --- a/test/geometries/box.cpp +++ b/test/geometries/box.cpp @@ -5,8 +5,9 @@ // Copyright (c) 2008-2012 Bruno Lalande, Paris, France. // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. -// This file was modified by Oracle on 2020. -// Modifications copyright (c) 2020, Oracle and/or its affiliates. +// This file was modified by Oracle on 2020-2023. +// Modifications copyright (c) 2020-2023, 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 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library @@ -19,13 +20,14 @@ #include +#include #include - #include #include #include #include + #include BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian) diff --git a/test/geometries/linestring.cpp b/test/geometries/linestring.cpp index b51cc215d3..93e84da231 100644 --- a/test/geometries/linestring.cpp +++ b/test/geometries/linestring.cpp @@ -3,6 +3,10 @@ // Copyright (c) 2020 Digvijay Janartha, Hamirpur, India. +// This file was modified by Oracle on 2023. +// Modifications copyright (c) 2023, Oracle and/or its affiliates. +// Contributed and/or modified by Vissarion Fysikopoulos, 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,6 +16,7 @@ #include #include +#include #include #include #include diff --git a/test/geometries/multi_point.cpp b/test/geometries/multi_point.cpp index 2e43c61fd0..086a61b95e 100644 --- a/test/geometries/multi_point.cpp +++ b/test/geometries/multi_point.cpp @@ -3,6 +3,10 @@ // Copyright (c) 2020 Digvijay Janartha, Hamirpur, India. +// This file was modified by Oracle on 2023. +// Modifications copyright (c) 2023, Oracle and/or its affiliates. +// Contributed and/or modified by Vissarion Fysikopoulos, 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,6 +18,7 @@ #include #include #include +#include #include #include #include diff --git a/test/geometries/multi_polygon.cpp b/test/geometries/multi_polygon.cpp index 1a12aafc8b..21ee76c3de 100644 --- a/test/geometries/multi_polygon.cpp +++ b/test/geometries/multi_polygon.cpp @@ -3,6 +3,10 @@ // Copyright (c) 2020 Digvijay Janartha, Hamirpur, India. +// This file was modified by Oracle on 2023. +// Modifications copyright (c) 2023, Oracle and/or its affiliates. +// Contributed and/or modified by Vissarion Fysikopoulos, 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,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -41,6 +46,7 @@ bg::model::polygon

create_polygon() bg::assign_values(p2, 2, 0); bg::assign_values(p3, 0, 0); + bg::append(pl1, p1); bg::append(pl1, p2); bg::append(pl1, p3); diff --git a/test/geometries/polygon.cpp b/test/geometries/polygon.cpp index a534746cff..2a5460b017 100644 --- a/test/geometries/polygon.cpp +++ b/test/geometries/polygon.cpp @@ -3,8 +3,9 @@ // Copyright (c) 2020 Digvijay Janartha, Hamirpur, India. -// This file was modified by Oracle on 2021. -// Modifications copyright (c) 2021, Oracle and/or its affiliates. +// This file was modified by Oracle on 2021-2023. +// Modifications copyright (c) 2021-2023, 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 // Use, modification and distribution is subject to the Boost Software License, @@ -16,6 +17,7 @@ #include #include +#include #include #include #include @@ -33,7 +35,7 @@ BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian) template bg::model::polygon

create_polygon() -{ +{ bg::model::polygon

pl1; P p1; P p2; @@ -41,7 +43,7 @@ bg::model::polygon

create_polygon() bg::assign_values(p1, 1, 2); bg::assign_values(p2, 2, 0); bg::assign_values(p3, 0, 0); - + bg::append(pl1, p1); bg::append(pl1, p2); bg::append(pl1, p3); @@ -51,7 +53,7 @@ bg::model::polygon

create_polygon() template void check_polygon(PL& to_check, P p1, P p2, P p3) -{ +{ PL cur; bg::append(cur, p1); bg::append(cur, p2); @@ -88,7 +90,7 @@ void test_copy_assignment() template void test_concept() -{ +{ typedef bg::model::polygon

PL; BOOST_CONCEPT_ASSERT( (bg::concepts::ConstPolygon) ); @@ -101,7 +103,7 @@ void test_concept() template void test_all() -{ +{ test_default_constructor

(); test_copy_constructor

(); test_copy_assignment

(); @@ -110,7 +112,7 @@ void test_all() template void test_custom_polygon(bg::model::ring

IL) -{ +{ std::initializer_list > RIL = {IL}; bg::model::polygon

pl1(RIL); std::ostringstream out; @@ -120,7 +122,7 @@ void test_custom_polygon(bg::model::ring

IL) template void test_custom() -{ +{ std::initializer_list

IL = {P(3, 3), P(3, 0), P(0, 0), P(0, 3), P(3, 3)}; bg::model::ring

r1(IL); test_custom_polygon

(r1); @@ -138,7 +140,7 @@ void test_cs() int test_main(int, char* []) -{ +{ test_cs(); test_cs >(); test_cs >(); diff --git a/test/geometries/ring.cpp b/test/geometries/ring.cpp index ef48d3e803..7fc656e159 100644 --- a/test/geometries/ring.cpp +++ b/test/geometries/ring.cpp @@ -3,6 +3,10 @@ // Copyright (c) 2020 Digvijay Janartha, Hamirpur, India. +// This file was modified by Oracle on 2023. +// Modifications copyright (c) 2023, Oracle and/or its affiliates. +// Contributed and/or modified by Vissarion Fysikopoulos, 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,6 +16,7 @@ #include #include +#include #include #include #include @@ -42,6 +47,7 @@ bg::model::ring

create_ring() bg::assign_values(p3, 0, 0); bg::assign_values(p4, 0, 2); + bg::append(r1, p1); bg::append(r1, p2); bg::append(r1, p3); diff --git a/test/headers/Jamfile b/test/headers/Jamfile index 4f245dd482..d9f07e2a5b 100644 --- a/test/headers/Jamfile +++ b/test/headers/Jamfile @@ -2,6 +2,10 @@ # # Copyright (c) 2018 Mateusz Loskot # +# This file was modified by Oracle on 2023. +# Modifications copyright (c) 2023 Oracle and/or its affiliates. +# Contributed and/or modified by Vissarion Fysikopoulos, 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) @@ -27,7 +31,8 @@ rule generate_self_contained_headers ( headers_subpath ) local top_headers_path = [ path.make $(BOOST_ROOT)/libs/geometry/include/boost/geometry ] ; - for local file in [ path.glob-tree $(top_headers_path)/$(headers_subpath) : *.hpp ] + # Skip the OpenGL visualization related header + for local file in [ path.glob-tree $(top_headers_path)/$(headers_subpath) : *.hpp : gl_draw.hpp ] { local rel_file = [ path.relative-to $(top_headers_path) $(file) ] ; local target_name = [ regex.replace h/$(rel_file) "/" "-" ] ; diff --git a/test/strategies/matrix_transformer.cpp b/test/strategies/matrix_transformer.cpp index b617b5c20e..676b2be9cd 100644 --- a/test/strategies/matrix_transformer.cpp +++ b/test/strategies/matrix_transformer.cpp @@ -3,6 +3,10 @@ // Copyright (c) 2019 Tinko Bartels +// This file was modified by Oracle on 2023. +// Modifications copyright (c) 2023, Oracle and/or its affiliates. +// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle + // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. @@ -13,9 +17,10 @@ #include -#include +#include #include #include +#include template void test_all() diff --git a/test/strategies/transformer.cpp b/test/strategies/transformer.cpp index 5cdc567e69..d1b4ce5764 100644 --- a/test/strategies/transformer.cpp +++ b/test/strategies/transformer.cpp @@ -8,6 +8,10 @@ // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. +// This file was modified by Oracle on 2023. +// Modifications copyright (c) 2023, Oracle and/or its affiliates. +// Contributed and/or modified by Vissarion Fysikopoulos, 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) @@ -15,11 +19,7 @@ #include -#include -#include -#include - - +#include #include #include @@ -27,6 +27,10 @@ #include #include +#include +#include +#include + BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian) BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian) diff --git a/test/util/algorithm.cpp b/test/util/algorithm.cpp index e99a80e4cf..6b02d182b7 100644 --- a/test/util/algorithm.cpp +++ b/test/util/algorithm.cpp @@ -1,7 +1,8 @@ // Boost.Geometry -// Copyright (c) 2021, Oracle and/or its affiliates. +// Copyright (c) 2021-2023, 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. @@ -12,6 +13,8 @@ #include +#include + #include #include