diff options
author | David Cole <david.cole@kitware.com> | 2009-10-01 20:47:08 (GMT) |
---|---|---|
committer | David Cole <david.cole@kitware.com> | 2009-10-01 20:47:08 (GMT) |
commit | 44bcba746156ad1d5fe7f784380c3fb4f4672f6b (patch) | |
tree | 34028a688c7649519a6a1086949f859d75a1a63f /Source/CTest | |
parent | 86459a89a10733bad549c34a4c4c0ca962397bc6 (diff) | |
download | CMake-44bcba746156ad1d5fe7f784380c3fb4f4672f6b.zip CMake-44bcba746156ad1d5fe7f784380c3fb4f4672f6b.tar.gz CMake-44bcba746156ad1d5fe7f784380c3fb4f4672f6b.tar.bz2 |
Fix warnings in CMake source code. Suppress rampant warnings emanating from Qt files.
Diffstat (limited to 'Source/CTest')
-rw-r--r-- | Source/CTest/cmCTestBuildHandler.cxx | 4 | ||||
-rw-r--r-- | Source/CTest/cmCTestCoverageHandler.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx index d93da07..0095bbc 100644 --- a/Source/CTest/cmCTestBuildHandler.cxx +++ b/Source/CTest/cmCTestBuildHandler.cxx @@ -596,8 +596,8 @@ void cmCTestBuildHandler::GenerateXMLLogScraped(std::ostream& os) std::vector<cmCTestBuildErrorWarning>::iterator it; // only report the first 50 warnings and first 50 errors - unsigned short numErrorsAllowed = this->MaxErrors; - unsigned short numWarningsAllowed = this->MaxWarnings; + int numErrorsAllowed = this->MaxErrors; + int numWarningsAllowed = this->MaxWarnings; std::string srcdir = this->CTest->GetCTestConfiguration("SourceDirectory"); // make sure the source dir is in the correct case on windows // via a call to collapse full path. diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index b6e10bf..50b1d26 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -1590,13 +1590,13 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary( std::string shortFileName = this->CTest->GetShortPathToFile(file.c_str()); - float cper = percentBranch + percentFunction; + float cper = static_cast<float>(percentBranch + percentFunction); if(totalBranches > 0) { cper /= 2.0f; } percent_coverage += cper; - float cmet = percentFunction + percentBranch; + float cmet = static_cast<float>(percentFunction + percentBranch); if(totalBranches > 0) { cmet /= 2.0f; |