diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2011-02-10 22:11:08 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2011-02-10 22:11:08 +0000 |
| commit | a14dd08adf1e1a3deaf6baf1ffdf55f8143f00f9 (patch) | |
| tree | f7c66bada853e0512e8f8708fbea0ba76fa7bbb7 | |
| parent | e372156c0528718f47249b181c46ad6f5440b341 (diff) | |
| download | gcc-a14dd08adf1e1a3deaf6baf1ffdf55f8143f00f9.zip gcc-a14dd08adf1e1a3deaf6baf1ffdf55f8143f00f9.tar.gz gcc-a14dd08adf1e1a3deaf6baf1ffdf55f8143f00f9.tar.bz2 | |
future.cc (future_error_category::message): Handle no_state.
2011-02-10 Jonathan Wakely <jwakely.gcc@gmail.com>
* src/future.cc (future_error_category::message): Handle no_state.
From-SVN: r170024
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/src/future.cc | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1f6d2e4..dc98cf7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2011-02-10 Jonathan Wakely <jwakely.gcc@gmail.com> + + * src/future.cc (future_error_category::message): Handle no_state. + 2011-02-10 Paolo Carlini <paolo.carlini@oracle.com> * testsuite/23_containers/multimap/modifiers/erase/47628.cc: Do diff --git a/libstdc++-v3/src/future.cc b/libstdc++-v3/src/future.cc index cbce2b1..d5afcf2 100644 --- a/libstdc++-v3/src/future.cc +++ b/libstdc++-v3/src/future.cc @@ -1,6 +1,6 @@ // future -*- C++ -*- -// Copyright (C) 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -48,6 +48,9 @@ namespace case std::future_errc::promise_already_satisfied: __msg = "Promise already satisfied"; break; + case std::future_errc::no_state: + __msg = "No associated state"; + break; default: __msg = "Unknown error"; break; |