From e2ad044720bcbe71e6423c7cea3829592cef3c10 Mon Sep 17 00:00:00 2001 From: Adam Wulkiewicz Date: Sun, 29 Jul 2018 22:17:40 +0200 Subject: [PATCH] [algorithms][formulas][strategies] Fix unused variable warnings. --- .../algorithms/detail/envelope/segment.hpp | 6 ++++-- .../boost/geometry/formulas/vertex_longitude.hpp | 14 +++++++------- .../geometry/strategies/spherical/intersection.hpp | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/include/boost/geometry/algorithms/detail/envelope/segment.hpp b/include/boost/geometry/algorithms/detail/envelope/segment.hpp index 751313155..cfa139a08 100644 --- a/include/boost/geometry/algorithms/detail/envelope/segment.hpp +++ b/include/boost/geometry/algorithms/detail/envelope/segment.hpp @@ -4,8 +4,8 @@ // Copyright (c) 2008-2015 Bruno Lalande, Paris, France. // Copyright (c) 2009-2015 Mateusz Loskot, London, UK. -// This file was modified by Oracle on 2015-2017. -// Modifications copyright (c) 2015-2017, Oracle and/or its affiliates. +// This file was modified by Oracle on 2015-2018. +// Modifications copyright (c) 2015-2018, 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 @@ -21,6 +21,7 @@ #include #include +#include #include #include @@ -163,6 +164,7 @@ private: { // coordinates are assumed to be in radians BOOST_GEOMETRY_ASSERT(lon1 <= lon2); + boost::ignore_unused(lon1, lon2); CalculationType lat1_rad = math::as_radian(lat1); CalculationType lat2_rad = math::as_radian(lat2); diff --git a/include/boost/geometry/formulas/vertex_longitude.hpp b/include/boost/geometry/formulas/vertex_longitude.hpp index 94cb614fe..4be273126 100644 --- a/include/boost/geometry/formulas/vertex_longitude.hpp +++ b/include/boost/geometry/formulas/vertex_longitude.hpp @@ -1,6 +1,6 @@ // Boost.Geometry -// Copyright (c) 2016-2017 Oracle and/or its affiliates. +// Copyright (c) 2016-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 @@ -337,13 +337,13 @@ class vertex_longitude { public : template - static inline CT apply(CT& lon1, - CT& lat1, + static inline CT apply(CT& /*lon1*/, + CT& /*lat1*/, CT& lon2, - CT& lat2, - CT const& vertex_lat, - CT& alp1, - Strategy const& azimuth_strategy) + CT& /*lat2*/, + CT const& /*vertex_lat*/, + CT& /*alp1*/, + Strategy const& /*azimuth_strategy*/) { return lon2; } diff --git a/include/boost/geometry/strategies/spherical/intersection.hpp b/include/boost/geometry/strategies/spherical/intersection.hpp index d61c8adbb..2bdc8b51a 100644 --- a/include/boost/geometry/strategies/spherical/intersection.hpp +++ b/include/boost/geometry/strategies/spherical/intersection.hpp @@ -541,7 +541,7 @@ private: template static inline bool calculate_collinear_data(Point1 const& a1, Point1 const& a2, // in - Point2 const& b1, Point2 const& b2, // in + Point2 const& b1, Point2 const& /*b2*/, // in Vec3d const& a1v, // in Vec3d const& a2v, // in Plane const& plane1, // in