diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/winrt/StreamTransceiver.cpp | 9 | ||||
| -rw-r--r-- | cpp/src/IceGrid/PlatformInfo.cpp | 10 |
2 files changed, 19 insertions, 0 deletions
diff --git a/cpp/src/Ice/winrt/StreamTransceiver.cpp b/cpp/src/Ice/winrt/StreamTransceiver.cpp index b9296fc48bc..3bc67733388 100644 --- a/cpp/src/Ice/winrt/StreamTransceiver.cpp +++ b/cpp/src/Ice/winrt/StreamTransceiver.cpp @@ -167,10 +167,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, _type == IceSSL::EndpointType ? SocketProtectionLevel::Ssl : SocketProtectionLevel::PlainSocket); +#if defined(_MSC_VER) && _MSC_VER >= 1800 +# pragma warning (default : 4973) +#endif if(!checkIfErrorOrCompleted(SocketOperationConnect, action)) { diff --git a/cpp/src/IceGrid/PlatformInfo.cpp b/cpp/src/IceGrid/PlatformInfo.cpp index d844a7f4a75..aa162923544 100644 --- a/cpp/src/IceGrid/PlatformInfo.cpp +++ b/cpp/src/IceGrid/PlatformInfo.cpp @@ -248,7 +248,17 @@ PlatformInfo::PlatformInfo(const string& prefix, } OSVERSIONINFO osInfo; osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + +// +// GetVerionEx deprecated in Windows 8.1 +// +# if defined(_MSC_VER) && _MSC_VER >= 1800 +# pragma warning (disable : 4996) +# endif GetVersionEx(&osInfo); +# if defined(_MSC_VER) && _MSC_VER >= 1800 +# pragma warning (default : 4996) +# endif ostringstream os; os << osInfo.dwMajorVersion << "." << osInfo.dwMinorVersion; _release = os.str(); |