diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/winrt/StreamTransceiver.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/cpp/src/Ice/winrt/StreamTransceiver.cpp b/cpp/src/Ice/winrt/StreamTransceiver.cpp index f921425cc9a..b76421465ef 100644 --- a/cpp/src/Ice/winrt/StreamTransceiver.cpp +++ b/cpp/src/Ice/winrt/StreamTransceiver.cpp @@ -159,20 +159,19 @@ IceInternal::StreamTransceiver::startWrite(Buffer& buf) { try { -// -// SocketProtectionLevel::Ssl deprecated in Windows 8.1 -// -#if defined(_MSC_VER) && _MSC_VER >= 1800 -# pragma warning (disable : 4973) -#endif IAsyncAction^ action = safe_cast<StreamSocket^>(_fd)->ConnectAsync( _connectAddr.host, _connectAddr.port, - _instance->type() == IceSSL::EndpointType ? SocketProtectionLevel::Ssl : - SocketProtectionLevel::PlainSocket); + _instance->type() == IceSSL::EndpointType ? + // + // SocketProtectionLevel::Tls12 is new in Windows 8.1 SDK + // #if defined(_MSC_VER) && _MSC_VER >= 1800 -# pragma warning (default : 4973) + SocketProtectionLevel::Tls12 : +#else + SocketProtectionLevel::Ssl : #endif + SocketProtectionLevel::PlainSocket); if(!checkIfErrorOrCompleted(SocketOperationConnect, action)) { |