diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2011-12-23 16:10:48 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2011-12-23 16:10:48 +0000 |
| commit | 7e98765e75b320f20147b5f7ef762567bd9d1c2d (patch) | |
| tree | ec4004779e122d4aca4e19ee2c175a4e63b2a4d8 /libstdc++-v3 | |
| parent | 5bf4dcf26d92bf18a53032378517e0365ba58385 (diff) | |
| download | gcc-7e98765e75b320f20147b5f7ef762567bd9d1c2d.zip gcc-7e98765e75b320f20147b5f7ef762567bd9d1c2d.tar.gz gcc-7e98765e75b320f20147b5f7ef762567bd9d1c2d.tar.bz2 | |
re PR libstdc++/49204 ([C++0x] remaining issues in <future>)
PR libstdc++/49204
* include/std/future (future_errc): Implement LWG 2056.
From-SVN: r182658
Diffstat (limited to 'libstdc++-v3')
| -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. |