diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-24 11:38:33 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-12-24 11:38:33 (GMT) |
| commit | 2a9f3dc6c7aed366d8dda71038bdc2b62e4fa78a (patch) | |
| tree | 851782cb2c4fbef2da975b1ffb6dd0c2638f1157 | |
| parent | 661622f011810093433afa5c9a4795b3d2f19070 (diff) | |
| parent | 098fc4a862d51ad7cca154cdd5f0a2a8ff0763c7 (diff) | |
| download | CMake-2a9f3dc6c7aed366d8dda71038bdc2b62e4fa78a.zip CMake-2a9f3dc6c7aed366d8dda71038bdc2b62e4fa78a.tar.gz CMake-2a9f3dc6c7aed366d8dda71038bdc2b62e4fa78a.tar.bz2 | |
Merge topic 'minor-warning-fixes'
098fc4a8 cmCMakeMinimumRequired: Use unsigned int for version numbers
1a9ba381 cmParseDelphiCoverage: Remove superfluous semicolons after methods
| -rw-r--r-- | Source/CTest/cmParseDelphiCoverage.cxx | 4 | ||||
| -rw-r--r-- | Source/cmCMakeMinimumRequired.cxx | 16 |
2 files changed, 10 insertions, 10 deletions
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; - }; + } 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) |