Skip to content

Commit 83dcb53

Browse files
vissarionvissarion
committed
Merge remote-tracking branch 'origin/develop' into feature/robust_convex_hull
2 parents b0e3c67 + 3374cda commit 83dcb53

File tree

216 files changed

+2826
-2060
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

216 files changed

+2826
-2060
lines changed

‎.github/workflows/documentation.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# GitHub Actions Workflow for Boost.Geometry to build documentation
33
#
44
# Copyright (c) 2020 Mateusz Loskot <mateusz@loskot.net>
5+
# Copyright (c) 2020 Adam Wulkiewicz, Lodz, Poland
56
#
67
# Use, modification and distribution is subject to the Boost Software License,
78
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -31,12 +32,12 @@ jobs:
3132
id: setenv
3233
run: |
3334
if [[ "$GITHUB_REF" == *master ]]; then
34-
echo "::set-env name=BOOST_BRANCH::master"
35+
echo "BOOST_BRANCH=master" >> $GITHUB_ENV
3536
else
36-
echo "::set-env name=BOOST_BRANCH::develop"
37+
echo "BOOST_BRANCH=develop" >> $GITHUB_ENV
3738
fi
38-
echo "::set-env name=BOOST_SELF::$(basename $GITHUB_WORKSPACE)"
39-
echo "::set-env name=BOOST_ROOT::$GITHUB_WORKSPACE/boost-root"
39+
echo "BOOST_SELF=$(basename $GITHUB_WORKSPACE)" >> $GITHUB_ENV
40+
echo "BOOST_ROOT=$GITHUB_WORKSPACE/boost-root" >> $GITHUB_ENV
4041
echo "::set-output name=boost_self::$(basename $GITHUB_WORKSPACE)"
4142
echo "::set-output name=boost_root::$GITHUB_WORKSPACE/boost-root"
4243

‎.github/workflows/minimal-clang.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# GitHub Actions Workflow for Boost.Geometry to build minimal tests with Clang
33
#
44
# Copyright (c) 2020 Mateusz Loskot <mateusz@loskot.net>
5+
# Copyright (c) 2020 Adam Wulkiewicz, Lodz, Poland
56
#
67
# Use, modification and distribution is subject to the Boost Software License,
78
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -61,12 +62,12 @@ jobs:
6162
id: setenv
6263
run: |
6364
if [[ "$GITHUB_REF" == *master ]]; then
64-
echo "::set-env name=BOOST_BRANCH::master"
65+
echo "BOOST_BRANCH=master" >> $GITHUB_ENV
6566
else
66-
echo "::set-env name=BOOST_BRANCH::develop"
67+
echo "BOOST_BRANCH=develop" >> $GITHUB_ENV
6768
fi
68-
echo "::set-env name=BOOST_SELF::$(basename $GITHUB_WORKSPACE)"
69-
echo "::set-env name=BOOST_ROOT::$GITHUB_WORKSPACE/boost-root"
69+
echo "BOOST_SELF=$(basename $GITHUB_WORKSPACE)" >> $GITHUB_ENV
70+
echo "BOOST_ROOT=$GITHUB_WORKSPACE/boost-root" >> $GITHUB_ENV
7071
echo "::set-output name=boost_self::$(basename $GITHUB_WORKSPACE)"
7172
echo "::set-output name=boost_root::$GITHUB_WORKSPACE/boost-root"
7273

‎.github/workflows/minimal-gcc.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# GitHub Actions Workflow for Boost.Geometry to build minimal tests with GCC
33
#
44
# Copyright (c) 2020 Mateusz Loskot <mateusz@loskot.net>
5+
# Copyright (c) 2020 Adam Wulkiewicz, Lodz, Poland
56
#
67
# Use, modification and distribution is subject to the Boost Software License,
78
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -49,12 +50,12 @@ jobs:
4950
id: setenv
5051
run: |
5152
if [[ "$GITHUB_REF" == *master ]]; then
52-
echo "::set-env name=BOOST_BRANCH::master"
53+
echo "BOOST_BRANCH=master" >> $GITHUB_ENV
5354
else
54-
echo "::set-env name=BOOST_BRANCH::develop"
55+
echo "BOOST_BRANCH=develop" >> $GITHUB_ENV
5556
fi
56-
echo "::set-env name=BOOST_SELF::$(basename $GITHUB_WORKSPACE)"
57-
echo "::set-env name=BOOST_ROOT::$GITHUB_WORKSPACE/boost-root"
57+
echo "BOOST_SELF=$(basename $GITHUB_WORKSPACE)" >> $GITHUB_ENV
58+
echo "BOOST_ROOT=$GITHUB_WORKSPACE/boost-root" >> $GITHUB_ENV
5859
echo "::set-output name=boost_self::$(basename $GITHUB_WORKSPACE)"
5960
echo "::set-output name=boost_root::$GITHUB_WORKSPACE/boost-root"
6061

‎.github/workflows/minimal-msvc.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# GitHub Actions Workflow for Boost.Geometry to build minimal tests with MSVC
33
#
44
# Copyright (c) 2020 Mateusz Loskot <mateusz@loskot.net>
5+
# Copyright (c) 2020 Adam Wulkiewicz, Lodz, Poland
56
#
67
# Use, modification and distribution is subject to the Boost Software License,
78
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -34,13 +35,13 @@ jobs:
3435
id: setenv
3536
shell: pwsh
3637
run: |
37-
if ("$GITHUB_REF" -contains "master") {
38-
echo "::set-env name=BOOST_BRANCH::master"
38+
if ("$env:GITHUB_REF" -contains "master") {
39+
echo "BOOST_BRANCH=master" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
3940
} else {
40-
echo "::set-env name=BOOST_BRANCH::develop"
41+
echo "BOOST_BRANCH=develop" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
4142
}
42-
echo "::set-env name=BOOST_SELF::$((Get-Item $env:GITHUB_WORKSPACE).BaseName)"
43-
echo "::set-env name=BOOST_ROOT::$env:GITHUB_WORKSPACE\boost-root"
43+
echo "BOOST_SELF=$((Get-Item $env:GITHUB_WORKSPACE).BaseName)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
44+
echo "BOOST_ROOT=$env:GITHUB_WORKSPACE\boost-root" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
4445
echo "::set-output name=boost_self::$((Get-Item $env:GITHUB_WORKSPACE).BaseName)"
4546
echo "::set-output name=boost_root::$env:GITHUB_WORKSPACE\boost-root"
4647

‎doc/release_notes.qbk‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Copyright (c) 2009-2017 Mateusz Loskot <mateusz@loskot.net>, London, UK.
77
Copyright (c) 2011-2017 Adam Wulkiewicz, Lodz, Poland.
88

9-
This file was modified by Oracle on 2015, 2017, 2018, 2019, 2020.
9+
This file was modified by Oracle on 2015-2020.
1010
Modifications copyright (c) 2015-2020, Oracle and/or its affiliates.
1111
Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
1212
Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
@@ -19,6 +19,32 @@
1919

2020
[section:release_notes Release Notes]
2121

22+
[/=================]
23+
[heading Boost 1.75]
24+
[/=================]
25+
26+
[*Improvements]
27+
28+
* [@https://github.com/boostorg/geometry/pull/726 726] Umbrella strategies for area, envelope, expand (undocumented for now).
29+
* [@https://github.com/boostorg/geometry/pull/733 733] Added example of adaptation of std::array<> to Point concept (thanks to Ben FrantzDale).
30+
* [@https://github.com/boostorg/geometry/pull/745 745] constexpr added in geometries and arithmetic.
31+
* [@https://github.com/boostorg/geometry/pull/747 747] Added optional traits::make (undocumented for now).
32+
* [@https://github.com/boostorg/geometry/pull/748 748] Modernized usage of type traits.
33+
* [@https://github.com/boostorg/geometry/pull/759 759] MPL_ASSERT replaced with standard static_assert.
34+
* [@https://github.com/boostorg/geometry/pull/767 767] Modernized usage of tuple.
35+
36+
[*Solved issues]
37+
38+
* [@https://github.com/boostorg/geometry/issues/716 716] Dangling proxy references.
39+
40+
[*Bugfixes]
41+
42+
* Various fixes in set operations and buffer.
43+
44+
[*Deprecation]
45+
46+
* [@https://github.com/boostorg/geometry/issues/590 590] Boost.Geometry requires C++14.
47+
2248
[/=================]
2349
[heading Boost 1.74]
2450
[/=================]

‎include/boost/geometry/algorithms/append.hpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
55
// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
66

7-
// This file was modified by Oracle on 2014.
8-
// Modifications copyright (c) 2014, Oracle and/or its affiliates.
9-
7+
// This file was modified by Oracle on 2014-2020.
8+
// Modifications copyright (c) 2014-2020, Oracle and/or its affiliates.
109
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
1110
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
1211

@@ -21,7 +20,9 @@
2120
#define BOOST_GEOMETRY_ALGORITHMS_APPEND_HPP
2221

2322

24-
#include <boost/range.hpp>
23+
#include <boost/range/begin.hpp>
24+
#include <boost/range/end.hpp>
25+
#include <boost/range/value_type.hpp>
2526

2627
#include <boost/variant/apply_visitor.hpp>
2728
#include <boost/variant/static_visitor.hpp>

‎include/boost/geometry/algorithms/area.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <boost/core/ignore_unused.hpp>
2424
#include <boost/range/begin.hpp>
2525
#include <boost/range/end.hpp>
26+
#include <boost/range/size.hpp>
2627
#include <boost/range/value_type.hpp>
2728

2829
#include <boost/variant/apply_visitor.hpp>

‎include/boost/geometry/algorithms/area_result.hpp‎

Lines changed: 42 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
#include <boost/geometry/util/select_most_precise.hpp>
2828
#include <boost/geometry/util/sequence.hpp>
29+
#include <boost/geometry/util/type_traits.hpp>
2930

3031
#include <boost/variant/variant_fwd.hpp>
3132

@@ -51,17 +52,18 @@ struct area_result
5152
typedef typename strategy_type::template result_type<Geometry>::type type;
5253
};
5354

55+
template <typename Geometry, typename Strategy>
56+
struct area_result<Geometry, Strategy, false>
57+
{
58+
typedef typename Strategy::template result_type<Geometry>::type type;
59+
};
60+
61+
5462
template
5563
<
5664
typename Geometry,
57-
typename Strategy
65+
bool IsGeometry = util::is_geometry<Geometry>::value
5866
>
59-
struct area_result<Geometry, Strategy, false>
60-
: Strategy::template result_type<Geometry>
61-
{};
62-
63-
64-
template <typename Geometry>
6567
struct default_area_result
6668
: area_result
6769
<
@@ -73,15 +75,37 @@ struct default_area_result
7375
>
7476
{};
7577

78+
// Workaround for VS2015
79+
#if defined(_MSC_VER) && (_MSC_VER < 1910)
80+
template
81+
<
82+
typename Geometry,
83+
bool IsGeometry = util::is_geometry<Geometry>::value
84+
>
85+
struct coordinate_type
86+
: geometry::coordinate_type<Geometry>
87+
{};
88+
template <typename Geometry>
89+
struct coordinate_type<Geometry, false>
90+
{
91+
typedef int type;
92+
};
93+
template <typename Geometry>
94+
struct default_area_result<Geometry, false>
95+
{
96+
typedef int type;
97+
};
98+
#endif
99+
76100
template <typename Curr, typename Next>
77101
struct more_precise_coordinate_type
78102
: std::is_same
79103
<
80-
typename geometry::coordinate_type<Curr>::type,
104+
typename coordinate_type<Curr>::type,
81105
typename geometry::select_most_precise
82106
<
83-
typename geometry::coordinate_type<Curr>::type,
84-
typename geometry::coordinate_type<Next>::type
107+
typename coordinate_type<Curr>::type,
108+
typename coordinate_type<Next>::type
85109
>::type
86110
>
87111
{};
@@ -119,14 +143,14 @@ struct area_result
119143
: detail::area::area_result<Geometry, Strategy>
120144
{};
121145

122-
template <typename ...Ts, typename Strategy>
123-
struct area_result<boost::variant<Ts...>, Strategy>
146+
template <BOOST_VARIANT_ENUM_PARAMS(typename T), typename Strategy>
147+
struct area_result<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Strategy>
124148
: geometry::area_result
125149
<
126150
typename util::select_pack_element
127151
<
128152
detail::area::more_precise_coordinate_type,
129-
Ts...
153+
BOOST_VARIANT_ENUM_PARAMS(T)
130154
>::type,
131155
Strategy
132156
>
@@ -137,16 +161,15 @@ struct area_result<Geometry, default_strategy>
137161
: detail::area::default_area_result<Geometry>
138162
{};
139163

140-
template <typename ...Ts>
141-
struct area_result<boost::variant<Ts...>, default_strategy>
142-
: geometry::area_result
164+
template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
165+
struct area_result<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>, default_strategy>
166+
: detail::area::default_area_result
143167
<
144168
typename util::select_pack_element
145169
<
146170
detail::area::more_precise_default_area_result,
147-
Ts...
148-
>::type,
149-
default_strategy
171+
BOOST_VARIANT_ENUM_PARAMS(T)
172+
>::type
150173
>
151174
{};
152175

‎include/boost/geometry/algorithms/buffer.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
55
// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
66

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

1111
// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
@@ -22,7 +22,7 @@
2222

2323
#include <boost/numeric/conversion/cast.hpp>
2424

25-
#include <boost/range.hpp>
25+
#include <boost/range/value_type.hpp>
2626

2727
#include <boost/variant/apply_visitor.hpp>
2828
#include <boost/variant/static_visitor.hpp>

‎include/boost/geometry/algorithms/centroid.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
// Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
66
// Copyright (c) 2014-2017 Adam Wulkiewicz, Lodz, Poland.
77

8-
// This file was modified by Oracle on 2014, 2015.
9-
// Modifications copyright (c) 2014-2015 Oracle and/or its affiliates.
10-
8+
// This file was modified by Oracle on 2014-2020.
9+
// Modifications copyright (c) 2014-2020 Oracle and/or its affiliates.
1110
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
1211
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
1312

@@ -25,9 +24,10 @@
2524
#include <cstddef>
2625

2726
#include <boost/core/ignore_unused.hpp>
28-
#include <boost/range.hpp>
27+
#include <boost/range/begin.hpp>
28+
#include <boost/range/end.hpp>
29+
#include <boost/range/size.hpp>
2930
#include <boost/throw_exception.hpp>
30-
3131
#include <boost/variant/apply_visitor.hpp>
3232
#include <boost/variant/static_visitor.hpp>
3333
#include <boost/variant/variant_fwd.hpp>

0 commit comments

Comments
 (0)