Swiftdiff 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/serialization/wrapper.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/serialization/wrapper.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/serialization/wrapper.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/3rdParty/Boost/src/boost/serialization/wrapper.hpp b/3rdParty/Boost/src/boost/serialization/wrapper.hpp index eeb4333..6a2a730 100644 --- a/3rdParty/Boost/src/boost/serialization/wrapper.hpp +++ b/3rdParty/Boost/src/boost/serialization/wrapper.hpp @@ -9,52 +9,52 @@ #include <boost/serialization/traits.hpp> #include <boost/type_traits/is_base_and_derived.hpp> #include <boost/mpl/eval_if.hpp> #include <boost/mpl/bool.hpp> namespace boost { namespace serialization { /// the base class for serialization wrappers /// /// wrappers need to be treated differently at various places in the serialization library, /// e.g. saving of non-const wrappers has to be possible. Since partial specialization // is not supported by all compilers, we derive all wrappers from wrapper_traits. template< class T, int Level = object_serializable, int Tracking = track_never, unsigned int Version = 0, class ETII = extended_type_info_impl< T > > struct wrapper_traits : public traits<T,Level,Tracking,Version,ETII,mpl::true_> {}; template<class T> struct is_wrapper_impl : boost::mpl::eval_if< boost::is_base_and_derived<basic_traits,T>, boost::mpl::true_, boost::mpl::false_ >::type {}; template<class T> struct is_wrapper { - typedef BOOST_DEDUCED_TYPENAME is_wrapper_impl<const T>::type type; + typedef typename is_wrapper_impl<const T>::type type; }; } // serialization } // boost // A macro to define that a class is a wrapper #define BOOST_CLASS_IS_WRAPPER(T) \ namespace boost { \ namespace serialization { \ template<> \ struct is_wrapper_impl<const T> : boost::mpl::true_ {}; \ } \ } \ /**/ #endif //BOOST_SERIALIZATION_WRAPPER_HPP |