diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 16:01:27 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 16:04:05 -0800 |
| commit | b873dc778f52461129b1e28fb12dd3d4a309851c (patch) | |
| tree | e82913bc549a83104ce8abfb518eca6cb6d8aa83 /system/lib/libcxx/future.cpp | |
| parent | 140ea9e81feb09d8f2559995c73d49a39424ef5d (diff) | |
| parent | e0268fa1035a718341c53921eee9318d4a8033cd (diff) | |
Merge branch 'incoming' into f32
Conflicts:
src/parseTools.js
src/preamble.js
Diffstat (limited to 'system/lib/libcxx/future.cpp')
| -rw-r--r-- | system/lib/libcxx/future.cpp | 6 |
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 { |