diff options
| author | Joe George <joe@zeroc.com> | 2017-03-28 10:25:16 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2017-03-28 10:25:16 -0400 |
| commit | 7f80ea0db36533c25ffacfccb05a4b8ee657a95f (patch) | |
| tree | 7b619b723fa94ac7996ca9578eae3fbf40f4cc9e /cpp/src/IcePatch2Lib/Util.cpp | |
| parent | ICE-7707 Improved handling of argc/argv arguments (diff) | |
| parent | ICE-7483 - Rename OS X to macOS (diff) | |
| download | ice-7f80ea0db36533c25ffacfccb05a4b8ee657a95f.tar.bz2 ice-7f80ea0db36533c25ffacfccb05a4b8ee657a95f.tar.xz ice-7f80ea0db36533c25ffacfccb05a4b8ee657a95f.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/IcePatch2Lib/Util.cpp')
| -rw-r--r-- | cpp/src/IcePatch2Lib/Util.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp index 63aa2583532..4fb9f32850d 100644 --- a/cpp/src/IcePatch2Lib/Util.cpp +++ b/cpp/src/IcePatch2Lib/Util.cpp @@ -34,7 +34,7 @@ #include <iterator> -// Ignore OS X OpenSSL deprecation warnings +// Ignore macOS OpenSSL deprecation warnings #ifdef __APPLE__ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif |