diff options
| author | Brad King <brad.king@kitware.com> | 2019-06-17 11:54:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-06-17 11:54:55 (GMT) |
| commit | 8f8b95395d70f8f58963f5285a32c86ed932bf4e (patch) | |
| tree | 9182103e2041a341c49ed761e783b90fb709f146 /Source | |
| parent | 6903c5bbfbdde52f9f8f7689a49fcd02d6c7ae64 (diff) | |
| parent | d63398d32da8948fae80ce2e29f9ca139112a03f (diff) | |
| download | CMake-8f8b95395d70f8f58963f5285a32c86ed932bf4e.zip CMake-8f8b95395d70f8f58963f5285a32c86ed932bf4e.tar.gz CMake-8f8b95395d70f8f58963f5285a32c86ed932bf4e.tar.bz2 | |
Merge topic 'capabilities-fileapi'
d63398d32d fileapi: Suppress lint warning about non-move with old jsoncpp
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3442
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmFileAPI.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmFileAPI.cxx b/Source/cmFileAPI.cxx index ed45398..ba42669 100644 --- a/Source/cmFileAPI.cxx +++ b/Source/cmFileAPI.cxx @@ -812,7 +812,7 @@ Json::Value cmFileAPI::ReportCapabilities() request["kind"] = ObjectKindName(ObjectKind::CodeModel); Json::Value& versions = request["version"] = Json::arrayValue; versions.append(BuildVersion(2, CodeModelV2Minor)); - requests.append(std::move(request)); + requests.append(std::move(request)); // NOLINT(*) } { @@ -820,7 +820,7 @@ Json::Value cmFileAPI::ReportCapabilities() request["kind"] = ObjectKindName(ObjectKind::Cache); Json::Value& versions = request["version"] = Json::arrayValue; versions.append(BuildVersion(2, CacheV2Minor)); - requests.append(std::move(request)); + requests.append(std::move(request)); // NOLINT(*) } { @@ -828,7 +828,7 @@ Json::Value cmFileAPI::ReportCapabilities() request["kind"] = ObjectKindName(ObjectKind::CMakeFiles); Json::Value& versions = request["version"] = Json::arrayValue; versions.append(BuildVersion(1, CMakeFilesV1Minor)); - requests.append(std::move(request)); + requests.append(std::move(request)); // NOLINT(*) } return capabilities; |