reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-03-04 09:57:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'clang-tidy-8-macOS'

Browse Source 
8588cdf3a0 clang-tidy: Fix bugprone-exception-escape diagnostic in test code
f1f57cffc7 clang-tidy: Fix performance-for-range-copy diagnostic in Xcode generator
175d8c4bf6 clang-tidy: Resolve performance-unnecessary-value-param diagnostics
7c5ec91301 cmGeneratedFileStreamBase: Optimize string construction in Close

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3796
This commit is contained in:
Brad King 2019-09-10 14:25:57 +00:00 committed by Kitware Robot
commit 1c2c541b0c
6 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmGeneratedFileStream.cxx
View File

@ -4,6 +4,7 @@
#include <stdio.h> #include <stdio.h>
#include "cmStringAlgorithms.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
#if !defined(CMAKE_BOOTSTRAP) #if !defined(CMAKE_BOOTSTRAP)
@ -149,7 +150,7 @@ bool cmGeneratedFileStreamBase::Close()
// The destination is to be replaced. Rename the temporary to the // The destination is to be replaced. Rename the temporary to the
// destination atomically. // destination atomically.
if (this->Compress) { if (this->Compress) {
std::string gzname = this->TempName + ".temp.gz"; std::string gzname = cmStrCat(this->TempName, ".temp.gz");
if (this->CompressFile(this->TempName, gzname)) { if (this->CompressFile(this->TempName, gzname)) {
this->RenameFile(gzname, resname); this->RenameFile(gzname, resname);
} }

6
Source/cmGlobalXCodeGenerator.cxx
View File

@ -1254,7 +1254,7 @@ bool cmGlobalXCodeGenerator::CreateXCodeTarget(
bundleFiles[tsFlags.MacFolder].push_back(sourceFile); bundleFiles[tsFlags.MacFolder].push_back(sourceFile);
} }
} }
for (auto keySources : bundleFiles) { for (auto const& keySources : bundleFiles) {
cmXCodeObject* copyFilesBuildPhase = cmXCodeObject* copyFilesBuildPhase =
this->CreateObject(cmXCodeObject::PBXCopyFilesBuildPhase); this->CreateObject(cmXCodeObject::PBXCopyFilesBuildPhase);
copyFilesBuildPhase->SetComment("Copy files"); copyFilesBuildPhase->SetComment("Copy files");
@ -1302,7 +1302,7 @@ bool cmGlobalXCodeGenerator::CreateXCodeTarget(
bundleFiles[tsFlags.MacFolder].push_back(sourceFile); bundleFiles[tsFlags.MacFolder].push_back(sourceFile);
} }
} }
for (auto keySources : bundleFiles) { for (auto const& keySources : bundleFiles) {
cmXCodeObject* copyFilesBuildPhase = cmXCodeObject* copyFilesBuildPhase =
this->CreateObject(cmXCodeObject::PBXCopyFilesBuildPhase); this->CreateObject(cmXCodeObject::PBXCopyFilesBuildPhase);
copyFilesBuildPhase->SetComment("Copy files"); copyFilesBuildPhase->SetComment("Copy files");
@ -1433,7 +1433,7 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateBuildPhase(
void cmGlobalXCodeGenerator::CreateCustomCommands( void cmGlobalXCodeGenerator::CreateCustomCommands(
cmXCodeObject* buildPhases, cmXCodeObject* sourceBuildPhase, cmXCodeObject* buildPhases, cmXCodeObject* sourceBuildPhase,
cmXCodeObject* headerBuildPhase, cmXCodeObject* resourceBuildPhase, cmXCodeObject* headerBuildPhase, cmXCodeObject* resourceBuildPhase,
std::vector<cmXCodeObject*> contentBuildPhases, std::vector<cmXCodeObject*> const& contentBuildPhases,
cmXCodeObject* frameworkBuildPhase, cmGeneratorTarget* gtgt) cmXCodeObject* frameworkBuildPhase, cmGeneratorTarget* gtgt)
{ {
std::vector<cmCustomCommand> const& prebuild = gtgt->GetPreBuildCommands(); std::vector<cmCustomCommand> const& prebuild = gtgt->GetPreBuildCommands();

12
Source/cmGlobalXCodeGenerator.h
View File

@ -122,13 +122,11 @@ private:
std::string RelativeToSource(const std::string& p); std::string RelativeToSource(const std::string& p);
std::string RelativeToBinary(const std::string& p); std::string RelativeToBinary(const std::string& p);
std::string ConvertToRelativeForMake(std::string const& p); std::string ConvertToRelativeForMake(std::string const& p);
void CreateCustomCommands(cmXCodeObject* buildPhases, void CreateCustomCommands(
cmXCodeObject* sourceBuildPhase, cmXCodeObject* buildPhases, cmXCodeObject* sourceBuildPhase,
cmXCodeObject* headerBuildPhase, cmXCodeObject* headerBuildPhase, cmXCodeObject* resourceBuildPhase,
cmXCodeObject* resourceBuildPhase, std::vector<cmXCodeObject*> const& contentBuildPhases,
std::vector<cmXCodeObject*> contentBuildPhases, cmXCodeObject* frameworkBuildPhase, cmGeneratorTarget* gtgt);
cmXCodeObject* frameworkBuildPhase,
cmGeneratorTarget* gtgt);
std::string ComputeInfoPListLocation(cmGeneratorTarget* target); std::string ComputeInfoPListLocation(cmGeneratorTarget* target);

1
Source/cmListFileCache.cxx
View File

@ -326,6 +326,7 @@ cmListFileBacktrace::cmListFileBacktrace(cmStateSnapshot const& snapshot)
{ {
} }
/* NOLINTNEXTLINE(performance-unnecessary-value-param) */
cmListFileBacktrace::cmListFileBacktrace(std::shared_ptr<Entry const> parent, cmListFileBacktrace::cmListFileBacktrace(std::shared_ptr<Entry const> parent,
cmListFileContext const& lfc) cmListFileContext const& lfc)
: TopEntry(std::make_shared<Entry const>(std::move(parent), lfc)) : TopEntry(std::make_shared<Entry const>(std::move(parent), lfc))

1
Source/cmVariableWatchCommand.cxx
View File

@ -91,6 +91,7 @@ static void deleteVariableWatchCallbackData(void* client_data)
class FinalAction class FinalAction
{ {
public: public:
/* NOLINTNEXTLINE(performance-unnecessary-value-param) */
FinalAction(cmMakefile* makefile, std::string variable) FinalAction(cmMakefile* makefile, std::string variable)
: Action(std::make_shared<Impl>(makefile, std::move(variable))) : Action(std::make_shared<Impl>(makefile, std::move(variable)))
{ {

3
Tests/CMakeLib/testUVProcessChainHelper.cxx
View File

@ -44,7 +44,7 @@ int main(int argc, char** argv)
} }
if (command == "dedup") { if (command == "dedup") {
// Use a nested scope to free all resources before aborting below. // Use a nested scope to free all resources before aborting below.
{ try {
std::string input = getStdin(); std::string input = getStdin();
std::set<char> seen; std::set<char> seen;
std::string output; std::string output;
@ -56,6 +56,7 @@ int main(int argc, char** argv)
} }
std::cout << output << std::flush; std::cout << output << std::flush;
std::cerr << "3" << std::flush; std::cerr << "3" << std::flush;
} catch (...) {
} }
// On Windows, the exit code of abort() is different between debug and // On Windows, the exit code of abort() is different between debug and