diff options
| author | Bernard Normier <bernard@zeroc.com> | 2019-10-29 13:54:17 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2019-10-29 13:54:17 -0400 |
| commit | 79c5c93cc596c8cf3dffa88627835a320e333efa (patch) | |
| tree | c930f73542a2abe0644c13302179957e4e4859fb /cpp/test/Ice/optional/StringView.h | |
| parent | Workaround for sporadic carthage segfault (diff) | |
| download | ice-79c5c93cc596c8cf3dffa88627835a320e333efa.tar.bz2 ice-79c5c93cc596c8cf3dffa88627835a320e333efa.tar.xz ice-79c5c93cc596c8cf3dffa88627835a320e333efa.zip | |
Fix clang -std=c++17 build
Note: still building Ice C++11 with -std=c++11.
Diffstat (limited to 'cpp/test/Ice/optional/StringView.h')
| -rw-r--r-- | cpp/test/Ice/optional/StringView.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/test/Ice/optional/StringView.h b/cpp/test/Ice/optional/StringView.h index 5e642f57153..cf44dcc7108 100644 --- a/cpp/test/Ice/optional/StringView.h +++ b/cpp/test/Ice/optional/StringView.h @@ -11,7 +11,7 @@ // COMPILERFIX: G++ false positive "maybe-uninitialized" warnings when using // string_view with Ice::optional in C++17 mode. // -#if defined(__GNUC__) && ICE_CPLUSPLUS >= 201703L +#if defined(__GNUC__) && !defined(__clang__) && ICE_CPLUSPLUS >= 201703L # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #endif @@ -190,7 +190,7 @@ struct StreamHelper<Util::string_view, StreamHelperCategoryBuiltin> } -#if defined(__GNUC__) && ICE_CPLUSPLUS >= 201703L +#if defined(__GNUC__) && !defined(__clang__) && ICE_CPLUSPLUS >= 201703L # pragma GCC diagnostic pop #endif |