From 5c996c64665ff9826100f0f0fb055b7c883277bb Mon Sep 17 00:00:00 2001 From: kosak Date: Tue, 28 Apr 2015 21:43:13 +0000 Subject: [PATCH] Make an int64->double conversion explicit to silence -Wconversion. Addresses issue #173: https://code.google.com/p/googlemock/issues/detail?id=173 --- src/gtest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gtest.cc b/src/gtest.cc index 7fd5f298..bcbbf53a 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(ms) * 1e-3); return ss.str(); }