diff --git a/include/boost/archive/codecvt_null.hpp b/include/boost/archive/codecvt_null.hpp index 35941571..324122b7 100644 --- a/include/boost/archive/codecvt_null.hpp +++ b/include/boost/archive/codecvt_null.hpp @@ -49,7 +49,7 @@ class codecvt_null; template<> class codecvt_null : public std::codecvt { - virtual bool do_always_noconv() const BOOST_NOEXCEPT_OR_NOTHROW { + virtual bool do_always_noconv() const throw() { return true; } public: diff --git a/include/boost/archive/iterators/transform_width.hpp b/include/boost/archive/iterators/transform_width.hpp index ff12776a..d042560e 100644 --- a/include/boost/archive/iterators/transform_width.hpp +++ b/include/boost/archive/iterators/transform_width.hpp @@ -111,11 +111,10 @@ public: transform_width(T start) : super_t(Base(static_cast< T >(start))), m_buffer_out_full(false), - m_buffer_out(), // To disable GCC warning, but not truly necessary //(m_buffer_in will be initialized later before being //used because m_remaining_bits == 0) - m_buffer_in(), + m_buffer_in(0), m_remaining_bits(0), m_end_of_sequence(false) {} diff --git a/include/boost/serialization/detail/shared_count_132.hpp b/include/boost/serialization/detail/shared_count_132.hpp index d2a3da71..a5872557 100644 --- a/include/boost/serialization/detail/shared_count_132.hpp +++ b/include/boost/serialization/detail/shared_count_132.hpp @@ -70,7 +70,7 @@ class bad_weak_ptr: public std::exception { public: - virtual char const * what() const BOOST_NOEXCEPT_OR_NOTHROW + virtual char const * what() const throw() { return "boost::bad_weak_ptr"; } diff --git a/include/boost/serialization/variant.hpp b/include/boost/serialization/variant.hpp index dce6f3d4..70e395e2 100644 --- a/include/boost/serialization/variant.hpp +++ b/include/boost/serialization/variant.hpp @@ -66,6 +66,7 @@ void save( ){ int which = v.which(); ar << BOOST_SERIALIZATION_NVP(which); + typedef typename boost::variant::types types; variant_save_visitor visitor(ar); v.apply_visitor(visitor); }