summaryrefslogtreecommitdiff
path: root/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2017-03-28 10:25:16 -0400
committerJoe George <joe@zeroc.com>2017-03-28 10:25:16 -0400
commit7f80ea0db36533c25ffacfccb05a4b8ee657a95f (patch)
tree7b619b723fa94ac7996ca9578eae3fbf40f4cc9e /cpp/src/IceSSL/SecureTransportTransceiverI.cpp
parentICE-7707 Improved handling of argc/argv arguments (diff)
parentICE-7483 - Rename OS X to macOS (diff)
downloadice-7f80ea0db36533c25ffacfccb05a4b8ee657a95f.tar.bz2
ice-7f80ea0db36533c25ffacfccb05a4b8ee657a95f.tar.xz
ice-7f80ea0db36533c25ffacfccb05a4b8ee657a95f.zip
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/IceSSL/SecureTransportTransceiverI.cpp')
-rw-r--r--cpp/src/IceSSL/SecureTransportTransceiverI.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
index 6d83dba98df..a4fad08ca87 100644
--- a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
+++ b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
@@ -160,7 +160,7 @@ checkTrustResult(SecTrustRef trust,
}
default:
// case kSecTrustResultInvalid:
- // case kSecTrustResultConfirm: // Used in old OS X versions
+ // case kSecTrustResultConfirm: // Used in old macOS versions
// case kSecTrustResultDeny:
// case kSecTrustResultRecoverableTrustFailure:
// case kSecTrustResultFatalTrustFailure: