Swiftdiff options
Diffstat (limited to '3rdParty/Boost/src/boost/variant/get.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/variant/get.hpp | 72 |
1 files changed, 16 insertions, 56 deletions
diff --git a/3rdParty/Boost/src/boost/variant/get.hpp b/3rdParty/Boost/src/boost/variant/get.hpp index 99a65f6..e3302c0 100644 --- a/3rdParty/Boost/src/boost/variant/get.hpp +++ b/3rdParty/Boost/src/boost/variant/get.hpp @@ -18,4 +18,5 @@ #include "boost/config.hpp" #include "boost/detail/workaround.hpp" +#include "boost/throw_exception.hpp" #include "boost/utility/addressof.hpp" #include "boost/variant/variant_fwd.hpp" @@ -24,10 +25,4 @@ #include "boost/type_traits/add_pointer.hpp" -#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) -# include "boost/mpl/bool.hpp" -# include "boost/mpl/or.hpp" -# include "boost/type_traits/is_same.hpp" -#endif - namespace boost { @@ -37,10 +32,10 @@ namespace boost { // The exception thrown in the event of a failed get of a value. // -class bad_get +class BOOST_SYMBOL_VISIBLE bad_get : public std::exception { public: // std::exception implementation - virtual const char * what() const throw() + virtual const char * what() const BOOST_NOEXCEPT_OR_NOTHROW { return "boost::bad_get: " @@ -78,22 +73,5 @@ public: // visitor typedefs public: // visitor interfaces -#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) - - pointer operator()(reference operand) const - { - return boost::addressof(operand); - } - - template <typename U> - pointer operator()(const U&) const - { - return static_cast<pointer>(0); - } - -#else // MSVC6 - -private: // helpers, for visitor interfaces (below) - - pointer execute_impl(reference operand, mpl::true_) const + pointer operator()(reference operand) const BOOST_NOEXCEPT { return boost::addressof(operand); @@ -101,37 +79,19 @@ private: // helpers, for visitor interfaces (below) template <typename U> - pointer execute_impl(const U& operand, mpl::false_) const + pointer operator()(const U&) const BOOST_NOEXCEPT { return static_cast<pointer>(0); } - -public: // visitor interfaces - - template <typename U> - pointer operator()(U& operand) const - { - // MSVC6 finds normal implementation (above) ambiguous, - // so we must explicitly disambiguate - - typedef typename mpl::or_< - is_same<U, T> - , is_same<const U, T> - >::type U_is_T; - - return execute_impl(operand, U_is_T()); - } - -#endif // MSVC6 workaround - }; }} // namespace detail::variant -#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x0551)) -# define BOOST_VARIANT_AUX_GET_EXPLICIT_TEMPLATE_TYPE(t) \ - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(t) -#else -# define BOOST_VARIANT_AUX_GET_EXPLICIT_TEMPLATE_TYPE(t) \ - , t* = 0 +#ifndef BOOST_VARIANT_AUX_GET_EXPLICIT_TEMPLATE_TYPE +# if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x0551)) +# define BOOST_VARIANT_AUX_GET_EXPLICIT_TEMPLATE_TYPE(t) +# else +# define BOOST_VARIANT_AUX_GET_EXPLICIT_TEMPLATE_TYPE(t) \ + , t* = 0 +# endif #endif @@ -142,5 +102,5 @@ get( boost::variant< BOOST_VARIANT_ENUM_PARAMS(T) >* operand BOOST_VARIANT_AUX_GET_EXPLICIT_TEMPLATE_TYPE(U) - ) + ) BOOST_NOEXCEPT { typedef typename add_pointer<U>::type U_ptr; @@ -157,5 +117,5 @@ get( const boost::variant< BOOST_VARIANT_ENUM_PARAMS(T) >* operand BOOST_VARIANT_AUX_GET_EXPLICIT_TEMPLATE_TYPE(U) - ) + ) BOOST_NOEXCEPT { typedef typename add_pointer<const U>::type U_ptr; @@ -178,5 +138,5 @@ get( if (!result) - throw bad_get(); + boost::throw_exception(bad_get()); return *result; } @@ -194,5 +154,5 @@ get( if (!result) - throw bad_get(); + boost::throw_exception(bad_get()); return *result; } |