From d3d00b33dd524815b47f1bc6e6f8080dc7054d29 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Tue, 25 Apr 2017 17:36:15 -0700 Subject: Rework BuildType enum --- toolsrc/src/PostBuildLint.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'toolsrc/src/PostBuildLint.cpp') diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp index cd9e3fc2a..b11793f57 100644 --- a/toolsrc/src/PostBuildLint.cpp +++ b/toolsrc/src/PostBuildLint.cpp @@ -522,12 +522,12 @@ namespace vcpkg::PostBuildLint struct BuildType_and_file { fs::path file; - BuildType::Type build_type; + BuildType build_type; }; - static LintStatus check_crt_linkage_of_libs(const BuildType::Type& expected_build_type, const std::vector& libs, const fs::path dumpbin_exe) + static LintStatus check_crt_linkage_of_libs(const BuildType& expected_build_type, const std::vector& libs, const fs::path dumpbin_exe) { - std::vector bad_build_types(BuildType::values.cbegin(), BuildType::values.cend()); + std::vector bad_build_types(BuildTypeC::VALUES.cbegin(), BuildTypeC::VALUES.cend()); bad_build_types.erase(std::remove(bad_build_types.begin(), bad_build_types.end(), expected_build_type), bad_build_types.end()); std::vector libs_with_invalid_crt; @@ -538,7 +538,7 @@ namespace vcpkg::PostBuildLint System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd_line); Checks::check_exit(VCPKG_LINE_INFO, ec_data.exit_code == 0, "Running command:\n %s\n failed", Strings::utf16_to_utf8(cmd_line)); - for (const BuildType::Type& bad_build_type : bad_build_types) + for (const BuildType& bad_build_type : bad_build_types) { if (std::regex_search(ec_data.output.cbegin(), ec_data.output.cend(), bad_build_type.crt_regex())) { -- cgit v1.2.3