From 897af4c26690d4daba5e1e8c516dac6224bb518f Mon Sep 17 00:00:00 2001 From: Raul Tambre Date: Sun, 15 Mar 2020 19:14:11 +0200 Subject: cmMakefileProfilingData: Fix ambiguous conversion to Json::Value --- Source/cmMakefileProfilingData.cxx | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Source/cmMakefileProfilingData.cxx b/Source/cmMakefileProfilingData.cxx index ea64132..adf4eee 100644 --- a/Source/cmMakefileProfilingData.cxx +++ b/Source/cmMakefileProfilingData.cxx @@ -3,7 +3,6 @@ #include "cmMakefileProfilingData.h" #include -#include #include #include @@ -61,9 +60,10 @@ void cmMakefileProfilingData::StartEntry(const cmListFileFunction& lff, v["ph"] = "B"; v["name"] = lff.Name.Original; v["cat"] = "cmake"; - v["ts"] = uint64_t(std::chrono::duration_cast( - std::chrono::steady_clock::now().time_since_epoch()) - .count()); + v["ts"] = Json::Value::UInt64( + std::chrono::duration_cast( + std::chrono::steady_clock::now().time_since_epoch()) + .count()); v["pid"] = static_cast(info.GetProcessId()); v["tid"] = 0; Json::Value argsValue; @@ -98,9 +98,10 @@ void cmMakefileProfilingData::StopEntry() cmsys::SystemInformation info; Json::Value v; v["ph"] = "E"; - v["ts"] = uint64_t(std::chrono::duration_cast( - std::chrono::steady_clock::now().time_since_epoch()) - .count()); + v["ts"] = Json::Value::UInt64( + std::chrono::duration_cast( + std::chrono::steady_clock::now().time_since_epoch()) + .count()); v["pid"] = static_cast(info.GetProcessId()); v["tid"] = 0; this->JsonWriter->write(v, &this->ProfileStream); -- cgit v0.12