diff options
| author | Bernard Normier <bernard@zeroc.com> | 2018-10-27 17:57:25 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2018-10-27 17:57:25 -0400 |
| commit | 1c72f5304e91f2e55b117bfd1f8ddb357c96bf19 (patch) | |
| tree | 5b7d90885593f0e4e0b94b1cb90840805ae2ddb5 /cpp/include | |
| parent | Fixed iOS and PHP7 shadow warning related build failures (diff) | |
| download | ice-1c72f5304e91f2e55b117bfd1f8ddb357c96bf19.tar.bz2 ice-1c72f5304e91f2e55b117bfd1f8ddb357c96bf19.tar.xz ice-1c72f5304e91f2e55b117bfd1f8ddb357c96bf19.zip | |
Fixed fallthrough warnings + clang 3.x fixes
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/IceUtil/PushDisableWarnings.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/include/IceUtil/PushDisableWarnings.h b/cpp/include/IceUtil/PushDisableWarnings.h index c66654e5144..282bffad45c 100644 --- a/cpp/include/IceUtil/PushDisableWarnings.h +++ b/cpp/include/IceUtil/PushDisableWarnings.h @@ -24,7 +24,12 @@ # pragma clang diagnostic push # pragma clang diagnostic ignored "-Wredundant-decls" // expected when using forward Slice declarations # pragma clang diagnostic ignored "-Wdocumentation-deprecated-sync" // see zeroc-ice/ice issue #211 -# pragma clang diagnostic ignored "-Wshadow-field-in-constructor" // expected in some generated header files + +# if (__clang_major__ >= 4) +# pragma clang diagnostic ignored "-Wshadow-field-in-constructor" // expected in some generated header files +# else +# pragma clang diagnostic ignored "-Wshadow-all" // expected in some generated header files +# endif #elif defined(__GNUC__) # pragma GCC diagnostic push |