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 130bc0a1ef1aa3597c5e75e653cd95487090d9c4..41d7402eb3b03c1d42560e3265331e7a6a6130ed 100755 (executable)
--- 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.\r
     \return Pointer to a null-terminated string with explanatory information.\r
     */\r
-    virtual char const* what() const throw()\r
+    virtual char const* what() const throw() override\r
     {\r
         return "Boost.Geometry Centroid calculation exception";\r
     }\r

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 289b60774073d607046e224501f6ea1f980122f4..d7f708ff83bb8ab97a1647e2e46997047ff39569 100755 (executable)
--- 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:
 \r
     inline overlay_invalid_input_exception() {}\r
 \r
-    virtual char const* what() const throw()\r
+    virtual char const* what() const throw () override\r
     {\r
         return "Boost.Geometry Overlay invalid input exception";\r
     }\r

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 d42bcdc0d936f5790913a88aa4b8079e9f630feb..d358731ad0c47989b55e46e9e0901fe4b4bc21ea 100755 (executable)
--- 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()\r
     {}\r
 \r
-    virtual char const* what() const throw()\r
+    virtual char const* what() const throw() override\r
     {\r
         return message.c_str();\r
     }\r

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 acdb3952c236bde1205e2c25335306eef66837a5..032b6e0fe9cddee264ad8a8abe90a4c84c1dd4ba 100755 (executable)
--- 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()\r
     {}\r
 \r
-    virtual char const* what() const throw()\r
+    virtual char const* what() const throw() override\r
     {\r
         return "Boost.Geometry Inconsistent Turns exception";\r
     }\r

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 6c9e94541f608f13de0a9b00821b71cf0c15edea..304bfe592c4bdcf7e7d0a170c398f9ce18a6df95 100755 (executable)
--- 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\r
 {\r
 public:\r
-    virtual char const* what() const throw()\r
+    virtual char const* what() const throw() override\r
     {\r
         return "Boost.Geometry exception";\r
     }\r
@@ -52,7 +52,7 @@ public:
 \r
     inline invalid_input_exception() {}\r
 \r
-    virtual char const* what() const throw()\r
+    virtual char const* what() const throw() override\r
     {\r
         return "Boost.Geometry Invalid-Input exception";\r
     }\r
@@ -77,7 +77,7 @@ public:
 \r
     inline empty_input_exception() {}\r
 \r
-    virtual char const* what() const throw()\r
+    virtual char const* what() const throw() override\r
     {\r
         return "Boost.Geometry Empty-Input exception";\r
     }\r

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 4bf80aeccedb02a884d406289e6d8e12297e4bef..689f0d8a75064f1990adb182f3e700708c3c1455 100755 (executable)
--- 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
 \r
     virtual ~read_wkt_exception() throw() {}\r
 \r
-    virtual const char* what() const throw()\r
+    virtual const char* what() const throw() override\r
     {\r
         return complete.c_str();\r
     }\r

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 a36313096e45d47f0e3e9ea2d1c7ee2e7c1d8532..1fca23278f2a66eecccee637f86eb899ebe4b0c2 100644 (file)
--- 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);