mirror of
https://github.com/Kitware/CMake.git
synced 2025-12-30 10:20:56 -06:00
LCC: get rid of ambiguous assignments of {} for LCC
LCC 1.21 can't determine the exact type of right side of assignment and so produces an error. Here it is resolved by an intermediate variable.
This commit is contained in:
@@ -78,7 +78,7 @@ cmDebuggerExceptionManager::HandleExceptionInfoRequest()
|
||||
response.exceptionId = TheException->Id;
|
||||
response.breakMode = "always";
|
||||
response.description = TheException->Description;
|
||||
TheException = {};
|
||||
TheException = cm::nullopt;
|
||||
}
|
||||
return response;
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user