This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via ca646585aa25396915e4ac0411c2e166abe24c6d (commit)
via 7e468cd8f99daecfc1197883a0fd87bde771309b (commit)
via 77444a7d486c415508a9c754fd4cc29cbb33f12f (commit)
via f709776864bbd94c7aa839248adfbfe7d4f5cae6 (commit)
from 3c62239543d57cdae883463c73ddcb5f5a31c83c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca646585aa25396915e4ac0411c2e166abe24c6d
commit ca646585aa25396915e4ac0411c2e166abe24c6d
Merge: 3c62239 7e468cd
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 21 09:26:29 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jan 21 09:26:29 2015 -0500
Merge topic 'update-kwsys' into next
7e468cd8 Merge branch 'upstream-kwsys' into update-kwsys
77444a7d KWSys 2015-01-20 (b33e7b96)
f7097768 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e468cd8f99daecfc1197883a0fd87bde771309b
commit 7e468cd8f99daecfc1197883a0fd87bde771309b
Merge: f709776 77444a7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 21 09:15:44 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jan 21 09:15:44 2015 -0500
Merge branch 'upstream-kwsys' into update-kwsys
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77444a7d486c415508a9c754fd4cc29cbb33f12f
commit 77444a7d486c415508a9c754fd4cc29cbb33f12f
Author: KWSys Robot <kwro...@kitware.com>
AuthorDate: Tue Jan 20 11:00:48 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jan 21 09:15:40 2015 -0500
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
diff --git a/FStream.hxx.in b/FStream.hxx.in
index 45425ff..37055d6 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 ef71f26..c2965ea 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 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)
diff --git a/SystemTools.cxx b/SystemTools.cxx
index c2b6097..2708211 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)
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/kwsys/FStream.hxx.in | 10 ++++++++--
Source/kwsys/ProcessWin32.c | 12 ++++++++++--
Source/kwsys/SystemInformation.cxx | 6 +++++-
Source/kwsys/SystemTools.cxx | 6 +++++-
5 files changed, 29 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
