Subject: [Boost-commit] svn:boost r80594 - in trunk/boost/thread: . detail
From: vicente.botet_at_[hidden]
Date: 2012-09-18 20:16:09
Author: viboes
Date: 2012-09-18 20:16:08 EDT (Tue, 18 Sep 2012)
New Revision: 80594
URL: http://svn.boost.org/trac/boost/changeset/80594
Log:
Thread: Added missing what() virtual function of future_error
Text files modified:
trunk/boost/thread/detail/config.hpp | 6 ++++++
trunk/boost/thread/future.hpp | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
Modified: trunk/boost/thread/detail/config.hpp
==============================================================================
--- trunk/boost/thread/detail/config.hpp (original)
+++ trunk/boost/thread/detail/config.hpp 2012-09-18 20:16:08 EDT (Tue, 18 Sep 2012)
@@ -16,6 +16,12 @@
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
+#ifdef BOOST_NO_NOEXCEPT
+# define BOOST_THREAD_NOEXCEPT_OR_THROW throw()
+#else
+# define BOOST_THREAD_NOEXCEPT_OR_THROW noexcept
+#endif
+
// This compiler doesn't support Boost.Chrono
#if defined __IBMCPP__ && (__IBMCPP__ < 1100) && ! defined BOOST_THREAD_DONT_USE_CHRONO
#define BOOST_THREAD_DONT_USE_CHRONO
Modified: trunk/boost/thread/future.hpp
==============================================================================
--- trunk/boost/thread/future.hpp (original)
+++ trunk/boost/thread/future.hpp 2012-09-18 20:16:08 EDT (Tue, 18 Sep 2012)
@@ -136,9 +136,9 @@
{
return ec_;
}
- const char* what() const BOOST_NOEXCEPT
+ const char* what() const BOOST_THREAD_NOEXCEPT_OR_THROW
{
- return code().message();
+ return code().message().c_str();
}
};