diff options
| author | KWSys Robot <kwrobot@kitware.com> | 2015-01-20 16:00:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-21 14:15:40 (GMT) |
| commit | 77444a7d486c415508a9c754fd4cc29cbb33f12f (patch) | |
| tree | 48c00726fb739403e5d5a963b1a9f85514067cfc /SystemInformation.cxx | |
| parent | 54d83caecfc1e0b8f047037ea6aaa7d54b64d8b3 (diff) | |
| download | CMake-77444a7d486c415508a9c754fd4cc29cbb33f12f.zip CMake-77444a7d486c415508a9c754fd4cc29cbb33f12f.tar.gz CMake-77444a7d486c415508a9c754fd4cc29cbb33f12f.tar.bz2 | |
KWSys 2015-01-20 (b33e7b96)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ b33e7b96 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 425fa73e..b33e7b96
Brad King (2):
57c3ef1d Suppress deprecation warnings for GetVersionEx on Intel compiler
b33e7b96 FStream: Fix exception spec on our standard stream replacements
Change-Id: I69044c5879a1ec4a5be59bdda05540c1eb65b197
Diffstat (limited to 'SystemInformation.cxx')
| -rw-r--r-- | SystemInformation.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/SystemInformation.cxx b/SystemInformation.cxx index 3d5e728..9c7ceee 100644 --- a/SystemInformation.cxx +++ b/SystemInformation.cxx @@ -5069,7 +5069,11 @@ bool SystemInformationImplementation::QueryOSInformation() osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEXW); #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx # pragma warning (push) -# pragma warning (disable:4996) +# ifdef __INTEL_COMPILER +# pragma warning (disable:1478) +# else +# pragma warning (disable:4996) +# endif #endif bOsVersionInfoEx = GetVersionExW ((OSVERSIONINFOW*)&osvi); if (!bOsVersionInfoEx) |