From 73c1eed9477cec968b18e78e7611fda59ea46909 Mon Sep 17 00:00:00 2001 From: Adam Wulkiewicz Date: Tue, 18 Dec 2018 20:29:41 +0100 Subject: [PATCH] [algorithm][formulas][geometries][util] Add missing includes. --- .../detail/envelope/range_of_boxes.hpp | 9 ++++++--- .../boost/geometry/formulas/area_formulas.hpp | 1 + .../boost/geometry/formulas/eccentricity_sqr.hpp | 6 ++++-- .../boost/geometry/formulas/karney_direct.hpp | 16 +++++++++++----- .../boost/geometry/formulas/meridian_direct.hpp | 10 ++++++---- .../boost/geometry/formulas/quarter_meridian.hpp | 7 ++++++- .../geometry/geometries/adapted/std_array.hpp | 15 +++++++++++++++ .../geometries/concepts/multi_point_concept.hpp | 1 + .../util/is_inverse_spheroidal_coordinates.hpp | 5 +++++ 9 files changed, 55 insertions(+), 15 deletions(-) diff --git a/include/boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp b/include/boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp index 111441036..28e76c445 100644 --- a/include/boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp +++ b/include/boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp @@ -20,17 +20,20 @@ #include +#include +#include +#include + #include #include #include #include #include +#include #include -#include -#include -#include +#include namespace boost { namespace geometry diff --git a/include/boost/geometry/formulas/area_formulas.hpp b/include/boost/geometry/formulas/area_formulas.hpp index 66d90a725..c670f831a 100644 --- a/include/boost/geometry/formulas/area_formulas.hpp +++ b/include/boost/geometry/formulas/area_formulas.hpp @@ -12,6 +12,7 @@ #ifndef BOOST_GEOMETRY_FORMULAS_AREA_FORMULAS_HPP #define BOOST_GEOMETRY_FORMULAS_AREA_FORMULAS_HPP +#include #include #include #include diff --git a/include/boost/geometry/formulas/eccentricity_sqr.hpp b/include/boost/geometry/formulas/eccentricity_sqr.hpp index 01a9beacb..1608a8570 100644 --- a/include/boost/geometry/formulas/eccentricity_sqr.hpp +++ b/include/boost/geometry/formulas/eccentricity_sqr.hpp @@ -1,6 +1,6 @@ // Boost.Geometry -// Copyright (c) 2016 Oracle and/or its affiliates. +// Copyright (c) 2016, 2018 Oracle and/or its affiliates. // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle @@ -11,11 +11,13 @@ #ifndef BOOST_GEOMETRY_FORMULAS_ECCENCRICITY_SQR_HPP #define BOOST_GEOMETRY_FORMULAS_ECCENCRICITY_SQR_HPP +#include + #include #include #include -#include +#include namespace boost { namespace geometry { diff --git a/include/boost/geometry/formulas/karney_direct.hpp b/include/boost/geometry/formulas/karney_direct.hpp index 1e6add7d4..404068400 100644 --- a/include/boost/geometry/formulas/karney_direct.hpp +++ b/include/boost/geometry/formulas/karney_direct.hpp @@ -2,7 +2,12 @@ // Copyright (c) 2018 Adeel Ahmad, Islamabad, Pakistan. -// Contributed and/or modified by Adeel Ahmad, as part of Google Summer of Code 2018 program. +// Contributed and/or modified by Adeel Ahmad, +// as part of Google Summer of Code 2018 program. + +// This file was modified by Oracle on 2018. +// Modifications copyright (c) 2018 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 @@ -30,13 +35,14 @@ #include #include -#include -#include -#include - #include #include +#include +#include +#include +#include + namespace boost { namespace geometry { namespace formula { diff --git a/include/boost/geometry/formulas/meridian_direct.hpp b/include/boost/geometry/formulas/meridian_direct.hpp index e55b35e88..f8e73f57c 100644 --- a/include/boost/geometry/formulas/meridian_direct.hpp +++ b/include/boost/geometry/formulas/meridian_direct.hpp @@ -3,6 +3,7 @@ // Copyright (c) 2018 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, // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -15,14 +16,15 @@ #include -#include -#include - -#include +#include #include +#include #include #include +#include +#include + namespace boost { namespace geometry { namespace formula { diff --git a/include/boost/geometry/formulas/quarter_meridian.hpp b/include/boost/geometry/formulas/quarter_meridian.hpp index 2f93f53cf..5aa10cc87 100644 --- a/include/boost/geometry/formulas/quarter_meridian.hpp +++ b/include/boost/geometry/formulas/quarter_meridian.hpp @@ -3,6 +3,7 @@ // Copyright (c) 2018 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, // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -11,11 +12,15 @@ #ifndef BOOST_GEOMETRY_FORMULAS_QUARTER_MERIDIAN_HPP #define BOOST_GEOMETRY_FORMULAS_QUARTER_MERIDIAN_HPP +#include + #include #include #include -#include +#include + +#include namespace boost { namespace geometry { diff --git a/include/boost/geometry/geometries/adapted/std_array.hpp b/include/boost/geometry/geometries/adapted/std_array.hpp index 4f5cbe0d3..ede9fe997 100644 --- a/include/boost/geometry/geometries/adapted/std_array.hpp +++ b/include/boost/geometry/geometries/adapted/std_array.hpp @@ -12,6 +12,12 @@ #define BOOST_GEOMETRY_GEOMETRIES_ADAPTED_STD_ARRAY_HPP +#include + + +#ifndef BOOST_NO_CXX11_HDR_ARRAY + + #define BOOST_GEOMETRY_ADAPTED_STD_ARRAY_TAG_DEFINED @@ -111,5 +117,14 @@ struct access, Dimension> }}} +#else + + +#warning "This file requires compiler and library support for the ISO C++ 2011 standard." + + +#endif // BOOST_NO_CXX11_HDR_ARRAY + + #endif // BOOST_GEOMETRY_GEOMETRIES_ADAPTED_STD_ARRAY_HPP diff --git a/include/boost/geometry/geometries/concepts/multi_point_concept.hpp b/include/boost/geometry/geometries/concepts/multi_point_concept.hpp index 9e205f163..9dffdb1c4 100644 --- a/include/boost/geometry/geometries/concepts/multi_point_concept.hpp +++ b/include/boost/geometry/geometries/concepts/multi_point_concept.hpp @@ -20,6 +20,7 @@ #include #include +#include #include diff --git a/include/boost/geometry/util/is_inverse_spheroidal_coordinates.hpp b/include/boost/geometry/util/is_inverse_spheroidal_coordinates.hpp index d67251254..59746653a 100644 --- a/include/boost/geometry/util/is_inverse_spheroidal_coordinates.hpp +++ b/include/boost/geometry/util/is_inverse_spheroidal_coordinates.hpp @@ -3,6 +3,7 @@ // Copyright (c) 2018 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, // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -11,6 +12,10 @@ #ifndef BOOST_GEOMETRY_UTIL_IS_INVERSE_SPHEROIDAL_COORDINATES_HPP #define BOOST_GEOMETRY_UTIL_IS_INVERSE_SPHEROIDAL_COORDINATES_HPP +#include +#include +#include + #include namespace boost { namespace geometry