Ticket #8165: basic_text_iprimitive.diff
File basic_text_iprimitive.diff, 2.0 KB (added by , 10 years ago) |
---|
-
boost/archive/basic_text_iprimitive.hpp
9 9 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 10 10 // basic_text_iprimitive.hpp 11 11 12 // (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 12 // (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 13 13 // Use, modification and distribution is subject to the Boost Software 14 14 // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at 15 15 // http://www.boost.org/LICENSE_1_0.txt) … … 30 30 31 31 #include <boost/config.hpp> 32 32 #if defined(BOOST_NO_STDC_NAMESPACE) 33 namespace std{ 34 using ::size_t; 33 namespace std{ 34 using ::size_t; 35 35 #if ! defined(BOOST_DINKUMWARE_STDLIB) && ! defined(__SGI_STL_PORT) 36 36 using ::locale; 37 37 #endif … … 78 78 #ifndef BOOST_NO_STD_LOCALE 79 79 boost::scoped_ptr<std::locale> archive_locale; 80 80 basic_streambuf_locale_saver< 81 BOOST_DEDUCED_TYPENAME IStream::char_type, 81 BOOST_DEDUCED_TYPENAME IStream::char_type, 82 82 BOOST_DEDUCED_TYPENAME IStream::traits_type 83 83 > locale_saver; 84 84 #endif … … 86 86 template<class T> 87 87 void load(T & t) 88 88 { 89 if(! is.fail()){ 90 is >> t; 89 if (is >> t) 91 90 return; 92 }93 91 boost::serialization::throw_exception( 94 92 archive_exception(archive_exception::input_stream_error) 95 93 ); … … 123 121 t = i; 124 122 } 125 123 #endif 126 BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) 124 BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) 127 125 basic_text_iprimitive(IStream &is, bool no_codecvt); 128 BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) 126 BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) 129 127 ~basic_text_iprimitive(); 130 128 public: 131 129 BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)