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/src/slice2confluence | |
| 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/src/slice2confluence')
| -rw-r--r-- | cpp/src/slice2confluence/ConfluenceOutput.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/Gen.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/Gen.h | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/slice2confluence/ConfluenceOutput.cpp b/cpp/src/slice2confluence/ConfluenceOutput.cpp index ecee4fa5419..900fcb164a8 100644 --- a/cpp/src/slice2confluence/ConfluenceOutput.cpp +++ b/cpp/src/slice2confluence/ConfluenceOutput.cpp @@ -15,7 +15,7 @@ #if defined(__clang__) # pragma clang diagnostic ignored "-Wshadow" -# pragma clang diagnostic ignored "-Wshadow-field" +# pragma clang diagnostic ignored "-Wshadow-all" # pragma clang diagnostic ignored "-Wunused-parameter" #elif defined(__GNUC__) # pragma GCC diagnostic ignored "-Wshadow" diff --git a/cpp/src/slice2confluence/Gen.cpp b/cpp/src/slice2confluence/Gen.cpp index 3eff17700c0..0bf944121b9 100644 --- a/cpp/src/slice2confluence/Gen.cpp +++ b/cpp/src/slice2confluence/Gen.cpp @@ -29,7 +29,7 @@ #if defined(__clang__) # pragma clang diagnostic ignored "-Wshadow" -# pragma clang diagnostic ignored "-Wshadow-field" +# pragma clang diagnostic ignored "-Wshadow-all" # pragma clang diagnostic ignored "-Wunused-parameter" #elif defined(__GNUC__) # pragma GCC diagnostic ignored "-Wshadow" diff --git a/cpp/src/slice2confluence/Gen.h b/cpp/src/slice2confluence/Gen.h index abc59399e06..73dbc746bdd 100644 --- a/cpp/src/slice2confluence/Gen.h +++ b/cpp/src/slice2confluence/Gen.h @@ -17,8 +17,7 @@ #include <iterator> #if defined(__clang__) -// TODO: fix these warnings! -# pragma clang diagnostic ignored "-Wshadow-field" +# pragma clang diagnostic ignored "-Wshadow-all" #endif namespace Slice |