Browse Source

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.
makise-homura 1 year ago
parent
commit
9bc2aba3b4
2 changed files with 3 additions and 3 deletions
  1. 1 1
      Source/cmDebuggerExceptionManager.cxx
  2. 2 2
      Source/cmSystemTools.cxx

+ 1 - 1
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;
 }

+ 2 - 2
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) {