diff options
| author | Brad King <brad.king@kitware.com> | 2023-11-08 15:31:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-11-08 15:32:03 (GMT) |
| commit | 56544c1874f449d76da5da66379b5f3af966482a (patch) | |
| tree | 7f5dc98a750e49df82851fa4f45f0dc70911850a /Tests | |
| parent | 4f26c238a68619d2603f970375096a1eb64eae85 (diff) | |
| parent | a0fabc47691a0bc76038c8fdf5f0e0a23ed954d0 (diff) | |
| download | CMake-56544c1874f449d76da5da66379b5f3af966482a.zip CMake-56544c1874f449d76da5da66379b5f3af966482a.tar.gz CMake-56544c1874f449d76da5da66379b5f3af966482a.tar.bz2 | |
Merge topic 'cxx23' into release-3.28
a0fabc4769 cmGlobalGeneratorFactory: Provide complete cmGlobalGenerator to deleter
85627a93c9 cmCTestBuildCommand: Avoid requiring complete cmGlobalGenerator type publicly
641c02a3ce cmList: Avoid using operator-> on input iterator
e4483b8871 Tests: Avoid compiling call to dap::optional<dap::string>(nullptr)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !8950
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLib/testDebugger.h | 2 | ||||
| -rw-r--r-- | Tests/CMakeLib/testDebuggerVariables.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Tests/CMakeLib/testDebugger.h b/Tests/CMakeLib/testDebugger.h index d8d2caa..df67278 100644 --- a/Tests/CMakeLib/testDebugger.h +++ b/Tests/CMakeLib/testDebugger.h @@ -19,7 +19,7 @@ do { \ ASSERT_TRUE(x.name == expectedName); \ ASSERT_TRUE(x.value == expectedValue); \ - if (expectedType == nullptr) { \ + if (expectedType == std::string()) { \ ASSERT_TRUE(x.type == dap::optional<dap::string>()); \ } else { \ ASSERT_TRUE(x.type == dap::optional<dap::string>(expectedType)); \ diff --git a/Tests/CMakeLib/testDebuggerVariables.cxx b/Tests/CMakeLib/testDebuggerVariables.cxx index 0d8d18d..bb3f14d 100644 --- a/Tests/CMakeLib/testDebuggerVariables.cxx +++ b/Tests/CMakeLib/testDebuggerVariables.cxx @@ -196,8 +196,8 @@ static bool testNoSupportsVariableType() CreateVariablesRequest(vars->GetId())); ASSERT_TRUE(variables.size() == 2); - ASSERT_VARIABLE(variables[0], "Children", "", nullptr); - ASSERT_VARIABLE(variables[1], "test", "value", nullptr); + ASSERT_VARIABLE(variables[0], "Children", "", ""); + ASSERT_VARIABLE(variables[1], "test", "value", ""); return true; } |