diff options
author | Brad King <brad.king@kitware.com> | 2017-08-16 14:51:46 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-16 14:51:48 (GMT) |
commit | a2405b43788787c5c34f9d2b7b005c0ef6c3bb24 (patch) | |
tree | 0ffc711d3ce504b4e0323f16b9b5a90ff3ffe8ec /Source | |
parent | d817bbb8dfda07e94850c73811b7a520cb65c6f0 (diff) | |
parent | cbcf6458f45f1b714487b3d6e1713d6e40e448f0 (diff) | |
download | CMake-a2405b43788787c5c34f9d2b7b005c0ef6c3bb24.zip CMake-a2405b43788787c5c34f9d2b7b005c0ef6c3bb24.tar.gz CMake-a2405b43788787c5c34f9d2b7b005c0ef6c3bb24.tar.bz2 |
Merge topic 'lint-fixes'
cbcf6458 cmServerProtocol: Do not move into json::Value::append()
91417e4c cmServerProtocol: pass cmBacktraceRange by value
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1143
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmServerProtocol.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx index b371e9e..baaf11a 100644 --- a/Source/cmServerProtocol.cxx +++ b/Source/cmServerProtocol.cxx @@ -747,14 +747,14 @@ static Json::Value DumpBacktrace(const cmListFileBacktrace& backtrace) if (!backtraceCopy.Top().Name.empty()) { entry[kNAME_KEY] = backtraceCopy.Top().Name; } - result.append(std::move(entry)); + result.append(entry); backtraceCopy = backtraceCopy.Pop(); } return result; } static void DumpBacktraceRange(Json::Value& result, const std::string& type, - const cmBacktraceRange& range) + cmBacktraceRange range) { for (const auto& bt : range) { Json::Value obj = Json::objectValue; |