diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2013-09-14 18:20:10 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2013-09-14 18:20:10 +0000 |
| commit | 3b2d7ee18c5d22b0859bfde0688a1c4957af1bfc (patch) | |
| tree | 2c5d9cec74663f0d7378a7203c21ae4757b47986 /libcxx/src | |
| parent | 401aebab934b54ecf596c8fe628e0e09cf095c97 (diff) | |
| download | bcm5719-llvm-3b2d7ee18c5d22b0859bfde0688a1c4957af1bfc.tar.gz bcm5719-llvm-3b2d7ee18c5d22b0859bfde0688a1c4957af1bfc.zip | |
Marshall Clow: LWG Issue 2056: future_errc enums start with value 0 (invalid value for broken_promise).
llvm-svn: 190756
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/future.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libcxx/src/future.cpp b/libcxx/src/future.cpp index 7d9a5b5da69..70919ab7df8 100644 --- a/libcxx/src/future.cpp +++ b/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 { |
