diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-08 13:22:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-12-08 16:09:49 (GMT) |
| commit | 548e8f6ffedb57fcdee56633ba454ae0ddf38983 (patch) | |
| tree | 31e77da99bac6397669e597739d7de8d5197d61f /Source/CTest/cmProcess.cxx | |
| parent | de0035fdcccb4c8acc92bf1db0a76b3c1f18003f (diff) | |
| download | CMake-548e8f6ffedb57fcdee56633ba454ae0ddf38983.zip CMake-548e8f6ffedb57fcdee56633ba454ae0ddf38983.tar.gz CMake-548e8f6ffedb57fcdee56633ba454ae0ddf38983.tar.bz2 | |
CTest: Simplify std::chrono::duration<double> conversion to double
The ratio of ticks to seconds for this type is 1, so we can just use its
`count()` directly. This also avoids converting through the integer
representation of `std::chrono::milliseconds`, which has a much smaller
allowed range.
Drop our `cmsysProcess_SetTimeout` wrapper as it is now very thin.
Diffstat (limited to 'Source/CTest/cmProcess.cxx')
| -rw-r--r-- | Source/CTest/cmProcess.cxx | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx index 69ffb33..0db66c3 100644 --- a/Source/CTest/cmProcess.cxx +++ b/Source/CTest/cmProcess.cxx @@ -5,16 +5,6 @@ #include "cmProcessOutput.h" #include <iostream> -void cmsysProcess_SetTimeout(cmsysProcess* process, - std::chrono::duration<double> timeout) -{ - cmsysProcess_SetTimeout( - process, - double( - std::chrono::duration_cast<std::chrono::milliseconds>(timeout).count()) / - 1000.0); -}; - cmProcess::cmProcess() { this->Process = nullptr; @@ -59,7 +49,7 @@ bool cmProcess::StartProcess() cmsysProcess_SetWorkingDirectory(this->Process, this->WorkingDirectory.c_str()); } - cmsysProcess_SetTimeout(this->Process, this->Timeout); + cmsysProcess_SetTimeout(this->Process, this->Timeout.count()); cmsysProcess_SetOption(this->Process, cmsysProcess_Option_MergeOutput, 1); cmsysProcess_Execute(this->Process); return (cmsysProcess_GetState(this->Process) == @@ -115,10 +105,7 @@ int cmProcess::GetNextOutputLine(std::string& line, { cmProcessOutput processOutput(cmProcessOutput::UTF8); std::string strdata; - double waitTimeout = - double( - std::chrono::duration_cast<std::chrono::milliseconds>(timeout).count()) / - 1000.0; + double waitTimeout = timeout.count(); for (;;) { // Look for lines already buffered. if (this->Output.GetLine(line)) { @@ -240,7 +227,7 @@ int cmProcess::ReportStatus() void cmProcess::ChangeTimeout(std::chrono::duration<double> t) { this->Timeout = t; - cmsysProcess_SetTimeout(this->Process, this->Timeout); + cmsysProcess_SetTimeout(this->Process, this->Timeout.count()); } void cmProcess::ResetStartTime() |