[Cmake-commits] CMake branch, next, updated. v3.3.0-1379-g7a7006b

[Brad King]

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  7a7006b652ff3d8f360470c00f487b902a670121 (commit)
       via  11577c0ade97738113978a05833d49c61d81954a (commit)
      from  1abe053fd68b39210eeac8bc6aec1e80d6d56690 (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=7a7006b652ff3d8f360470c00f487b902a670121
commit 7a7006b652ff3d8f360470c00f487b902a670121
Merge: 1abe053 11577c0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 27 09:23:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 27 09:23:20 2015 -0400

    Merge topic 'update-kwsys' into next
    
    11577c0a KWSys: Update to match upstream warning fix


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11577c0ade97738113978a05833d49c61d81954a
commit 11577c0ade97738113978a05833d49c61d81954a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 27 09:22:44 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 27 09:22:44 2015 -0400

    KWSys: Update to match upstream warning fix

diff --git a/Source/kwsys/testProcess.c b/Source/kwsys/testProcess.c
index 333b8ed..d0e20c1 100644
--- a/Source/kwsys/testProcess.c
+++ b/Source/kwsys/testProcess.c
@@ -70,7 +70,7 @@ static void testProcess_sleep(unsigned int sec)
 int runChild(const char* cmd[], int state, int exception, int value,
              int share, int output, int delay, double timeout, int poll,
              int repeat, int disown, int createNewGroup,
-             int interruptDelay);
+             unsigned int interruptDelay);
 
 static int test1(int argc, const char* argv[])
 {
@@ -360,7 +360,8 @@ static int test10_grandchild(int argc, const char* argv[])
 static int runChild2(kwsysProcess* kp,
               const char* cmd[], int state, int exception, int value,
               int share, int output, int delay, double timeout,
-              int poll, int disown, int createNewGroup, int interruptDelay)
+              int poll, int disown, int createNewGroup,
+              unsigned int interruptDelay)
 {
   int result = 0;
   char* data = 0;
@@ -394,7 +395,7 @@ static int runChild2(kwsysProcess* kp,
 
   if(interruptDelay)
     {
-    testProcess_sleep((unsigned int)interruptDelay);
+    testProcess_sleep(interruptDelay);
     kwsysProcess_Interrupt(kp);
     }
 
@@ -542,7 +543,7 @@ static int runChild2(kwsysProcess* kp,
 int runChild(const char* cmd[], int state, int exception, int value,
              int share, int output, int delay, double timeout,
              int poll, int repeat, int disown, int createNewGroup,
-             int interruptDelay)
+             unsigned int interruptDelay)
 {
   int result = 1;
   kwsysProcess* kp = kwsysProcess_New();
@@ -661,7 +662,7 @@ int main(int argc, const char* argv[])
     int polls[10] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0};
     int repeat[10] = {2, 1, 1, 1, 1, 1, 1, 1, 1, 1};
     int createNewGroups[10] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1};
-    int interruptDelays[10] = {0, 0, 0, 0, 0, 0, 0, 0, 3, 2};
+    unsigned int interruptDelays[10] = {0, 0, 0, 0, 0, 0, 0, 0, 3, 2};
     int r;
     const char* cmd[4];
 #ifdef _WIN32

-----------------------------------------------------------------------

Summary of changes:
 Source/kwsys/testProcess.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake