From 57da005e5f9a3138e6709427cc7c452639bfc09f Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Mon, 6 Apr 2015 12:48:20 +0300 Subject: [PATCH] Revert "add BOOST_SYMBOL_VISIBLE to otherwise invisible classes and implement BOOST_NOEXCEPT where needed" This reverts commit e7a7ee8018c5eebbaeaadd9ae519ede638d18b45. --- include/boost/archive/archive_exception.hpp | 10 +++++----- include/boost/archive/codecvt_null.hpp | 2 +- .../boost/serialization/detail/shared_count_132.hpp | 2 +- src/archive_exception.cpp | 11 ++++++----- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/include/boost/archive/archive_exception.hpp b/include/boost/archive/archive_exception.hpp index 889ba9d7..ffb430c6 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_SYMBOL_VISIBLE archive_exception : +class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) archive_exception : public virtual std::exception { protected: @@ -82,13 +82,13 @@ public: exception_code c, const char * e1 = NULL, const char * e2 = NULL - ) BOOST_NOEXCEPT; - virtual ~archive_exception() BOOST_NOEXCEPT_OR_NOTHROW ; - virtual const char *what() const BOOST_NOEXCEPT_OR_NOTHROW ; + ); + virtual ~archive_exception() throw(); + virtual const char *what() const throw(); protected: unsigned int append(unsigned int l, const char * a); - archive_exception() BOOST_NOEXCEPT; + archive_exception(); }; }// namespace archive diff --git a/include/boost/archive/codecvt_null.hpp b/include/boost/archive/codecvt_null.hpp index 4668c435..75387a97 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/serialization/detail/shared_count_132.hpp b/include/boost/serialization/detail/shared_count_132.hpp index 0bba312c..a63e4884 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 BOOST_NOEXCEPT_OR_NOTHROW + virtual char const * what() const throw() { return "boost::bad_weak_ptr"; } diff --git a/src/archive_exception.cpp b/src/archive_exception.cpp index 368f0376..d06303f6 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,15 +111,16 @@ archive_exception::archive_exception( } } BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) -archive_exception::~archive_exception() BOOST_NOEXCEPT_OR_NOTHROW {} +archive_exception::~archive_exception() throw() {} BOOST_ARCHIVE_DECL(const char *) -archive_exception::what( ) const BOOST_NOEXCEPT_OR_NOTHROW { +archive_exception::what( ) const throw() +{ return m_buffer; } BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) -archive_exception::archive_exception() BOOST_NOEXCEPT : - code(no_exception) +archive_exception::archive_exception() : + code(no_exception) {} } // archive