kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'minor-warning-fixes' 

098fc4a8 cmCMakeMinimumRequired: Use unsigned int for version numbers
1a9ba381 cmParseDelphiCoverage: Remove superfluous semicolons after methods
This commit is contained in:
Brad King 2014-12-24 06:38:33 -05:00 committed by CMake Topic Stage
parent 661622f011 098fc4a862
commit 2a9f3dc6c7
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/CTest/cmParseDelphiCoverage.cxx
View File

@ -240,7 +240,7 @@ bool cmParseDelphiCoverage::LoadCoverageData(
} }
} }
return true; return true;
}; }
bool cmParseDelphiCoverage::ReadDelphiHTML(const char* file) bool cmParseDelphiCoverage::ReadDelphiHTML(const char* file)
{ {
@ -248,4 +248,4 @@ bool cmParseDelphiCoverage::ReadDelphiHTML(const char* file)
parser(this->CTest, this->Coverage); parser(this->CTest, this->Coverage);
parser.ParseFile(file); parser.ParseFile(file);
return true; return true;
}; }

16
Source/cmCMakeMinimumRequired.cxx
View File

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