Subject: [Boost-commit] svn:boost r83521 - trunk/boost/thread
From: vicente.botet_at_[hidden]
Date: 2013-03-22 17:50:21
Author: viboes
Date: 2013-03-22 17:50:20 EDT (Fri, 22 Mar 2013)
New Revision: 83521
URL: http://svn.boost.org/trac/boost/changeset/83521
Log:
Thread: Added constexpr to future default constructor; protect code incompatible with MSVC8.
Text files modified:
trunk/boost/thread/future.hpp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
Modified: trunk/boost/thread/future.hpp
==============================================================================
--- trunk/boost/thread/future.hpp (original)
+++ trunk/boost/thread/future.hpp 2013-03-22 17:50:20 EDT (Fri, 22 Mar 2013)
@@ -1380,6 +1380,7 @@
} // detail
BOOST_THREAD_DCL_MOVABLE_BEG(R) detail::basic_future<R> BOOST_THREAD_DCL_MOVABLE_END
+#if (!defined _MSC_VER || _MSC_VER >= 1400) // _MSC_VER == 1400 on MSVC 2005
namespace detail
{
template <class Rp, class Fp>
@@ -1390,6 +1391,7 @@
BOOST_THREAD_FUTURE<Rp>
make_future_deferred_object(BOOST_THREAD_FWD_REF(Fp) f);
}
+#endif // #if (!defined _MSC_VER || _MSC_VER >= 1400)
template <typename R>
class BOOST_THREAD_FUTURE : public detail::basic_future<R>
@@ -1430,7 +1432,7 @@
BOOST_THREAD_MOVABLE_ONLY(BOOST_THREAD_FUTURE)
typedef future_state::state state;
- BOOST_THREAD_FUTURE() {}
+ BOOST_CONSTEXPR BOOST_THREAD_FUTURE() {}
~BOOST_THREAD_FUTURE() {}
@@ -1522,7 +1524,7 @@
typedef future_state::state state;
- shared_future()
+ BOOST_CONSTEXPR shared_future()
{}
~shared_future()