diff options
Diffstat (limited to 'boost/archive/impl/basic_binary_iprimitive.ipp')
-rw-r--r-- | boost/archive/impl/basic_binary_iprimitive.ipp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/boost/archive/impl/basic_binary_iprimitive.ipp b/boost/archive/impl/basic_binary_iprimitive.ipp index 9e2340eb2d..e22c3bd66b 100644 --- a/boost/archive/impl/basic_binary_iprimitive.ipp +++ b/boost/archive/impl/basic_binary_iprimitive.ipp @@ -23,8 +23,8 @@ namespace std{ #include <boost/detail/workaround.hpp> // fixup for RogueWave #include <boost/serialization/throw_exception.hpp> -#include <boost/scoped_ptr.hpp> +#include <boost/core/no_exceptions_support.hpp> #include <boost/archive/archive_exception.hpp> #include <boost/archive/codecvt_null.hpp> #include <boost/archive/add_facet.hpp> @@ -152,17 +152,16 @@ basic_binary_iprimitive<Archive, Elem, Tr>::basic_binary_iprimitive( ) : #ifndef BOOST_NO_STD_LOCALE m_sb(sb), - archive_locale(NULL), locale_saver(m_sb) { if(! no_codecvt){ archive_locale.reset( - boost::archive::add_facet( + add_facet( std::locale::classic(), new codecvt_null<Elem> ) ); - m_sb.pubimbue(* archive_locale); + //m_sb.pubimbue(* archive_locale); } } #else @@ -199,11 +198,12 @@ BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) basic_binary_iprimitive<Archive, Elem, Tr>::~basic_binary_iprimitive(){ // push back unread characters //destructor can't throw ! - try{ + BOOST_TRY{ static_cast<detail::input_streambuf_access<Elem, Tr> &>(m_sb).sync(); } - catch(...){ + BOOST_CATCH(...){ } + BOOST_CATCH_END } } // namespace archive |