diff --git a/include/boost/exception/detail/object_hex_dump.hpp b/include/boost/exception/detail/object_hex_dump.hpp index ccf1bac..dc38b4a 100644 --- a/include/boost/exception/detail/object_hex_dump.hpp +++ b/include/boost/exception/detail/object_hex_dump.hpp @@ -13,7 +13,7 @@ #endif #include -#include +#include #include #include #include @@ -36,9 +36,9 @@ boost s.fill('0'); s.width(2); unsigned char const * b=reinterpret_cast(&x); - s << std::setw(2) << std::hex << (unsigned int)*b; + s << boost::detail::setw(2) << std::hex << (unsigned int)*b; for( unsigned char const * e=b+n; ++b!=e; ) - s << " " << std::setw(2) << std::hex << (unsigned int)*b; + s << " " << boost::detail::setw(2) << std::hex << (unsigned int)*b; return s.str(); } } diff --git a/test/cloning_test.cpp b/test/cloning_test.cpp index 33602c9..58e66f3 100644 --- a/test/cloning_test.cpp +++ b/test/cloning_test.cpp @@ -27,6 +27,10 @@ may_throw_on_copy if( throw_ ) throw T(); } + + #if defined(__PATHSCALE__) + ~may_throw_on_copy() throw() {} + #endif bool throw_; }; @@ -59,6 +63,9 @@ struct derives_std_exception: std::exception { + #if defined(__PATHSCALE__) + ~derives_std_exception() throw() {} + #endif }; struct @@ -77,12 +84,19 @@ derives_std_boost_exception: { return wh_; } + + #if defined(__PATHSCALE__) + ~derives_std_boost_exception() throw() {} + #endif }; struct derives_boost_exception: boost::exception { + #if defined(__PATHSCALE__) + ~derives_boost_exception() throw() {} + #endif }; template diff --git a/test/diagnostic_information_test.cpp b/test/diagnostic_information_test.cpp index 8ced6e3..8000a74 100644 --- a/test/diagnostic_information_test.cpp +++ b/test/diagnostic_information_test.cpp @@ -30,6 +30,10 @@ error1: std::exception, boost::exception { + #if defined(__PATHSCALE__) + ~error1() throw() {} + #endif + char const * what() const throw() { @@ -41,6 +45,9 @@ struct error2: boost::exception { + #if defined(__PATHSCALE__) + ~error2() throw() {} + #endif }; struct @@ -52,6 +59,9 @@ error3: { return "error3"; } + #if defined(__PATHSCALE__) + ~error3() throw() {} + #endif }; struct @@ -64,6 +74,9 @@ error4: { return diagnostic_information_what(*this); } + #if defined(__PATHSCALE__) + ~error4() throw() {} + #endif }; void diff --git a/test/errinfos_test.cpp b/test/errinfos_test.cpp index bf3ad5f..1331cb4 100644 --- a/test/errinfos_test.cpp +++ b/test/errinfos_test.cpp @@ -22,6 +22,9 @@ test_exception: virtual boost::exception, virtual std::exception { + #if defined(__PATHSCALE__) + ~test_exception() throw() {} + #endif }; int diff --git a/test/no_exceptions_test.cpp b/test/no_exceptions_test.cpp index 2609be6..a6737e1 100644 --- a/test/no_exceptions_test.cpp +++ b/test/no_exceptions_test.cpp @@ -21,6 +21,9 @@ my_exception: { return "my_exception"; } + #if defined(__PATHSCALE__) + ~my_exception() throw() {} + #endif }; typedef boost::error_info my_int; diff --git a/test/throw_exception_test.cpp b/test/throw_exception_test.cpp index 37ecef9..84ee77a 100644 --- a/test/throw_exception_test.cpp +++ b/test/throw_exception_test.cpp @@ -15,6 +15,9 @@ struct exception1: std::exception { + #if defined(__PATHSCALE__) + ~exception1() throw() {} + #endif }; struct @@ -22,6 +25,9 @@ exception2: std::exception, boost::exception { + #if defined(__PATHSCALE__) + ~exception2() throw() {} + #endif }; void