[Cmake-commits] CMake branch, next, updated. v3.1.0-1386-ge0a5d8f

[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  e0a5d8f871bccbc5bcf4460778fd5bdfbf1957e3 (commit)
       via  098fc4a862d51ad7cca154cdd5f0a2a8ff0763c7 (commit)
       via  1a9ba38174578e56a277cc0d0dfa2b3f8340ea74 (commit)
      from  0ea1a975a8c4873be4529c03a6967b9c3e008c9b (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=e0a5d8f871bccbc5bcf4460778fd5bdfbf1957e3
commit e0a5d8f871bccbc5bcf4460778fd5bdfbf1957e3
Merge: 0ea1a97 098fc4a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 23 09:06:26 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 23 09:06:26 2014 -0500

    Merge topic 'minor-warning-fixes' into next
    
    098fc4a8 cmCMakeMinimumRequired: Use unsigned int for version numbers
    1a9ba381 cmParseDelphiCoverage: Remove superfluous semicolons after methods


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=098fc4a862d51ad7cca154cdd5f0a2a8ff0763c7
commit 098fc4a862d51ad7cca154cdd5f0a2a8ff0763c7
Author:     Christoph Grüninger <gruenich at dune-project.org>
AuthorDate: Tue Dec 23 13:33:35 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 23 09:05:25 2014 -0500

    cmCMakeMinimumRequired: Use unsigned int for version numbers

diff --git a/Source/cmCMakeMinimumRequired.cxx b/Source/cmCMakeMinimumRequired.cxx
index 58b61de..384e0a7 100644
--- a/Source/cmCMakeMinimumRequired.cxx
+++ b/Source/cmCMakeMinimumRequired.cxx
@@ -63,17 +63,17 @@ bool cmCMakeMinimumRequired
 
 
   // Get the current version number.
-  int current_major = cmVersion::GetMajorVersion();
-  int current_minor = cmVersion::GetMinorVersion();
-  int current_patch = cmVersion::GetPatchVersion();
-  int current_tweak = cmVersion::GetTweakVersion();
+  unsigned int current_major = cmVersion::GetMajorVersion();
+  unsigned int current_minor = cmVersion::GetMinorVersion();
+  unsigned int current_patch = cmVersion::GetPatchVersion();
+  unsigned int current_tweak = cmVersion::GetTweakVersion();
 
   // Parse at least two components of the version number.
   // Use zero for those not specified.
-  int required_major = 0;
-  int required_minor = 0;
-  int required_patch = 0;
-  int required_tweak = 0;
+  unsigned int required_major = 0;
+  unsigned int required_minor = 0;
+  unsigned int required_patch = 0;
+  unsigned int required_tweak = 0;
   if(sscanf(version_string.c_str(), "%u.%u.%u.%u",
             &required_major, &required_minor,
             &required_patch, &required_tweak) < 2)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a9ba38174578e56a277cc0d0dfa2b3f8340ea74
commit 1a9ba38174578e56a277cc0d0dfa2b3f8340ea74
Author:     Christoph Grüninger <gruenich at dune-project.org>
AuthorDate: Tue Dec 23 12:24:58 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 23 09:05:11 2014 -0500

    cmParseDelphiCoverage: Remove superfluous semicolons after methods

diff --git a/Source/CTest/cmParseDelphiCoverage.cxx b/Source/CTest/cmParseDelphiCoverage.cxx
index 8e331b1..3afbfac 100644
--- a/Source/CTest/cmParseDelphiCoverage.cxx
+++ b/Source/CTest/cmParseDelphiCoverage.cxx
@@ -240,7 +240,7 @@ bool cmParseDelphiCoverage::LoadCoverageData(
       }
     }
   return true;
-  };
+  }
 
 bool cmParseDelphiCoverage::ReadDelphiHTML(const char* file)
   {
@@ -248,4 +248,4 @@ bool cmParseDelphiCoverage::ReadDelphiHTML(const char* file)
      parser(this->CTest, this->Coverage);
   parser.ParseFile(file);
   return true;
-  };
+  }

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

Summary of changes:
 Source/CTest/cmParseDelphiCoverage.cxx |    4 ++--
 Source/cmCMakeMinimumRequired.cxx      |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake