diff --git a/include/boost/thread/future.hpp b/include/boost/thread/future.hpp index ef9a74f1..bce37680 100644 --- a/include/boost/thread/future.hpp +++ b/include/boost/thread/future.hpp @@ -1380,6 +1380,7 @@ namespace boost } // detail BOOST_THREAD_DCL_MOVABLE_BEG(R) detail::basic_future BOOST_THREAD_DCL_MOVABLE_END +#if (!defined _MSC_VER || _MSC_VER >= 1400) // _MSC_VER == 1400 on MSVC 2005 namespace detail { template @@ -1390,6 +1391,7 @@ namespace boost BOOST_THREAD_FUTURE make_future_deferred_object(BOOST_THREAD_FWD_REF(Fp) f); } +#endif // #if (!defined _MSC_VER || _MSC_VER >= 1400) template class BOOST_THREAD_FUTURE : public detail::basic_future @@ -1430,7 +1432,7 @@ namespace boost 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 @@ namespace boost typedef future_state::state state; - shared_future() + BOOST_CONSTEXPR shared_future() {} ~shared_future()