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/split_free.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/split_free.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/serialization/split_free.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/3rdParty/Boost/src/boost/serialization/split_free.hpp b/3rdParty/Boost/src/boost/serialization/split_free.hpp index 9dbcd2f..85e2f59 100644 --- a/3rdParty/Boost/src/boost/serialization/split_free.hpp +++ b/3rdParty/Boost/src/boost/serialization/split_free.hpp @@ -1,93 +1,93 @@ #ifndef BOOST_SERIALIZATION_SPLIT_FREE_HPP #define BOOST_SERIALIZATION_SPLIT_FREE_HPP // MS compatible compilers support #pragma once -#if defined(_MSC_VER) && (_MSC_VER >= 1020) +#if defined(_MSC_VER) # pragma once #endif /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // split_free.hpp: // (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org for updates, documentation, and revision history. #include <boost/config.hpp> #include <boost/mpl/eval_if.hpp> #include <boost/mpl/identity.hpp> #include <boost/serialization/serialization.hpp> namespace boost { namespace archive { namespace detail { template<class Archive> class interface_oarchive; template<class Archive> class interface_iarchive; } // namespace detail } // namespace archive namespace serialization { //namespace detail { template<class Archive, class T> struct free_saver { static void invoke( Archive & ar, const T & t, const unsigned int file_version ){ // use function overload (version_type) to workaround // two-phase lookup issue const version_type v(file_version); save(ar, t, v); } }; template<class Archive, class T> struct free_loader { static void invoke( Archive & ar, T & t, const unsigned int file_version ){ // use function overload (version_type) to workaround // two-phase lookup issue const version_type v(file_version); load(ar, t, v); } }; //} // namespace detail template<class Archive, class T> inline void split_free( Archive & ar, T & t, const unsigned int file_version ){ - typedef BOOST_DEDUCED_TYPENAME mpl::eval_if< - BOOST_DEDUCED_TYPENAME Archive::is_saving, + typedef typename mpl::eval_if< + typename Archive::is_saving, mpl::identity</* detail:: */ free_saver<Archive, T> >, mpl::identity</* detail:: */ free_loader<Archive, T> > >::type typex; typex::invoke(ar, t, file_version); } } // namespace serialization } // namespace boost #define BOOST_SERIALIZATION_SPLIT_FREE(T) \ namespace boost { namespace serialization { \ template<class Archive> \ inline void serialize( \ Archive & ar, \ T & t, \ const unsigned int file_version \ ){ \ split_free(ar, t, file_version); \ } \ }} /**/ #endif // BOOST_SERIALIZATION_SPLIT_FREE_HPP |