diff options
| author | dim <dim@FreeBSD.org> | 2014-01-30 07:44:22 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-01-30 07:44:22 +0000 |
| commit | 0b319638e352dd16f2e5a243bd3826d37eef1680 (patch) | |
| tree | add3759d4df7ee10d814c3b2561c3c28fcd9cef2 /contrib/libc++/src/future.cpp | |
| parent | 9cecf9778c1472e916ad20086c11e4bf332ba6ad (diff) | |
| parent | c3e10da3dc0f616b78ccf85206fdcf4c92f8ac85 (diff) | |
| download | FreeBSD-src-0b319638e352dd16f2e5a243bd3826d37eef1680.zip FreeBSD-src-0b319638e352dd16f2e5a243bd3826d37eef1680.tar.gz | |
Import libc++ 3.4 release. This contains a lot of bugfixes, and some
preliminary support for C++1y.
MFC after: 3 weeks
Diffstat (limited to 'contrib/libc++/src/future.cpp')
| -rw-r--r-- | contrib/libc++/src/future.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/contrib/libc++/src/future.cpp b/contrib/libc++/src/future.cpp index 7d9a5b5..70919ab 100644 --- a/contrib/libc++/src/future.cpp +++ b/contrib/libc++/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 { |
