diff options
| author | Jose <jose@zeroc.com> | 2014-08-14 00:26:10 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-08-14 00:26:10 +0200 |
| commit | ebb04fb421133c5a3cb910309ffcc4b2d8faeada (patch) | |
| tree | 2b3e27e75004b349dc48d2fd633334addf4c8eee /cpp/src | |
| parent | Fix problem introduced with ICE-5553 fix (diff) | |
| download | ice-ebb04fb421133c5a3cb910309ffcc4b2d8faeada.tar.bz2 ice-ebb04fb421133c5a3cb910309ffcc4b2d8faeada.tar.xz ice-ebb04fb421133c5a3cb910309ffcc4b2d8faeada.zip | |
Fixed (ICE-5465) - SocketProtectionLevel::Ssl is deprecated in 8.1
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)) { |