|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r80238 - in trunk: boost/thread libs/thread/doc libs/thread/src
From: vicente.botet_at_[hidden]
Date: 2012-08-26 14:18:04
Author: viboes
Date: 2012-08-26 14:18:03 EDT (Sun, 26 Aug 2012)
New Revision: 80238
URL: http://svn.boost.org/trac/boost/changeset/80238
Log:
Thread:7280: Added noexcep to future_category
Text files modified:
trunk/boost/thread/future.hpp | 17 +++++++++--------
trunk/libs/thread/doc/thread.qbk | 2 +-
trunk/libs/thread/src/future.cpp | 2 +-
3 files changed, 11 insertions(+), 10 deletions(-)
Modified: trunk/boost/thread/future.hpp
==============================================================================
--- trunk/boost/thread/future.hpp (original)
+++ trunk/boost/thread/future.hpp 2012-08-26 14:18:03 EDT (Sun, 26 Aug 2012)
@@ -102,20 +102,20 @@
BOOST_SCOPED_ENUM_DECLARE_END(future_status)
BOOST_THREAD_DECL
- const system::error_category& future_category();
+ const system::error_category& future_category() BOOST_NOEXCEPT;
namespace system
{
inline
error_code
- make_error_code(future_errc e)
+ make_error_code(future_errc e) //BOOST_NOEXCEPT
{
return error_code(underlying_cast<int>(e), boost::future_category());
}
inline
error_condition
- make_error_condition(future_errc e)
+ make_error_condition(future_errc e) //BOOST_NOEXCEPT
{
return error_condition(underlying_cast<int>(e), future_category());
}
@@ -137,14 +137,13 @@
return ec_;
}
- //virtual ~future_error() BOOST_NOEXCEPT;
};
class BOOST_SYMBOL_VISIBLE future_uninitialized:
public future_error
{
public:
- future_uninitialized():
+ future_uninitialized() :
future_error(system::make_error_code(future_errc::no_state))
{}
};
@@ -179,7 +178,6 @@
public:
task_already_started():
future_error(system::make_error_code(future_errc::promise_already_satisfied))
- //std::logic_error("Task already started")
{}
};
@@ -189,7 +187,6 @@
public:
task_moved():
future_error(system::make_error_code(future_errc::no_state))
- //std::logic_error("Task moved")
{}
};
@@ -199,7 +196,6 @@
public:
promise_moved():
future_error(system::make_error_code(future_errc::no_state))
- //std::logic_error("Promise moved")
{}
};
@@ -1219,6 +1215,11 @@
future_->mark_exceptional_finish_internal(p);
}
+ // setting the result with deferred notification
+ //void set_value_at_thread_exit(const R& r); // NOT YET IMPLEMENTED
+ //void set_value_at_thread_exit(see below); // NOT YET IMPLEMENTED
+ //void set_exception_at_thread_exit(exception_ptr p); // NOT YET IMPLEMENTED
+
template<typename F>
void set_wait_callback(F f)
{
Modified: trunk/libs/thread/doc/thread.qbk
==============================================================================
--- trunk/libs/thread/doc/thread.qbk (original)
+++ trunk/libs/thread/doc/thread.qbk 2012-08-26 14:18:03 EDT (Sun, 26 Aug 2012)
@@ -8,7 +8,7 @@
[library Thread
[quickbook 1.5]
- [version 3.0.1]
+ [version 3.1.0]
[authors [Williams, Anthony] [Botet Escriba, Vicente J.]]
[copyright 2007-11 Anthony Williams]
[copyright 2011-12 Vicente J. Botet Escriba]
Modified: trunk/libs/thread/src/future.cpp
==============================================================================
--- trunk/libs/thread/src/future.cpp (original)
+++ trunk/libs/thread/src/future.cpp 2012-08-26 14:18:03 EDT (Sun, 26 Aug 2012)
@@ -51,7 +51,7 @@
}
const system::error_category&
- future_category()
+ future_category() BOOST_NOEXCEPT
{
static thread_detail::future_error_category f;
return f;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk