From 3213e2595da3ce75af489a63f53b05c5560aa547 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 20 Oct 2021 13:47:16 -0400 Subject: cmVSSetupHelper: Drop unused ullVersion field The field has not been used since commit 3fd65f5ca6 (VS: Compare VS instance versions as strings, 2021-06-17, v3.21.0-rc1~11^2~1). --- Source/cmVSSetupHelper.cxx | 7 ------- Source/cmVSSetupHelper.h | 1 - 2 files changed, 8 deletions(-) diff --git a/Source/cmVSSetupHelper.cxx b/Source/cmVSSetupHelper.cxx index 969a2c2..1b67611 100644 --- a/Source/cmVSSetupHelper.cxx +++ b/Source/cmVSSetupHelper.cxx @@ -164,17 +164,11 @@ bool cmVSSetupAPIHelper::GetVSInstanceInfo( return false; } - ULONGLONG ullVersion = 0; SmartBSTR bstrVersion; if (FAILED(pInstance->GetInstallationVersion(&bstrVersion))) { return false; } else { vsInstanceInfo.Version = std::wstring(bstrVersion); - if (FAILED(setupHelper->ParseVersion(bstrVersion, &ullVersion))) { - vsInstanceInfo.ullVersion = 0; - } else { - vsInstanceInfo.ullVersion = ullVersion; - } } // Reboot may have been required before the installation path was created. @@ -316,7 +310,6 @@ bool cmVSSetupAPIHelper::EnumerateAndChooseVSInstance() chosenInstanceInfo.Version = std::wstring(envVSVersion.begin(), envVSVersion.end()); chosenInstanceInfo.VCToolsetVersion = envVSVersion; - chosenInstanceInfo.ullVersion = std::stoi(envVSVersion); chosenInstanceInfo.IsWin10SDKInstalled = true; chosenInstanceInfo.IsWin81SDKInstalled = !envWindowsSdkDir81.empty(); return true; diff --git a/Source/cmVSSetupHelper.h b/Source/cmVSSetupHelper.h index 61a3ac7..b2ba086 100644 --- a/Source/cmVSSetupHelper.h +++ b/Source/cmVSSetupHelper.h @@ -88,7 +88,6 @@ struct VSInstanceInfo std::wstring VSInstallLocation; std::wstring Version; std::string VCToolsetVersion; - ULONGLONG ullVersion = 0; // A.B.C.D = (A<<48)|(B<<32)|(C<<16)|D bool IsWin10SDKInstalled = false; bool IsWin81SDKInstalled = false; -- cgit v0.12