diff --git a/include/boost/archive/archive_exception.hpp b/include/boost/archive/archive_exception.hpp index ffb430c6..889ba9d7 100644 --- a/include/boost/archive/archive_exception.hpp +++ b/include/boost/archive/archive_exception.hpp @@ -40,7 +40,7 @@ namespace archive { ////////////////////////////////////////////////////////////////////// // exceptions thrown by archives // -class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) archive_exception : +class BOOST_SYMBOL_VISIBLE archive_exception : public virtual std::exception { protected: @@ -82,13 +82,13 @@ public: exception_code c, const char * e1 = NULL, const char * e2 = NULL - ); - virtual ~archive_exception() throw(); - virtual const char *what() const throw(); + ) BOOST_NOEXCEPT; + virtual ~archive_exception() BOOST_NOEXCEPT_OR_NOTHROW ; + virtual const char *what() const BOOST_NOEXCEPT_OR_NOTHROW ; protected: unsigned int append(unsigned int l, const char * a); - archive_exception(); + archive_exception() BOOST_NOEXCEPT; }; }// namespace archive diff --git a/include/boost/archive/codecvt_null.hpp b/include/boost/archive/codecvt_null.hpp index 75387a97..4668c435 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 throw() { + virtual bool do_always_noconv() const BOOST_NOEXCEPT_OR_NOTHROW { return true; } public: diff --git a/include/boost/serialization/detail/shared_count_132.hpp b/include/boost/serialization/detail/shared_count_132.hpp index a63e4884..0bba312c 100644 --- a/include/boost/serialization/detail/shared_count_132.hpp +++ b/include/boost/serialization/detail/shared_count_132.hpp @@ -79,7 +79,7 @@ class bad_weak_ptr: public std::exception { public: - virtual char const * what() const throw() + virtual char const * what() const BOOST_NOEXCEPT_OR_NOTHROW { return "boost::bad_weak_ptr"; } diff --git a/src/archive_exception.cpp b/src/archive_exception.cpp index d06303f6..368f0376 100644 --- a/src/archive_exception.cpp +++ b/src/archive_exception.cpp @@ -39,7 +39,7 @@ archive_exception::archive_exception( exception_code c, const char * e1, const char * e2 -) : +) BOOST_NOEXCEPT : code(c) { unsigned int length = 0; @@ -111,16 +111,15 @@ archive_exception::archive_exception( } } BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) -archive_exception::~archive_exception() throw() {} +archive_exception::~archive_exception() BOOST_NOEXCEPT_OR_NOTHROW {} BOOST_ARCHIVE_DECL(const char *) -archive_exception::what( ) const throw() -{ +archive_exception::what( ) const BOOST_NOEXCEPT_OR_NOTHROW { return m_buffer; } BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) -archive_exception::archive_exception() : - code(no_exception) +archive_exception::archive_exception() BOOST_NOEXCEPT : + code(no_exception) {} } // archive