Merge topic 'clang-tidy'

effa6c83 fix more issues reported by clang-tidy
fb461cac silence selected clang-tidy violations

1 files changed, 14 insertions, 8 deletions

diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index d332ed7..e50878b 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -41,8 +41,9 @@ static std::vector<std::string> getConfigurations(const cmake* cm)
   }
 
   makefiles[0]->GetConfigurations(configurations);
-  if (configurations.empty())
+  if (configurations.empty()) {
     configurations.push_back("");
+  }
   return configurations;
 }
 
@@ -95,20 +96,24 @@ static void getCMakeInputs(const cmGlobalGenerator* gg,
       if (!sourceDir.empty()) {
         const std::string& relative =
           cmSystemTools::RelativePath(sourceDir.c_str(), jt->c_str());
-        if (toAdd.size() > relative.size())
+        if (toAdd.size() > relative.size()) {
           toAdd = relative;
+        }
       }
 
       if (isInternal) {
-        if (internalFiles)
+        if (internalFiles) {
           internalFiles->push_back(toAdd);
+        }
       } else {
         if (isTemporary) {
-          if (tmpFiles)
+          if (tmpFiles) {
             tmpFiles->push_back(toAdd);
+          }
         } else {
-          if (explicitFiles)
+          if (explicitFiles) {
             explicitFiles->push_back(toAdd);
+          }
         }
       }
     }
@@ -671,8 +676,9 @@ static Json::Value DumpSourceFilesList(
   Json::Value result = Json::arrayValue;
   for (auto it = fileGroups.begin(); it != fileGroups.end(); ++it) {
     Json::Value group = DumpSourceFileGroup(it->first, it->second, baseDir);
-    if (!group.isNull())
+    if (!group.isNull()) {
       result.append(group);
+    }
   }
 
   return result;
@@ -820,8 +826,8 @@ static Json::Value DumpProjectList(const cmake* cm, const std::string config)
     Json::Value pObj = Json::objectValue;
     pObj[kNAME_KEY] = projectIt.first;
 
-    assert(projectIt.second.size() >
-           0); // All Projects must have at least one local generator
+    // All Projects must have at least one local generator
+    assert(!projectIt.second.empty());
     const cmLocalGenerator* lg = projectIt.second.at(0);
 
     // Project structure information: