boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-12 14:01:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1013 from tinko92/fix/overlay-identical-branches

Browse Source 
Fixes warning with -Wduplicated-branches in overlay for union (issue #443).
This commit is contained in:
Vissarion Fisikopoulos 2022-06-23 13:57:11 +03:00 committed by GitHub
commit 6d57aedf7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/boost/geometry/algorithms/detail/overlay/overlay.hpp
View File

@ -389,15 +389,18 @@ std::cout << "traverse" << std::endl;
// it can be returned or an exception can be thrown. // it can be returned or an exception can be thrown.
return add_rings<GeometryOut>(selected_ring_properties, geometry1, geometry2, rings, out, return add_rings<GeometryOut>(selected_ring_properties, geometry1, geometry2, rings, out,
strategy, strategy,
OverlayType == overlay_union ?
#if defined(BOOST_GEOMETRY_UNION_THROW_INVALID_OUTPUT_EXCEPTION) #if defined(BOOST_GEOMETRY_UNION_THROW_INVALID_OUTPUT_EXCEPTION)
OverlayType == overlay_union ?
add_rings_throw_if_reversed add_rings_throw_if_reversed
: add_rings_ignore_unordered
#elif defined(BOOST_GEOMETRY_UNION_RETURN_INVALID) #elif defined(BOOST_GEOMETRY_UNION_RETURN_INVALID)
OverlayType == overlay_union ?
add_rings_add_unordered add_rings_add_unordered
: add_rings_ignore_unordered
#else #else
add_rings_ignore_unordered add_rings_ignore_unordered
#endif #endif
: add_rings_ignore_unordered); );
} }
template <typename RobustPolicy, typename OutputIterator, typename Strategy> template <typename RobustPolicy, typename OutputIterator, typename Strategy>