From a14dd08adf1e1a3deaf6baf1ffdf55f8143f00f9 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely.gcc@gmail.com>
Date: Thu, 10 Feb 2011 22:11:08 +0000
Subject: [PATCH] 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
---
libstdc++-v3/ChangeLog | 4 ++++
libstdc++-v3/src/future.cc | 5 ++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1f6d2e46938f..dc98cf7467be 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 cbce2b1a757f..d5afcf21c8c8 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;
--
GitLab