diff --git a/extensions/test/algorithms/connect.cpp b/extensions/test/algorithms/connect.cpp index f8766806b..7d4a274d4 100644 --- a/extensions/test/algorithms/connect.cpp +++ b/extensions/test/algorithms/connect.cpp @@ -3,6 +3,10 @@ // Copyright (c) 2010-2012 Barend Gehrels, Amsterdam, the Netherlands. +// This file was modified by Oracle on 2021. +// Modifications copyright (c) 2021 Oracle and/or its affiliates. +// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle + // Use, modification and distribution is subject to the Boost Software License, // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -57,7 +61,7 @@ void test_connect(std::string const& caseid, Geometry const& geometry, std::size_t count = boost::size(connected_vector); std::size_t point_count = 0; - BOOST_FOREACH(GeometryOut& connected, connected_vector) + for (GeometryOut& connected : connected_vector) { bg::unique(connected); length += bg::length(connected); @@ -99,7 +103,7 @@ void test_connect(std::string const& caseid, Geometry const& geometry, mapper.map(geometry, "opacity:0.6;fill:rgb(0,0,255);stroke:rgb(0,0,0);stroke-width:1"); - BOOST_FOREACH(GeometryOut& connected, connected_vector) + for (GeometryOut& connected : connected_vector) { mapper.map(connected, "opacity:0.6;fill:none;stroke:rgb(255,0,0);stroke-width:5"); } diff --git a/extensions/test/triangulation/in_circle_robust.cpp b/extensions/test/triangulation/in_circle_robust.cpp index 72668e962..2eb65ec63 100644 --- a/extensions/test/triangulation/in_circle_robust.cpp +++ b/extensions/test/triangulation/in_circle_robust.cpp @@ -6,6 +6,10 @@ // Contributed and/or modified by Tinko Bartels, // as part of Google Summer of Code 2019 program. +// This file was modified by Oracle on 2021. +// Modifications copyright (c) 2021, Oracle and/or its affiliates. +// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle + // Use, modification and distribution is subject to the Boost Software License, // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -13,7 +17,7 @@ #include #include -#include +#include template void test_all() diff --git a/include/boost/geometry/extensions/algorithms/distance_info.hpp b/include/boost/geometry/extensions/algorithms/distance_info.hpp index eae5387ce..d64bc2d9e 100644 --- a/include/boost/geometry/extensions/algorithms/distance_info.hpp +++ b/include/boost/geometry/extensions/algorithms/distance_info.hpp @@ -5,8 +5,8 @@ // Copyright (c) 2009-2013 Mateusz Loskot, London, UK. // Copyright (c) 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-2021. +// Modifications copyright (c) 2020-2021, Oracle and/or its affiliates. // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Use, modification and distribution is subject to the Boost Software License, @@ -30,10 +30,9 @@ #include -#include #include +#include -#include #include #include diff --git a/include/boost/geometry/extensions/gis/io/wkb/detail/endian.hpp b/include/boost/geometry/extensions/gis/io/wkb/detail/endian.hpp index 33d775f36..b02d9b1c1 100644 --- a/include/boost/geometry/extensions/gis/io/wkb/detail/endian.hpp +++ b/include/boost/geometry/extensions/gis/io/wkb/detail/endian.hpp @@ -2,8 +2,8 @@ // 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-2021. +// Modifications copyright (c) 2020-2021, Oracle and/or its affiliates. // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Use, modification and distribution is subject to the Boost Software License, @@ -31,7 +31,7 @@ #include #include #include -#include +#include #if CHAR_BIT != 8 #error Platforms with CHAR_BIT != 8 are not supported @@ -50,10 +50,16 @@ namespace detail { namespace endian struct big_endian_tag {}; struct little_endian_tag {}; -#ifdef BOOST_BIG_ENDIAN +#if defined(BOOST_ENDIAN_BIG_BYTE_AVAILABLE) typedef big_endian_tag native_endian_tag; -#else +#elif defined(BOOST_ENDIAN_LITTLE_BYTE_AVAILABLE) typedef little_endian_tag native_endian_tag; +#elif defined(BOOST_ENDIAN_BIG_WORD_BYTE_AVAILABLE) +#error Word-swapped big-endian not supported +#elif defined(BOOST_ENDIAN_LITTLE_WORD_BYTE_AVAILABLE) +#error Word-swapped little-endian not supported +#else +#error Unknown endian memory ordering #endif // Unrolled loops for loading and storing streams of bytes. diff --git a/include/boost/geometry/extensions/nsphere/geometries/concepts/check.hpp b/include/boost/geometry/extensions/nsphere/geometries/concepts/check.hpp deleted file mode 100644 index ecab04eff..000000000 --- a/include/boost/geometry/extensions/nsphere/geometries/concepts/check.hpp +++ /dev/null @@ -1,50 +0,0 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) - -// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. -// Copyright (c) 2008-2012 Bruno Lalande, Paris, France. -// Copyright (c) 2009-2012 Mateusz Loskot, London, UK. -// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland. - -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - -// 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) - - -#ifndef BOOST_GEOMETRY_EXTENSIONS_NSPHERE_GEOMETRIES_CONCEPTS_CHECK_HPP -#define BOOST_GEOMETRY_EXTENSIONS_NSPHERE_GEOMETRIES_CONCEPTS_CHECK_HPP - - -#include - - -namespace boost { namespace geometry -{ - - -#ifndef DOXYGEN_NO_DISPATCH -namespace dispatch -{ - -template -struct check - : detail::concept_check::check > -{}; - -template -struct check - : detail::concept_check::check > -{}; - -} // namespace dispatch -#endif - - - - -}} // namespace boost::geometry - - -#endif // BOOST_GEOMETRY_EXTENSIONS_NSPHERE_GEOMETRIES_CONCEPTS_CHECK_HPP diff --git a/include/boost/geometry/extensions/nsphere/geometries/concepts/nsphere_concept.hpp b/include/boost/geometry/extensions/nsphere/geometries/concepts/nsphere_concept.hpp index 7fb631b05..a89528ce4 100644 --- a/include/boost/geometry/extensions/nsphere/geometries/concepts/nsphere_concept.hpp +++ b/include/boost/geometry/extensions/nsphere/geometries/concepts/nsphere_concept.hpp @@ -4,6 +4,10 @@ // Copyright (c) 2008-2012 Bruno Lalande, Paris, France. // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. +// This file was modified by Oracle on 2021. +// Modifications copyright (c) 2021, Oracle and/or its affiliates. +// 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. @@ -117,6 +121,18 @@ public : }; +template +struct concept_type +{ + using type = Nsphere; +}; + +template +struct concept_type +{ + using type = ConstNsphere; +}; + }}} // namespace boost::geometry::concepts diff --git a/include/boost/geometry/extensions/nsphere/nsphere.hpp b/include/boost/geometry/extensions/nsphere/nsphere.hpp index bd0112704..8c2dd2c52 100644 --- a/include/boost/geometry/extensions/nsphere/nsphere.hpp +++ b/include/boost/geometry/extensions/nsphere/nsphere.hpp @@ -5,6 +5,10 @@ // Copyright (c) 2009-2015 Mateusz Loskot, London, UK. // 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. +// 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. @@ -22,7 +26,6 @@ #include #include -#include #include #include