Swiftdiff options
Diffstat (limited to '3rdParty/Boost/src/boost/serialization/vector.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/serialization/vector.hpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/3rdParty/Boost/src/boost/serialization/vector.hpp b/3rdParty/Boost/src/boost/serialization/vector.hpp index 7520c09..3af1d67 100644 --- a/3rdParty/Boost/src/boost/serialization/vector.hpp +++ b/3rdParty/Boost/src/boost/serialization/vector.hpp @@ -3,5 +3,5 @@ // MS compatible compilers support #pragma once -#if defined(_MSC_VER) && (_MSC_VER >= 1020) +#if defined(_MSC_VER) # pragma once #endif @@ -122,7 +122,7 @@ inline void save( const unsigned int file_version ){ - typedef BOOST_DEDUCED_TYPENAME + typedef typename boost::serialization::use_array_optimization<Archive>::template apply< - BOOST_DEDUCED_TYPENAME remove_const<U>::type + typename remove_const<U>::type >::type use_optimized; save(ar,t,file_version, use_optimized()); @@ -142,7 +142,7 @@ inline void load( } #endif - typedef BOOST_DEDUCED_TYPENAME + typedef typename boost::serialization::use_array_optimization<Archive>::template apply< - BOOST_DEDUCED_TYPENAME remove_const<U>::type + typename remove_const<U>::type >::type use_optimized; load(ar,t,file_version, use_optimized()); @@ -160,6 +160,4 @@ inline void serialize( } -#if ! BOOST_WORKAROUND(BOOST_MSVC, <= 1300) - /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // vector<bool> @@ -208,6 +206,4 @@ inline void serialize( } -#endif // BOOST_WORKAROUND - } // serialization } // namespace boost |