diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-29 15:21:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-29 15:21:24 (GMT) |
| commit | 4b89232ffada234920510c71ef94ae40aa4a51f2 (patch) | |
| tree | 892bcf35f0a7ab391550d267812c7375e9d8df27 /Source/cmMakefile.cxx | |
| parent | e13a858555f3d8f0b1df07f4850608877fb48db1 (diff) | |
| parent | 5a72ffb33a23fbc1ea12d4e3572f46650744d950 (diff) | |
| download | CMake-4b89232ffada234920510c71ef94ae40aa4a51f2.zip CMake-4b89232ffada234920510c71ef94ae40aa4a51f2.tar.gz CMake-4b89232ffada234920510c71ef94ae40aa4a51f2.tar.bz2 | |
Merge topic 'mf-json-type'
5a72ffb33a cmMakefile: Fix construction of Json::Value from fixed-size int types
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4291
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index e43ee8a..b2e59bd 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -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; |