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/test/IceSSL/configuration/AllTests.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/test/IceSSL/configuration/AllTests.cpp')
| -rw-r--r-- | cpp/test/IceSSL/configuration/AllTests.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index b619416eff5..0fcfcb8deca 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -2164,7 +2164,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) // } # else // - // In OS X we don't support IceSSL.Protocols as secure transport doesn't allow to set the enabled protocols + // In macOS we don't support IceSSL.Protocols as secure transport doesn't allow to set the enabled protocols // instead we use IceSSL.ProtocolVersionMax IceSSL.ProtocolVersionMin to set the maximun and minimum // enabled protocol versions. See the test bellow. // @@ -2608,7 +2608,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) { # ifndef ICE_USE_SECURE_TRANSPORT // - // OS X 10.10 bug the handshake fails attempting client auth + // macOS 10.10 bug the handshake fails attempting client auth // with anon cipher. // cerr << ex << endl; |