Update contrib/restricted/boost/numeric_conversion to 1.79.0

5 files changed, 14 insertions, 14 deletions

diff --git a/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/cast.hpp b/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/cast.hpp
index 61286c1311..3bc19f3cff 100644
--- a/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/cast.hpp
+++ b/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/cast.hpp
@@ -23,7 +23,7 @@
 
 #include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x582))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x582))
 
 #  include<boost/numeric/conversion/detail/old_numeric_cast.hpp>
 
diff --git a/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/converter_policies.hpp b/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/converter_policies.hpp
index 57a255d451..382ffd4ed9 100644
--- a/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/converter_policies.hpp
+++ b/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/converter_policies.hpp
@@ -10,13 +10,13 @@
 #ifndef BOOST_NUMERIC_CONVERSION_CONVERTER_POLICIES_FLC_12NOV2002_HPP
 #define BOOST_NUMERIC_CONVERSION_CONVERTER_POLICIES_FLC_12NOV2002_HPP
 
+#include <functional>
 #include <typeinfo> // for std::bad_cast
 
+#include <boost/config.hpp>
 #include <boost/config/no_tr1/cmath.hpp> // for std::floor and std::ceil
 #include <boost/throw_exception.hpp>
 
-#include <functional>
-
 #include "boost/type_traits/is_arithmetic.hpp"
 
 #include "boost/mpl/if.hpp"
@@ -136,7 +136,7 @@ class bad_numeric_cast : public std::bad_cast
 {
   public:
 
-    virtual const char * what() const noexcept
+    const char * what() const BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE
       {  return "bad numeric conversion: overflow"; }
 };
 
@@ -144,20 +144,20 @@ class negative_overflow : public bad_numeric_cast
 {
   public:
 
-    virtual const char * what() const noexcept
+    const char * what() const BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE
       {  return "bad numeric conversion: negative overflow"; }
 };
 class positive_overflow : public bad_numeric_cast
 {
   public:
 
-    virtual const char * what() const noexcept
+    const char * what() const BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE
       { return "bad numeric conversion: positive overflow"; }
 };
 
 struct def_overflow_handler
 {
-  void operator() ( range_check_result r ) //
+  void operator() ( range_check_result r ) // throw(negative_overflow,positive_overflow)
   {
 #ifndef BOOST_NO_EXCEPTIONS
     if ( r == cNegOverflow )
@@ -175,7 +175,7 @@ struct def_overflow_handler
 
 struct silent_overflow_handler
 {
-  void operator() ( range_check_result ) {} // noexcept
+  void operator() ( range_check_result ) {} // throw()
 } ;
 
 template<class Traits>
diff --git a/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/detail/converter.hpp b/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/detail/converter.hpp
index f7bf7b4436..4b0dd99950 100644
--- a/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/detail/converter.hpp
+++ b/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/detail/converter.hpp
@@ -561,7 +561,7 @@ namespace boost { namespace numeric { namespace convdetail
           >
   struct get_converter_impl
   {
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT( 0x0561 ) )
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT( 0x0561 ) )
     // bcc55 prefers sometimes template parameters to be explicit local types.
     // (notice that is is illegal to reuse the names like this)
     typedef Traits           Traits ;
diff --git a/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/detail/meta.hpp b/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/detail/meta.hpp
index 246a1b4702..6c990744fa 100644
--- a/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/detail/meta.hpp
+++ b/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/detail/meta.hpp
@@ -25,7 +25,7 @@ namespace boost { namespace numeric { namespace convdetail
    template< class T1, class T2>
    struct equal_to
    {
-   #if !defined(__BORLANDC__)
+   #if !defined(BOOST_BORLANDC)
    
        enum { x = ( BOOST_MPL_AUX_VALUE_WKND(T1)::value == BOOST_MPL_AUX_VALUE_WKND(T2)::value ) };
            
diff --git a/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/detail/old_numeric_cast.hpp b/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/detail/old_numeric_cast.hpp
index 9901ed2ae3..d6801f15db 100644
--- a/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/detail/old_numeric_cast.hpp
+++ b/contrib/restricted/boost/numeric_conversion/include/boost/numeric/conversion/detail/old_numeric_cast.hpp
@@ -231,7 +231,7 @@ namespace boost
 #  pragma warning(push)
 #  pragma warning(disable : 4018)
 #  pragma warning(disable : 4146)
-#elif defined(__BORLANDC__)
+#elif defined(BOOST_BORLANDC)
 #  pragma option push -w-8041
 # endif
 
@@ -248,7 +248,7 @@ namespace boost
 
 # if BOOST_MSVC
 #  pragma warning(pop)
-#elif defined(__BORLANDC__)
+#elif defined(BOOST_BORLANDC)
 #  pragma option pop
 # endif
   } // namespace detail
@@ -285,7 +285,7 @@ namespace boost
 # if BOOST_MSVC
 #  pragma warning(push)
 #  pragma warning(disable : 4018)
-#elif defined(__BORLANDC__)
+#elif defined(BOOST_BORLANDC)
 #pragma option push -w-8012
 # endif
         if ((arg < 0 && !result_traits::is_signed)  // loss of negative range
@@ -293,7 +293,7 @@ namespace boost
              || arg > (result_traits::max)())            // overflow
 # if BOOST_MSVC
 #  pragma warning(pop)
-#elif defined(__BORLANDC__)
+#elif defined(BOOST_BORLANDC)
 #pragma option pop
 # endif
 #endif