diff options
| author | robot-contrib <[email protected]> | 2022-12-29 09:57:48 +0300 |
|---|---|---|
| committer | robot-contrib <[email protected]> | 2022-12-29 09:57:48 +0300 |
| commit | 08e063e2e9be033490039c8bcfbccfb1ce3228fb (patch) | |
| tree | 3b247cb8e5e512b8b15f0bfdf5388ca9aaaf9879 | |
| parent | 17e3143b14bd15221197d6109f5aad8bbbd9b506 (diff) | |
Update contrib/restricted/boost/lexical_cast to 1.81.0
3 files changed, 10 insertions, 7 deletions
diff --git a/contrib/restricted/boost/lexical_cast/include/boost/lexical_cast/detail/converter_lexical_streams.hpp b/contrib/restricted/boost/lexical_cast/include/boost/lexical_cast/detail/converter_lexical_streams.hpp index 01913b220c7..17c6cf9b702 100644 --- a/contrib/restricted/boost/lexical_cast/include/boost/lexical_cast/detail/converter_lexical_streams.hpp +++ b/contrib/restricted/boost/lexical_cast/include/boost/lexical_cast/detail/converter_lexical_streams.hpp @@ -76,7 +76,7 @@ #include <boost/container/container_fwd.hpp> #include <boost/integer.hpp> #include <boost/detail/basic_pointerbuf.hpp> -#include <boost/noncopyable.hpp> +#include <boost/core/noncopyable.hpp> #ifndef BOOST_NO_CWCHAR # include <cwchar> #endif diff --git a/contrib/restricted/boost/lexical_cast/include/boost/lexical_cast/detail/converter_numeric.hpp b/contrib/restricted/boost/lexical_cast/include/boost/lexical_cast/detail/converter_numeric.hpp index 9178076f82d..86c278f7c9c 100644 --- a/contrib/restricted/boost/lexical_cast/include/boost/lexical_cast/detail/converter_numeric.hpp +++ b/contrib/restricted/boost/lexical_cast/include/boost/lexical_cast/detail/converter_numeric.hpp @@ -32,6 +32,7 @@ #include <boost/type_traits/is_arithmetic.hpp> #include <boost/type_traits/is_base_of.hpp> #include <boost/type_traits/is_float.hpp> +#include <boost/type_traits/remove_volatile.hpp> #include <boost/numeric/conversion/cast.hpp> @@ -155,14 +156,16 @@ struct lexical_cast_dynamic_num_ignoring_minus template <typename Target, typename Source> struct dynamic_num_converter_impl { - static inline bool try_convert(const Source &arg, Target& result) BOOST_NOEXCEPT { + typedef BOOST_DEDUCED_TYPENAME boost::remove_volatile<Source>::type source_type; + + static inline bool try_convert(source_type arg, Target& result) BOOST_NOEXCEPT { typedef BOOST_DEDUCED_TYPENAME boost::conditional< boost::is_unsigned<Target>::value && - (boost::is_signed<Source>::value || boost::is_float<Source>::value) && - !(boost::is_same<Source, bool>::value) && + (boost::is_signed<source_type>::value || boost::is_float<source_type>::value) && + !(boost::is_same<source_type, bool>::value) && !(boost::is_same<Target, bool>::value), - lexical_cast_dynamic_num_ignoring_minus<Target, Source>, - lexical_cast_dynamic_num_not_ignoring_minus<Target, Source> + lexical_cast_dynamic_num_ignoring_minus<Target, source_type>, + lexical_cast_dynamic_num_not_ignoring_minus<Target, source_type> >::type caster_type; return caster_type::try_convert(arg, result); diff --git a/contrib/restricted/boost/lexical_cast/include/boost/lexical_cast/detail/lcast_unsigned_converters.hpp b/contrib/restricted/boost/lexical_cast/include/boost/lexical_cast/detail/lcast_unsigned_converters.hpp index 5f2f90c9d4e..3aa6d574006 100644 --- a/contrib/restricted/boost/lexical_cast/include/boost/lexical_cast/detail/lcast_unsigned_converters.hpp +++ b/contrib/restricted/boost/lexical_cast/include/boost/lexical_cast/detail/lcast_unsigned_converters.hpp @@ -50,7 +50,7 @@ #include <boost/lexical_cast/detail/lcast_char_constants.hpp> #include <boost/type_traits/make_unsigned.hpp> #include <boost/type_traits/is_signed.hpp> -#include <boost/noncopyable.hpp> +#include <boost/core/noncopyable.hpp> namespace boost { |
