summaryrefslogtreecommitdiff
path: root/external/bsd/libc++/dist/libcxx/src/future.cpp
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2014-01-04 21:32:03 +0000
committerjoerg <joerg@NetBSD.org>2014-01-04 21:32:03 +0000
commitcd1d3613909b4991fa4085ad0b2bedae0d4d53c2 (patch)
treefc34924f3ac640c9a081aacde2d967ad7508abc7 /external/bsd/libc++/dist/libcxx/src/future.cpp
parentb0abd8a8c8797edd18907edd0b482588aa9df599 (diff)
Import r198452 of libc++. Primarily avoids C style casts and adds a
number of cleanups.
Diffstat (limited to 'external/bsd/libc++/dist/libcxx/src/future.cpp')
-rw-r--r--external/bsd/libc++/dist/libcxx/src/future.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/external/bsd/libc++/dist/libcxx/src/future.cpp b/external/bsd/libc++/dist/libcxx/src/future.cpp
index 70919ab7df8..c67dc58826e 100644
--- a/external/bsd/libc++/dist/libcxx/src/future.cpp
+++ b/external/bsd/libc++/dist/libcxx/src/future.cpp
@@ -26,8 +26,13 @@ __future_error_category::name() const _NOEXCEPT
return "future";
}
+#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wswitch"
+#elif defined(__GNUC__) || defined(__GNUG__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
+#endif
string
__future_error_category::message(int ev) const
@@ -50,7 +55,11 @@ __future_error_category::message(int ev) const
return string("unspecified future_errc value\n");
}
+#if defined(__clang__)
#pragma clang diagnostic pop
+#elif defined(__GNUC__) || defined(__GNUG__)
+#pragma GCC diagnostic pop
+#endif
const error_category&
future_category() _NOEXCEPT