summaryrefslogtreecommitdiff
path: root/external/bsd/libc++/dist/libcxx/src/future.cpp
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2013-11-11 23:42:23 +0000
committerjoerg <joerg@NetBSD.org>2013-11-11 23:42:23 +0000
commit7b508f5cf1cffaba9056e779bab2a09bf6767655 (patch)
tree1ded8b22c412394ce3b7605b7da7e7d752c5b1e4 /external/bsd/libc++/dist/libcxx/src/future.cpp
parentf4c7577e0d6de880acbb5d05bffab23df87c32d5 (diff)
Import libc++ r194207. This brings in various bug fixes, a good chunk of
support for the up-coming C++14 and improved compatibility with various compilers other than Clang.
Diffstat (limited to 'external/bsd/libc++/dist/libcxx/src/future.cpp')
-rw-r--r--external/bsd/libc++/dist/libcxx/src/future.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/external/bsd/libc++/dist/libcxx/src/future.cpp b/external/bsd/libc++/dist/libcxx/src/future.cpp
index 7d9a5b5da69..70919ab7df8 100644
--- a/external/bsd/libc++/dist/libcxx/src/future.cpp
+++ b/external/bsd/libc++/dist/libcxx/src/future.cpp
@@ -26,11 +26,15 @@ __future_error_category::name() const _NOEXCEPT
return "future";
}
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wswitch"
+
string
__future_error_category::message(int ev) const
{
switch (static_cast<future_errc>(ev))
{
+ case future_errc(0): // For backwards compatibility with C++11 (LWG 2056)
case future_errc::broken_promise:
return string("The associated promise has been destructed prior "
"to the associated state becoming ready.");
@@ -46,6 +50,8 @@ __future_error_category::message(int ev) const
return string("unspecified future_errc value\n");
}
+#pragma clang diagnostic pop
+
const error_category&
future_category() _NOEXCEPT
{