diff options
author | Tobias Markmann <tm@ayena.de> | 2014-10-19 20:22:58 (GMT) |
---|---|---|
committer | Tobias Markmann <tm@ayena.de> | 2014-10-20 13:49:33 (GMT) |
commit | 6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch) | |
tree | 2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Boost/src/boost/variant/static_visitor.hpp | |
parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
download | swift-contrib-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-contrib-6b22dfcf59474dd016a0355a3102a1dd3692d92c.tar.bz2 |
Update Boost in 3rdParty to version 1.56.0.
This updates Boost in our 3rdParty directory to version 1.56.0.
Updated our update.sh script to stop on error.
Changed error reporting in SwiftTools/CrashReporter.cpp to SWIFT_LOG due to
missing include of <iostream> with newer Boost.
Change-Id: I4b35c77de951333979a524097f35f5f83d325edc
Diffstat (limited to '3rdParty/Boost/src/boost/variant/static_visitor.hpp')
-rw-r--r-- | 3rdParty/Boost/src/boost/variant/static_visitor.hpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/3rdParty/Boost/src/boost/variant/static_visitor.hpp b/3rdParty/Boost/src/boost/variant/static_visitor.hpp index b59b6f5..199317c 100644 --- a/3rdParty/Boost/src/boost/variant/static_visitor.hpp +++ b/3rdParty/Boost/src/boost/variant/static_visitor.hpp @@ -19,10 +19,6 @@ #include "boost/mpl/if.hpp" #include "boost/type_traits/is_base_and_derived.hpp" -#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) -# include "boost/type_traits/is_same.hpp" -#endif - // should be the last #include #include "boost/type_traits/detail/bool_trait_def.hpp" @@ -52,10 +48,13 @@ public: // typedefs typedef R result_type; protected: // for use as base class only - - static_visitor() { } - ~static_visitor() { } - +#ifndef BOOST_NO_DEFAULTED_FUNCTIONS + static_visitor() = default; + ~static_visitor() = default; +#else + static_visitor() BOOST_NOEXCEPT { } + ~static_visitor() BOOST_NOEXCEPT { } +#endif }; ////////////////////////////////////////////////////////////////////////// |