reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-24 03:59:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'mf-json-type'

Browse Source 
5a72ffb33a cmMakefile: Fix construction of Json::Value from fixed-size int types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4291
This commit is contained in:
Brad King 2020-01-29 15:21:16 +00:00 committed by Kitware Robot
commit 4b89232ffa
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmMakefile.cxx
View File

@ -7,7 +7,6 @@
#include <algorithm>
#include <cassert>
#include <cctype>
#include <cstdint>
#include <cstdio>
#include <cstdlib>
#include <cstring>
@ -334,7 +333,7 @@ void cmMakefile::PrintCommandTrace(const cmListFileFunction& lff) const
Json::StreamWriterBuilder builder;
builder["indentation"] = "";
val["file"] = full_path;
val["line"] = static_cast<std::int64_t>(lff.Line);
val["line"] = static_cast<Json::Value::Int64>(lff.Line);
val["cmd"] = lff.Name.Original;
val["args"] = Json::Value(Json::arrayValue);
for (std::string const& arg : args) {
@ -342,7 +341,7 @@ void cmMakefile::PrintCommandTrace(const cmListFileFunction& lff) const
}
val["time"] = cmSystemTools::GetTime();
val["frame"] =
static_cast<std::uint64_t>(this->ExecutionStatusStack.size());
static_cast<Json::Value::UInt64>(this->ExecutionStatusStack.size());
msg << Json::writeString(builder, val);
#endif
break;