diff options
| author | Brad King <brad.king@kitware.com> | 2024-01-17 14:51:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-01-17 14:51:13 (GMT) |
| commit | c7ebec770f19faa7b16df280a1f4804fa98b1011 (patch) | |
| tree | c0365813927729946bbdfac9029964b64e423c36 /Source | |
| parent | 094648fa7316be8040c23bcb150edc78d8af35c9 (diff) | |
| parent | 202f4b316139dcb00dc057bc4fcc85b00b8a62cb (diff) | |
| download | CMake-c7ebec770f19faa7b16df280a1f4804fa98b1011.zip CMake-c7ebec770f19faa7b16df280a1f4804fa98b1011.tar.gz CMake-c7ebec770f19faa7b16df280a1f4804fa98b1011.tar.bz2 | |
Merge topic 'lcc-updates-2024-01'
202f4b3161 Tests: Exclude some tests on broken libc on Elbrus
9dd0ab9c88 LCC: Make CMake build without warnings on LCC 1.21
1dbb31cea2 libarchive: avoid lchmod not implemented warning on old LCC
83af26d9ad LCC: Don't enable debugger on LCC that don't have <future>
fa764ce311 liblzma: Make cmliblzma buildable on LCC 1.21
77e046b47c jsoncpp: fix missing template deletion support on LCC < 1.23
67de0c197b cmcurl: fix X509_STORE_up_ref issue not just on LCC 1.23, but on LCC <= 1.23
9bc2aba3b4 LCC: get rid of ambiguous assignments of {} for LCC
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9157
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmConfigure.cmake.h.in | 7 | ||||
| -rw-r--r-- | Source/cmDebuggerExceptionManager.cxx | 2 | ||||
| -rw-r--r-- | Source/cmSystemTools.cxx | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in index de74716..23e4846 100644 --- a/Source/cmConfigure.cmake.h.in +++ b/Source/cmConfigure.cmake.h.in @@ -14,8 +14,13 @@ #pragma warning(disable : 1572) /* floating-point equality test */ #endif -#if defined(__LCC__) && defined(__EDG__) && (__LCC__ == 123) +#if defined(__LCC__) && defined(__EDG__) +#if __LCC__ == 123 #pragma diag_suppress 2910 /* excess -Wunused-function in 1.23.x */ +#elif __LCC__ == 121 +#pragma diag_suppress 2727 /* excess -Wunused-function in 1.21.x */ +#include <limits.h> /* ..._MIN, ..._MAX constants */ +#endif #endif #cmakedefine HAVE_ENVIRON_NOT_REQUIRE_PROTOTYPE diff --git a/Source/cmDebuggerExceptionManager.cxx b/Source/cmDebuggerExceptionManager.cxx index a27426c..470e44c 100644 --- a/Source/cmDebuggerExceptionManager.cxx +++ b/Source/cmDebuggerExceptionManager.cxx @@ -78,7 +78,7 @@ cmDebuggerExceptionManager::HandleExceptionInfoRequest() response.exceptionId = TheException->Id; response.breakMode = "always"; response.description = TheException->Description; - TheException = {}; + TheException = cm::nullopt; } return response; } diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index f606c22..1b3dbe2 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -1673,7 +1673,7 @@ void cmSystemTools::EnvDiff::PutEnv(const std::string& env) void cmSystemTools::EnvDiff::UnPutEnv(const std::string& env) { - diff[env] = {}; + diff[env] = cm::nullopt; } bool cmSystemTools::EnvDiff::ParseOperation(const std::string& envmod) @@ -1728,7 +1728,7 @@ bool cmSystemTools::EnvDiff::ParseOperation(const std::string& envmod) } else if (op == "set"_s) { diff[name] = value; } else if (op == "unset"_s) { - diff[name] = {}; + diff[name] = cm::nullopt; } else if (op == "string_append"_s) { apply_diff(name, [&value](std::string& output) { output += value; }); } else if (op == "string_prepend"_s) { |