diff options
| author | Brad King <brad.king@kitware.com> | 2015-11-12 13:48:12 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-11-12 13:48:12 (GMT) |
| commit | 8f8f9e216eea962f9b7c978ccd37f3c87fbe09e2 (patch) | |
| tree | aa6271062eb0e5a599cefc5a1f55aa9bacfc11ac /Source | |
| parent | 48182afd3d04cc659fc5d86ab65b403d8a2b8eff (diff) | |
| parent | 710d8bab7ea045216f904798f0df4d21bc94a66c (diff) | |
| download | CMake-8f8f9e216eea962f9b7c978ccd37f3c87fbe09e2.zip CMake-8f8f9e216eea962f9b7c978ccd37f3c87fbe09e2.tar.gz CMake-8f8f9e216eea962f9b7c978ccd37f3c87fbe09e2.tar.bz2 | |
Merge topic 'fix-clang-Wdouble-promotion'
710d8bab Fix trivial clang -Wdouble-promotion warnings
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestCoverageHandler.cxx | 2 | ||||
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index 20807c8..09902a1 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -2287,7 +2287,7 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary( { cper /= 2.0f; } - percent_coverage += cper; + percent_coverage += static_cast<double>(cper); float cmet = static_cast<float>(percentFunction + percentBranch); if(totalBranches > 0) { diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index fa3b416..a8f983f 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -579,7 +579,7 @@ int cmCTestTestHandler::ProcessHandler() } cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl - << static_cast<int>(percent + .5) << "% tests passed, " + << static_cast<int>(percent + .5f) << "% tests passed, " << failed.size() << " tests failed out of " << total << std::endl); if(this->CTest->GetLabelSummary()) |