[Cmake-commits] CMake branch, next, updated. v3.7.2-2208-g1ac8030

[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  1ac8030d4853e05fb7905f21ee4a3f5ea611369f (commit)
       via  6821858d0eef4898b42cea91be7a736b5658a990 (commit)
      from  d38b13d289dd67249d3d307562ff2a7a27d5785a (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=1ac8030d4853e05fb7905f21ee4a3f5ea611369f
commit 1ac8030d4853e05fb7905f21ee4a3f5ea611369f
Merge: d38b13d 6821858
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 09:00:40 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 17 09:00:40 2017 -0500

    Merge topic 'cdash_upload_retry' into next
    
    6821858d fixup! ctest_submit: Allow RETRY_COUNT for CDASH_UPLOAD


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6821858d0eef4898b42cea91be7a736b5658a990
commit 6821858d0eef4898b42cea91be7a736b5658a990
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 08:59:08 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 17 08:59:08 2017 -0500

    fixup! ctest_submit: Allow RETRY_COUNT for CDASH_UPLOAD

diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index d8a7dca..5e5119d 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -1093,7 +1093,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
                                                        << " seconds...\n",
                          this->Quiet);
 
-      double stop = cmSystemTools::GetTime() + retryDelay;
+      double stop = cmSystemTools::GetTime() + static_cast<double>(retryDelay);
       while (cmSystemTools::GetTime() < stop) {
         cmSystemTools::Delay(100);
       }
@@ -1167,7 +1167,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
                                                       << " seconds...\n",
                          this->Quiet);
 
-      double stop = cmSystemTools::GetTime() + retryDelay;
+      double stop = cmSystemTools::GetTime() + static_cast<double>(retryDelay);
       while (cmSystemTools::GetTime() < stop) {
         cmSystemTools::Delay(100);
       }

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

Summary of changes:
 Source/CTest/cmCTestSubmitHandler.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake