diff options
| author | Logan Chien <tzuhsiang.chien@gmail.com> | 2013-12-14 06:45:09 +0000 |
|---|---|---|
| committer | Logan Chien <tzuhsiang.chien@gmail.com> | 2013-12-14 06:45:09 +0000 |
| commit | 8f48c23568a122de6088455700e9d197b79bd8f8 (patch) | |
| tree | 7282206b2133f9c5236bfc91d28ad58e02d28799 /src | |
| parent | bfd68bf0c7e32187dd4be7bd27fdec05d7b833fd (diff) | |
| download | libcxx-8f48c23568a122de6088455700e9d197b79bd8f8.tar.gz | |
Fix GCC unknown pragma warning in libc++.
We should check defined(__clang__) before the usage of the
clang diagnostic pragmas.
The [-Wswitch] warning in src/future.cpp should be ignored.
As the result, the equivalent GCC pragma is added.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@197314 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'src')
| -rw-r--r-- | src/future.cpp | 9 | ||||
| -rw-r--r-- | src/regex.cpp | 8 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/future.cpp b/src/future.cpp index 70919ab7d..c67dc5882 100644 --- a/src/future.cpp +++ b/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 diff --git a/src/regex.cpp b/src/regex.cpp index e3ec2810c..fb820e2bf 100644 --- a/src/regex.cpp +++ b/src/regex.cpp @@ -69,8 +69,10 @@ regex_error::~regex_error() throw() {} namespace { +#if defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wpadded" +#endif struct collationnames { @@ -78,7 +80,9 @@ struct collationnames char char_; }; +#if defined(__clang__) #pragma clang diagnostic pop +#endif const collationnames collatenames[] = { @@ -195,8 +199,10 @@ const collationnames collatenames[] = {"zero", 0x30} }; +#if defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wpadded" +#endif struct classnames { @@ -204,7 +210,9 @@ struct classnames ctype_base::mask mask_; }; +#if defined(__clang__) #pragma clang diagnostic pop +#endif const classnames ClassNames[] = { |