[Cmake-commits] CMake branch, next, updated. v3.4.1-1927-gc60dfb9
Brad King
brad.king at kitware.com
Tue Jan 12 12:50:26 EST 2016
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 c60dfb9be771334ca19d146a99315680f9f53acd (commit)
via 33cafa68b85b06c0a88105de24797df3fa44e551 (commit)
via ffcc235c7ee2528638fd2ae4029eabcd5b0f1042 (commit)
from 3e1fca746416fb82ed79e02e2248c8c26f3549a2 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c60dfb9be771334ca19d146a99315680f9f53acd
commit c60dfb9be771334ca19d146a99315680f9f53acd
Merge: 3e1fca7 33cafa6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 12 12:50:26 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 12 12:50:26 2016 -0500
Merge topic 'update-kwsys' into next
33cafa68 Merge branch 'upstream-KWSys' into update-kwsys
ffcc235c KWSys 2016-01-11 (bc07fbf7)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33cafa68b85b06c0a88105de24797df3fa44e551
commit 33cafa68b85b06c0a88105de24797df3fa44e551
Merge: b500972 ffcc235
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 12 10:55:49 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 12 10:55:49 2016 -0500
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2016-01-11 (bc07fbf7)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffcc235c7ee2528638fd2ae4029eabcd5b0f1042
commit ffcc235c7ee2528638fd2ae4029eabcd5b0f1042
Author: KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Mon Jan 11 16:30:05 2016 +0000
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 12 10:55:49 2016 -0500
KWSys 2016-01-11 (bc07fbf7)
Code extracted from:
http://public.kitware.com/KWSys.git
at commit bc07fbf7a884713815b3ac72d85487bf6aa338f5 (master).
Upstream Shortlog
-----------------
James Johnston (1):
bc07fbf7 Configure: Silence spurious warnings from Embarcadero compiler.
diff --git a/Configure.h.in b/Configure.h.in
index 70cf844..cd2d965 100644
--- a/Configure.h.in
+++ b/Configure.h.in
@@ -115,6 +115,11 @@
# pragma warning (disable: 4710) /* function not inlined */
# pragma warning (disable: 4786) /* identifier truncated in debug info */
# endif
+# if defined(__BORLANDC__) && !defined(__cplusplus)
+ /* Code has no effect; raised by winnt.h in C (not C++) when ignoring an
+ unused parameter using "(param)" syntax (i.e. no cast to void). */
+# pragma warn -8019
+# endif
#endif
/* MSVC 6.0 in release mode will warn about code it produces with its
diff --git a/SharedForward.h.in b/SharedForward.h.in
index f22fa58..f80ef84 100644
--- a/SharedForward.h.in
+++ b/SharedForward.h.in
@@ -74,6 +74,12 @@
# endif
#endif
+#if defined(__BORLANDC__) && !defined(__cplusplus)
+ /* Code has no effect; raised by winnt.h in C (not C++) when ignoring an
+ unused parameter using "(param)" syntax (i.e. no cast to void). */
+# pragma warn -8019
+#endif
+
/*--------------------------------------------------------------------------*/
/* Full path to the directory in which this executable is built. Do
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/Configure.h.in | 5 +++++
Source/kwsys/SharedForward.h.in | 6 ++++++
2 files changed, 11 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list