Merge trunk, including changes to come into closer conformance with C++0x FCD

[SVN r63685]
This commit is contained in:
Beman Dawes
2010-07-06 10:47:30 +00:00
parent 6888c0c7b8
commit 7ffc036bc2
22 changed files with 585 additions and 363 deletions
+6 -7
View File
@@ -17,9 +17,11 @@ namespace boost
{
namespace system
{
// class system_error --------------------------------------------------//
// class system_error ------------------------------------------------------------//
class system_error : public std::runtime_error
class BOOST_SYMBOL_VISIBLE system_error : public std::runtime_error
// BOOST_SYMBOL_VISIBLE is needed by GCC to ensure system_error thrown from a shared
// library can be caught. See svn.boost.org/trac/boost/ticket/3697
{
public:
system_error( error_code ec )
@@ -62,11 +64,8 @@ namespace boost
try
{
m_what = this->std::runtime_error::what();
if ( m_error_code )
{
if ( !m_what.empty() ) m_what += ": ";
m_what += m_error_code.message();
}
if ( !m_what.empty() ) m_what += ": ";
m_what += m_error_code.message();
}
catch (...) { return std::runtime_error::what(); }
}