clang-tidy: fix readability-isolate-declaration lints

This commit is contained in:
Ben Boeckel
2022-11-22 14:54:33 -05:00
parent 1f893e5873
commit 501408338a
3 changed files with 9 additions and 4 deletions
@@ -53,7 +53,8 @@ static bool VSIsArm64Host()
# undef CM_VS_GCC_DIAGNOSTIC_PUSHED
#endif
USHORT processMachine, nativeMachine;
USHORT processMachine;
USHORT nativeMachine;
return s_IsWow64Process2Impl != nullptr &&
s_IsWow64Process2Impl(GetCurrentProcess(), &processMachine,
+5 -2
View File
@@ -289,7 +289,8 @@ bool cmVSSetupAPIHelper::GetVCToolsetVersion(std::string& vsToolsetVersion)
bool cmVSSetupAPIHelper::IsEWDKEnabled()
{
std::string envEnterpriseWDK, envDisableRegistryUse;
std::string envEnterpriseWDK;
std::string envDisableRegistryUse;
cmSystemTools::GetEnv("EnterpriseWDK", envEnterpriseWDK);
cmSystemTools::GetEnv("DisableRegistryUse", envDisableRegistryUse);
if (!cmSystemTools::Strucmp(envEnterpriseWDK.c_str(), "True") &&
@@ -410,7 +411,9 @@ bool cmVSSetupAPIHelper::EnumerateAndChooseVSInstance()
}
if (this->IsEWDKEnabled()) {
std::string envWindowsSdkDir81, envVSVersion, envVsInstallDir;
std::string envWindowsSdkDir81;
std::string envVSVersion;
std::string envVsInstallDir;
cmSystemTools::GetEnv("WindowsSdkDir_81", envWindowsSdkDir81);
cmSystemTools::GetEnv("VisualStudioVersion", envVSVersion);
+2 -1
View File
@@ -42,7 +42,8 @@ const cm::optional<cmSlnProjectEntry> cmSlnData::GetProjectByName(
std::vector<cmSlnProjectEntry> cmSlnData::GetProjects() const
{
auto it(this->ProjectNameIndex.begin()), itEnd(this->ProjectNameIndex.end());
auto it(this->ProjectNameIndex.begin());
auto itEnd(this->ProjectNameIndex.end());
std::vector<cmSlnProjectEntry> result;
for (; it != itEnd; ++it) {
result.push_back(it->second->second);