diff options
| author | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2015-04-28 21:43:13 +0000 |
|---|---|---|
| committer | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2015-04-28 21:43:13 +0000 |
| commit | bb23dcfa52ddd23e2a08e77bfee84197baffc227 (patch) | |
| tree | bb82abdf383c3d759390a51180073ef31736a438 | |
| parent | 3be1ef9f1c6139654a7784c53aa833c7a37a3148 (diff) | |
| download | googletest-bb23dcfa52ddd23e2a08e77bfee84197baffc227.tar.gz | |
Make an int64->double conversion explicit to silence -Wconversion.
Addresses issue #173:
https://code.google.com/p/googlemock/issues/detail?id=173
git-svn-id: http://googletest.googlecode.com/svn/trunk@709 861a406c-534a-0410-8894-cb66d6ee9925
| -rw-r--r-- | src/gtest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gtest.cc b/src/gtest.cc index 7fd5f29..bcbbf53 100644 --- a/src/gtest.cc +++ b/src/gtest.cc @@ -3501,7 +3501,7 @@ std::string XmlUnitTestResultPrinter::RemoveInvalidXmlCharacters( // Formats the given time in milliseconds as seconds. std::string FormatTimeInMillisAsSeconds(TimeInMillis ms) { ::std::stringstream ss; - ss << ms/1000.0; + ss << (static_cast<double>(ms) * 1e-3); return ss.str(); } |