aboutsummaryrefslogtreecommitdiff
path: root/system/lib/libcxx/future.cpp
diff options
context:
space:
mode:
authorBruce Mitchener <bruce.mitchener@gmail.com>2013-11-07 15:49:37 +0700
committerBruce Mitchener <bruce.mitchener@gmail.com>2013-11-07 16:07:18 +0700
commit44af976a44bc194b985fdb880f99a7feff133b5a (patch)
tree400fb651d819c41e26b417d36a4315ec947fd387 /system/lib/libcxx/future.cpp
parent7f870cf9c357f6a1138ba612ace7d7249f85e250 (diff)
Update libcxx to 194185, 2013-11-07.
This brings C++14 support.
Diffstat (limited to 'system/lib/libcxx/future.cpp')
-rw-r--r--system/lib/libcxx/future.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/system/lib/libcxx/future.cpp b/system/lib/libcxx/future.cpp
index 7d9a5b5d..70919ab7 100644
--- a/system/lib/libcxx/future.cpp
+++ b/system/lib/libcxx/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
{