Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/archive/basic_binary_oprimitive.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
author | Chris Cannam |
---|---|
date | Mon, 07 Sep 2015 11:12:49 +0100 |
parents | 2665513ce2d3 |
children |
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/archive/basic_binary_oprimitive.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/archive/basic_binary_oprimitive.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -2,7 +2,7 @@ #define BOOST_ARCHIVE_BASIC_BINARY_OPRIMITIVE_HPP // MS compatible compilers support #pragma once -#if defined(_MSC_VER) && (_MSC_VER >= 1020) +#if defined(_MSC_VER) # pragma once #endif @@ -54,12 +54,14 @@ namespace boost { namespace archive { +template<class Ch> +class codecvt_null; + ///////////////////////////////////////////////////////////////////////// // class basic_binary_oprimitive - binary output of prmitives template<class Archive, class Elem, class Tr> -class basic_binary_oprimitive -{ +class basic_binary_oprimitive { #ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS friend class save_access; protected: @@ -72,6 +74,7 @@ return static_cast<Archive *>(this); } #ifndef BOOST_NO_STD_LOCALE + boost::scoped_ptr<codecvt_null<Elem> > codecvt_facet; boost::scoped_ptr<std::locale> archive_locale; basic_streambuf_locale_saver<Elem, Tr> locale_saver; #endif @@ -122,7 +125,7 @@ template <class T> #if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS) struct apply { - typedef BOOST_DEDUCED_TYPENAME boost::serialization::is_bitwise_serializable< T >::type type; + typedef typename boost::serialization::is_bitwise_serializable< T >::type type; }; #else struct apply : public boost::serialization::is_bitwise_serializable< T > {}; @@ -170,7 +173,7 @@ archive_exception(archive_exception::output_stream_error) ); //os.write( - // static_cast<const BOOST_DEDUCED_TYPENAME OStream::char_type *>(address), + // static_cast<const typename OStream::char_type *>(address), // count //); //BOOST_ASSERT(os.good());