diff options
Diffstat (limited to 'boost/archive/basic_text_iprimitive.hpp')
| -rw-r--r-- | boost/archive/basic_text_iprimitive.hpp | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/boost/archive/basic_text_iprimitive.hpp b/boost/archive/basic_text_iprimitive.hpp index 08da95c36e..bf936b5554 100644 --- a/boost/archive/basic_text_iprimitive.hpp +++ b/boost/archive/basic_text_iprimitive.hpp @@ -24,7 +24,6 @@ // in such cases. So we can't use basic_ostream<IStream::char_type> but rather // use two template parameters -#include <boost/assert.hpp> #include <locale> #include <cstddef> // size_t @@ -38,17 +37,15 @@ namespace std{ } // namespace std #endif +#include <boost/io/ios_state.hpp> +#include <boost/static_assert.hpp> + #include <boost/detail/workaround.hpp> #if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1) #include <boost/archive/dinkumware.hpp> #endif - -#include <boost/limits.hpp> -#include <boost/io/ios_state.hpp> -#include <boost/scoped_ptr.hpp> -#include <boost/static_assert.hpp> - #include <boost/serialization/throw_exception.hpp> +#include <boost/archive/codecvt_null.hpp> #include <boost/archive/archive_exception.hpp> #include <boost/archive/basic_streambuf_locale_saver.hpp> #include <boost/archive/detail/abi_prefix.hpp> // must be the last header @@ -71,9 +68,17 @@ protected: io::ios_precision_saver precision_saver; #ifndef BOOST_NO_STD_LOCALE - boost::scoped_ptr<std::locale> archive_locale; - basic_streambuf_locale_saver< - typename IStream::char_type, + // note order! - if you change this, libstd++ will fail! + // a) create new locale with new codecvt facet + // b) save current locale + // c) change locale to new one + // d) use stream buffer + // e) change locale back to original + // f) destroy new codecvt facet + boost::archive::codecvt_null<typename IStream::char_type> codecvt_null_facet; + std::locale archive_locale; + basic_istream_locale_saver< + typename IStream::char_type, typename IStream::traits_type > locale_saver; #endif |