diff options
| author | Jose <jose@zeroc.com> | 2013-11-26 21:55:01 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-11-26 21:55:01 +0100 |
| commit | d10a2cb6de091828703cef138e65faa4787c42e5 (patch) | |
| tree | 55d309990da561cd4362fa2b0b9f8b774db5bd38 /cpp/src/IceGrid/PlatformInfo.cpp | |
| parent | Fixed OpenSSL deprecation warning on OS X (diff) | |
| download | ice-d10a2cb6de091828703cef138e65faa4787c42e5.tar.bz2 ice-d10a2cb6de091828703cef138e65faa4787c42e5.tar.xz ice-d10a2cb6de091828703cef138e65faa4787c42e5.zip | |
Visual Studio 2013 support
Diffstat (limited to 'cpp/src/IceGrid/PlatformInfo.cpp')
| -rw-r--r-- | cpp/src/IceGrid/PlatformInfo.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
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(); |