[Cmake-commits] CMake branch, next, updated. v3.4.0-rc3-1314-g5c42e29

[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  5c42e29bd532d48299354950ee8c3a62e0e7f94f (commit)
       via  710d8bab7ea045216f904798f0df4d21bc94a66c (commit)
       via  54153fb98dfe6b91ed162e7c195005bf35fcd352 (commit)
      from  c2262942c2a24f088f22b9089e37a2e256d85d7c (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c42e29bd532d48299354950ee8c3a62e0e7f94f
commit 5c42e29bd532d48299354950ee8c3a62e0e7f94f
Merge: c226294 710d8ba
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 11 16:28:41 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 11 16:28:41 2015 -0500

    Merge topic 'fix-clang-Wdouble-promotion' into next
    
    710d8bab Fix trivial clang -Wdouble-promotion warnings
    54153fb9 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=710d8bab7ea045216f904798f0df4d21bc94a66c
commit 710d8bab7ea045216f904798f0df4d21bc94a66c
Author:     Sean McBride <sean at rogue-research.com>
AuthorDate: Wed Nov 11 16:24:51 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 11 16:27:24 2015 -0500

    Fix trivial clang -Wdouble-promotion warnings

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())

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

Summary of changes:
 Source/CMakeVersion.cmake               |    2 +-
 Source/CTest/cmCTestCoverageHandler.cxx |    2 +-
 Source/CTest/cmCTestTestHandler.cxx     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake