[Cmake-commits] CMake branch, master, updated. f88a0a3514cebb36fc1f56e05ef0bfa4aec617ab
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed May 12 09:40:06 EDT 2010
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, master has been updated
via f88a0a3514cebb36fc1f56e05ef0bfa4aec617ab (commit)
from f8593092aeff398c49ff88b19dcfd759633287df (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=f88a0a3514cebb36fc1f56e05ef0bfa4aec617ab
commit f88a0a3514cebb36fc1f56e05ef0bfa4aec617ab
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date: Wed May 12 09:37:42 2010 -0400
Silence warnings on sgi compiler.
diff --git a/Source/kwsys/Configure.h.in b/Source/kwsys/Configure.h.in
index 97b2c5d..15986cf 100644
--- a/Source/kwsys/Configure.h.in
+++ b/Source/kwsys/Configure.h.in
@@ -28,6 +28,10 @@
# if defined(__INTEL_COMPILER)
# pragma warning (disable: 1572) /* floating-point equality test */
# endif
+# if defined(__sgi) && !defined(__GNUC__)
+# pragma set woff 3970 /* pointer to int conversion */
+# pragma set woff 3968 /* 64 bit conversion */
+# endif
#endif
/* Whether kwsys namespace is "kwsys". */
diff --git a/Source/kwsys/hashtable.hxx.in b/Source/kwsys/hashtable.hxx.in
index 2f337ba..db52fc8 100644
--- a/Source/kwsys/hashtable.hxx.in
+++ b/Source/kwsys/hashtable.hxx.in
@@ -38,6 +38,7 @@
# pragma warn -8027 /* 'for' not inlined. */
# pragma warn -8026 /* 'exception' not inlined. */
#endif
+
#ifndef @KWSYS_NAMESPACE at _hashtable_hxx
#define @KWSYS_NAMESPACE at _hashtable_hxx
@@ -57,6 +58,9 @@
# pragma warning (disable:4786)
# pragma warning (disable:4512) /* no assignment operator for class */
#endif
+#if defined(__sgi) && !defined(__GNUC__)
+# pragma set woff 3970 /* pointer to int conversion */ 3321 3968
+#endif
#if @KWSYS_NAMESPACE at _STL_HAS_ALLOCATOR_TEMPLATE
# define @KWSYS_NAMESPACE at _HASH_DEFAULT_ALLOCATOR(T) @KWSYS_NAMESPACE at _stl::allocator< T >
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/Configure.h.in | 4 ++++
Source/kwsys/hashtable.hxx.in | 4 ++++
2 files changed, 8 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list