From 7e98765e75b320f20147b5f7ef762567bd9d1c2d Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 23 Dec 2011 16:10:48 +0000 Subject: [PATCH] re PR libstdc++/49204 ([C++0x] remaining issues in ) PR libstdc++/49204 * include/std/future (future_errc): Implement LWG 2056. From-SVN: r182658 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/std/future | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a8b31b8b024..728655fb0cb 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2011-12-23 Jonathan Wakely + + PR libstdc++/49204 + * include/std/future (future_errc): Implement LWG 2056. + 2011-12-23 Jonathan Wakely * include/bits/regex.h (match_results::size_type): Use diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index 040f573ea72..d3180e9a6cf 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -60,10 +60,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// Error code for futures enum class future_errc { - broken_promise, - future_already_retrieved, + future_already_retrieved = 1, promise_already_satisfied, - no_state + no_state, + broken_promise }; /// Specialization.