diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/future | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a8b31b8..728655f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2011-12-23 Jonathan Wakely <jwakely.gcc@gmail.com> + PR libstdc++/49204 + * include/std/future (future_errc): Implement LWG 2056. + +2011-12-23 Jonathan Wakely <jwakely.gcc@gmail.com> + * include/bits/regex.h (match_results::size_type): Use allocator_traits. diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index 040f573..d3180e9 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. |