[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-349-gd4c34c3
Brad King
brad.king at kitware.com
Tue Mar 8 08:35:56 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 d4c34c34b73a74b7d9ff47073739b7c1ce5ccb6f (commit)
via ba9d5af676e536a7e5f144ae65bf868ed11480c8 (commit)
via 7c262790c863af49f7c33ed727478716b38c5063 (commit)
from 575399afd14cace26a01e1aed65af8ca6bb9f15d (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=d4c34c34b73a74b7d9ff47073739b7c1ce5ccb6f
commit d4c34c34b73a74b7d9ff47073739b7c1ce5ccb6f
Merge: 575399a ba9d5af
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 8 08:35:55 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 8 08:35:55 2016 -0500
Merge topic 'update-kwsys' into next
ba9d5af6 Merge branch 'upstream-KWSys' into update-kwsys
7c262790 KWSys 2016-03-07 (1c544330)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba9d5af676e536a7e5f144ae65bf868ed11480c8
commit ba9d5af676e536a7e5f144ae65bf868ed11480c8
Merge: 8256d02 7c26279
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 8 08:30:42 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 8 08:30:42 2016 -0500
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2016-03-07 (1c544330)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c262790c863af49f7c33ed727478716b38c5063
commit 7c262790c863af49f7c33ed727478716b38c5063
Author: KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Mon Mar 7 15:14:35 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 8 08:30:15 2016 -0500
KWSys 2016-03-07 (1c544330)
Code extracted from:
http://public.kitware.com/KWSys.git
at commit 1c54433068a832ae83ee49f4917ce108605ad8e4 (master).
Upstream Shortlog
-----------------
Sean McBride (3):
6ea22e65 Suppressed clang -Wcomma warnings with void cast
8d9d489d Fixed clang-tidy warnings about macros missing defensive parens
1c544330 Made private method static to silence warning
diff --git a/MD5.c b/MD5.c
index b9d25a8..b75acb2 100644
--- a/MD5.c
+++ b/MD5.c
@@ -254,7 +254,7 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
#define SET(a, b, c, d, k, s, Ti)\
- t = a + F(b,c,d) + X[k] + Ti;\
+ t = a + F(b,c,d) + X[k] + (Ti);\
a = ROTATE_LEFT(t, s) + b
/* Do the following 16 operations. */
SET(a, b, c, d, 0, 7, T1);
@@ -280,7 +280,7 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
#define SET(a, b, c, d, k, s, Ti)\
- t = a + G(b,c,d) + X[k] + Ti;\
+ t = a + G(b,c,d) + X[k] + (Ti);\
a = ROTATE_LEFT(t, s) + b
/* Do the following 16 operations. */
SET(a, b, c, d, 1, 5, T17);
@@ -306,7 +306,7 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
#define H(x, y, z) ((x) ^ (y) ^ (z))
#define SET(a, b, c, d, k, s, Ti)\
- t = a + H(b,c,d) + X[k] + Ti;\
+ t = a + H(b,c,d) + X[k] + (Ti);\
a = ROTATE_LEFT(t, s) + b
/* Do the following 16 operations. */
SET(a, b, c, d, 5, 4, T33);
@@ -332,7 +332,7 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
#define I(x, y, z) ((y) ^ ((x) | ~(z)))
#define SET(a, b, c, d, k, s, Ti)\
- t = a + I(b,c,d) + X[k] + Ti;\
+ t = a + I(b,c,d) + X[k] + (Ti);\
a = ROTATE_LEFT(t, s) + b
/* Do the following 16 operations. */
SET(a, b, c, d, 0, 6, T49);
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 127a048..1d8723c 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -176,13 +176,13 @@ typedef struct rlimit ResourceLimitType;
# if defined(KWSYS_IOS_HAS_OSTREAM_LONG_LONG)
# define iostreamLongLong(x) (x)
# else
-# define iostreamLongLong(x) ((long)x)
+# define iostreamLongLong(x) ((long)(x))
# endif
#elif defined(KWSYS_USE___INT64)
# if defined(KWSYS_IOS_HAS_OSTREAM___INT64)
# define iostreamLongLong(x) (x)
# else
-# define iostreamLongLong(x) ((long)x)
+# define iostreamLongLong(x) ((long)(x))
# endif
#else
# error "No Long Long"
@@ -860,7 +860,7 @@ void SystemInformation::RunMemoryCheck()
// --------------------------------------------------------------
// SystemInformationImplementation starts here
-#define STORE_TLBCACHE_INFO(x,y) x = (x < y) ? y : x
+#define STORE_TLBCACHE_INFO(x,y) x = (x < (y)) ? (y) : x
#define TLBCACHE_INFO_UNITS (15)
#define CLASSICAL_CPU_FREQ_LOOP 10000000
#define RDTSC_INSTRUCTION _asm _emit 0x0f _asm _emit 0x31
@@ -4632,7 +4632,7 @@ std::string SystemInformationImplementation::RunProcess(std::vector<const char*>
double timeout = 255;
int pipe; // pipe id as returned by kwsysProcess_WaitForData()
- while( ( pipe = kwsysProcess_WaitForData(gp,&data,&length,&timeout),
+ while( ( static_cast<void>(pipe = kwsysProcess_WaitForData(gp,&data,&length,&timeout)),
(pipe == kwsysProcess_Pipe_STDOUT || pipe == kwsysProcess_Pipe_STDERR) ) ) // wait for 1s
{
buffer.append(data, length);
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 544a638..0c7f419 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -4758,8 +4758,9 @@ bool SystemTools::GetLineFromStream(std::istream& is,
// been reached. Clear the fail bit just before reading.
while(!haveNewline &&
leftToRead != 0 &&
- (is.clear(is.rdstate() & ~std::ios::failbit),
- is.getline(buffer, bufferSize), is.gcount() > 0))
+ (static_cast<void>(is.clear(is.rdstate() & ~std::ios::failbit)),
+ static_cast<void>(is.getline(buffer, bufferSize)),
+ is.gcount() > 0))
{
// We have read at least one byte.
haveData = true;
diff --git a/testDynamicLoader.cxx b/testDynamicLoader.cxx
index 695a134..7c58769 100644
--- a/testDynamicLoader.cxx
+++ b/testDynamicLoader.cxx
@@ -53,7 +53,7 @@ static std::string GetLibName(const char* lname)
* r2: should GetSymbolAddress succeed ?
* r3: should CloseLibrary succeed ?
*/
-int TestDynamicLoader(const char* libname, const char* symbol, int r1, int r2, int r3)
+static int TestDynamicLoader(const char* libname, const char* symbol, int r1, int r2, int r3)
{
std::cerr << "Testing: " << libname << std::endl;
kwsys::DynamicLoader::LibraryHandle l
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/MD5.c | 8 ++++----
Source/kwsys/SystemInformation.cxx | 8 ++++----
Source/kwsys/SystemTools.cxx | 5 +++--
Source/kwsys/testDynamicLoader.cxx | 2 +-
4 files changed, 12 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list