From: Daniel Arndt Date: Wed, 5 Dec 2018 10:12:14 +0000 (+0100) Subject: Fix a few warnings from the bundled boost package X-Git-Tag: v9.1.0-rc1~511^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b5e820527a21674182b12bbcbd143f81a8994ba;p=dealii.git Fix a few warnings from the bundled boost package --- diff --git a/bundled/boost-1.62.0/include/boost/geometry/algorithms/centroid.hpp b/bundled/boost-1.62.0/include/boost/geometry/algorithms/centroid.hpp index 130bc0a1ef..41d7402eb3 100755 --- a/bundled/boost-1.62.0/include/boost/geometry/algorithms/centroid.hpp +++ b/bundled/boost-1.62.0/include/boost/geometry/algorithms/centroid.hpp @@ -92,7 +92,7 @@ public: \brief Returns the explanatory string. \return Pointer to a null-terminated string with explanatory information. */ - virtual char const* what() const throw() + virtual char const* what() const throw() override { return "Boost.Geometry Centroid calculation exception"; } diff --git a/bundled/boost-1.62.0/include/boost/geometry/algorithms/detail/has_self_intersections.hpp b/bundled/boost-1.62.0/include/boost/geometry/algorithms/detail/has_self_intersections.hpp index 289b607740..d7f708ff83 100755 --- a/bundled/boost-1.62.0/include/boost/geometry/algorithms/detail/has_self_intersections.hpp +++ b/bundled/boost-1.62.0/include/boost/geometry/algorithms/detail/has_self_intersections.hpp @@ -45,7 +45,7 @@ public: inline overlay_invalid_input_exception() {} - virtual char const* what() const throw() + virtual char const* what() const throw () override { return "Boost.Geometry Overlay invalid input exception"; } diff --git a/bundled/boost-1.62.0/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp b/bundled/boost-1.62.0/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp index d42bcdc0d9..d358731ad0 100755 --- a/bundled/boost-1.62.0/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp +++ b/bundled/boost-1.62.0/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp @@ -56,7 +56,7 @@ public: virtual ~turn_info_exception() throw() {} - virtual char const* what() const throw() + virtual char const* what() const throw() override { return message.c_str(); } diff --git a/bundled/boost-1.62.0/include/boost/geometry/algorithms/detail/overlay/inconsistent_turns_exception.hpp b/bundled/boost-1.62.0/include/boost/geometry/algorithms/detail/overlay/inconsistent_turns_exception.hpp index acdb3952c2..032b6e0fe9 100755 --- a/bundled/boost-1.62.0/include/boost/geometry/algorithms/detail/overlay/inconsistent_turns_exception.hpp +++ b/bundled/boost-1.62.0/include/boost/geometry/algorithms/detail/overlay/inconsistent_turns_exception.hpp @@ -25,7 +25,7 @@ public: virtual ~inconsistent_turns_exception() throw() {} - virtual char const* what() const throw() + virtual char const* what() const throw() override { return "Boost.Geometry Inconsistent Turns exception"; } diff --git a/bundled/boost-1.62.0/include/boost/geometry/core/exception.hpp b/bundled/boost-1.62.0/include/boost/geometry/core/exception.hpp index 6c9e94541f..304bfe592c 100755 --- a/bundled/boost-1.62.0/include/boost/geometry/core/exception.hpp +++ b/bundled/boost-1.62.0/include/boost/geometry/core/exception.hpp @@ -33,7 +33,7 @@ namespace boost { namespace geometry class exception : public std::exception { public: - virtual char const* what() const throw() + virtual char const* what() const throw() override { return "Boost.Geometry exception"; } @@ -52,7 +52,7 @@ public: inline invalid_input_exception() {} - virtual char const* what() const throw() + virtual char const* what() const throw() override { return "Boost.Geometry Invalid-Input exception"; } @@ -77,7 +77,7 @@ public: inline empty_input_exception() {} - virtual char const* what() const throw() + virtual char const* what() const throw() override { return "Boost.Geometry Empty-Input exception"; } diff --git a/bundled/boost-1.62.0/include/boost/geometry/io/wkt/read.hpp b/bundled/boost-1.62.0/include/boost/geometry/io/wkt/read.hpp index 4bf80aecce..689f0d8a75 100755 --- a/bundled/boost-1.62.0/include/boost/geometry/io/wkt/read.hpp +++ b/bundled/boost-1.62.0/include/boost/geometry/io/wkt/read.hpp @@ -91,7 +91,7 @@ struct read_wkt_exception : public geometry::exception virtual ~read_wkt_exception() throw() {} - virtual const char* what() const throw() + virtual const char* what() const throw() override { return complete.c_str(); } diff --git a/bundled/boost-1.62.0/include/boost/numeric/ublas/matrix_expression.hpp b/bundled/boost-1.62.0/include/boost/numeric/ublas/matrix_expression.hpp index a36313096e..1fca23278f 100644 --- a/bundled/boost-1.62.0/include/boost/numeric/ublas/matrix_expression.hpp +++ b/bundled/boost-1.62.0/include/boost/numeric/ublas/matrix_expression.hpp @@ -2221,10 +2221,10 @@ namespace boost { namespace numeric { namespace ublas { index1 = it1_.index1 (); } size_type index2 = (*this) ().size1 (); - if (it2_ != it2_end_) + if (it2_ != it2_end_) { if (it2_.index1 () <= i_) ++ it2_; - if (it2_ != it2_end_) { + if (it2_ != it2_end_) index2 = it2_.index1 (); } i_ = (std::min) (index1, index2);