diff options
| author | Brad King <brad.king@kitware.com> | 2022-05-24 14:05:25 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-05-24 10:05:33 -0400 |
| commit | 9eb81b2f9a115c5fc319ac3679042e6c98a24389 (patch) | |
| tree | 59923e27f207627d1f52ac0512c49454f5ee3787 /Tests | |
| parent | ced9a3b0bbc85fbd392b7323b18d00309a444ddc (diff) | |
| parent | ef6a7921e504a79a35f8a358901824ba3ed15597 (diff) | |
| download | cmake-9eb81b2f9a115c5fc319ac3679042e6c98a24389.tar.gz | |
Merge topic 'ci-fedora-36'
ef6a7921e5 gitlab-ci: use Fedora 36 images and environments
483ff3b903 ci: update Linux image to Fedora 36
13c5153ccd ci: make rvm version comments consistent
6c08dd972c clang-tidy: suppress `google-readability-casting` lint
17b7bbf2a0 clang-tidy: suppress new `readability-identifier-length` lint
16e6e4e7dd cmFileCommand: remove an unnecessary cast
b89c085237 clang-tidy: fix `readability-static-definition-in-anonymous-namespace` lints
c8c9d7de03 clang-tidy: fix `bugprone-exception-escape` lints
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7271
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLib/run_compile_commands.cxx | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CTestResourceAllocation/ctresalloc.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Tests/CMakeLib/run_compile_commands.cxx b/Tests/CMakeLib/run_compile_commands.cxx index 0ebe00e7d4..0585774456 100644 --- a/Tests/CMakeLib/run_compile_commands.cxx +++ b/Tests/CMakeLib/run_compile_commands.cxx @@ -115,7 +115,7 @@ private: void Next() { - this->C = char(this->Input.get()); + this->C = static_cast<char>(this->Input.get()); if (this->Input.bad()) { this->ErrorExit("Unexpected end of file."); } diff --git a/Tests/RunCMake/CTestResourceAllocation/ctresalloc.cxx b/Tests/RunCMake/CTestResourceAllocation/ctresalloc.cxx index daf8a2d808..5c6c8d87b6 100644 --- a/Tests/RunCMake/CTestResourceAllocation/ctresalloc.cxx +++ b/Tests/RunCMake/CTestResourceAllocation/ctresalloc.cxx @@ -89,7 +89,8 @@ static int doWrite(int argc, char const* const* argv) return 1; } int resourceGroupCount = std::atoi(resourceGroupCountEnv); - if (resourceGroups.size() != std::size_t(resourceGroupCount)) { + if (resourceGroups.size() != + static_cast<std::size_t>(resourceGroupCount)) { std::cout << "CTEST_RESOURCE_GROUP_COUNT does not match expected resource groups" << std::endl |