From 77444a7d486c415508a9c754fd4cc29cbb33f12f Mon Sep 17 00:00:00 2001
From: KWSys Robot <kwrobot@kitware.com>
Date: Tue, 20 Jan 2015 11:00:48 -0500
Subject: [PATCH] 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
---
 FStream.hxx.in        | 10 ++++++++--
 ProcessWin32.c        | 12 ++++++++++--
 SystemInformation.cxx |  6 +++++-
 SystemTools.cxx       |  6 +++++-
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/FStream.hxx.in b/FStream.hxx.in
index 45425ffd6..37055d617 100644
--- a/FStream.hxx.in
+++ b/FStream.hxx.in
@@ -18,6 +18,11 @@
 namespace @KWSYS_NAMESPACE@
 {
 #if defined(_MSC_VER) && _MSC_VER >= 1400
+# if defined(_NOEXCEPT)
+#  define @KWSYS_NAMESPACE@_FStream_NOEXCEPT _NOEXCEPT
+# else
+#  define @KWSYS_NAMESPACE@_FStream_NOEXCEPT
+# endif
   template<typename CharType,typename Traits>
   class basic_filebuf : public std::basic_filebuf<CharType,Traits>
   {
@@ -85,7 +90,7 @@ namespace @KWSYS_NAMESPACE@
       return buf_;
     }
 
-    ~basic_ifstream()
+    ~basic_ifstream() @KWSYS_NAMESPACE@_FStream_NOEXCEPT
     {
       buf_->close();
       delete buf_;
@@ -147,7 +152,7 @@ class basic_ofstream : public std::basic_ostream<CharType,Traits>
   {
     return buf_.get();
   }
-  ~basic_ofstream()
+  ~basic_ofstream() @KWSYS_NAMESPACE@_FStream_NOEXCEPT
   {
     buf_->close();
     delete buf_;
@@ -160,6 +165,7 @@ class basic_ofstream : public std::basic_ostream<CharType,Traits>
   typedef basic_ifstream<char> ifstream;
   typedef basic_ofstream<char> ofstream;
 
+# undef @KWSYS_NAMESPACE@_FStream_NOEXCEPT
 #else
   using @KWSYS_NAMESPACE@_ios_namespace::ofstream;
   using @KWSYS_NAMESPACE@_ios_namespace::ifstream;
diff --git a/ProcessWin32.c b/ProcessWin32.c
index ef71f26da..c2965ea46 100644
--- a/ProcessWin32.c
+++ b/ProcessWin32.c
@@ -340,7 +340,11 @@ kwsysProcess* kwsysProcess_New(void)
   osv.dwOSVersionInfoSize = sizeof(osv);
 #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
   GetVersionEx(&osv);
 #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
@@ -2382,7 +2386,11 @@ static kwsysProcess_List* kwsysProcess_List_New(void)
   osv.dwOSVersionInfoSize = sizeof(osv);
 #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
   GetVersionEx(&osv);
 #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 3d5e72811..9c7ceee1d 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)
diff --git a/SystemTools.cxx b/SystemTools.cxx
index c2b609764..27082115d 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -4732,7 +4732,11 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
 
 #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 = GetVersionEx((OSVERSIONINFO *)&osvi);
   if (!bOsVersionInfoEx)