diff options
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/PostBuildLint.cpp | 8 | ||||
| -rw-r--r-- | toolsrc/src/PostBuildLint_BuildType.cpp | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp index 1c6ee4ede..71923277d 100644 --- a/toolsrc/src/PostBuildLint.cpp +++ b/toolsrc/src/PostBuildLint.cpp @@ -500,12 +500,12 @@ namespace vcpkg::PostBuildLint struct BuildType_and_file { fs::path file; - BuildType::type build_type; + BuildType::Type build_type; }; - static lint_status check_crt_linkage_of_libs(const BuildType::type& expected_build_type, const std::vector<fs::path>& libs, const fs::path dumpbin_exe) + static lint_status check_crt_linkage_of_libs(const BuildType::Type& expected_build_type, const std::vector<fs::path>& libs, const fs::path dumpbin_exe) { - std::vector<BuildType::type> bad_build_types(BuildType::values.cbegin(), BuildType::values.cend()); + std::vector<BuildType::Type> bad_build_types(BuildType::values.cbegin(), BuildType::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<BuildType_and_file> libs_with_invalid_crt; @@ -516,7 +516,7 @@ namespace vcpkg::PostBuildLint System::exit_code_and_output 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::Type& bad_build_type : bad_build_types) { if (std::regex_search(ec_data.output.cbegin(), ec_data.output.cend(), bad_build_type.crt_regex())) { diff --git a/toolsrc/src/PostBuildLint_BuildType.cpp b/toolsrc/src/PostBuildLint_BuildType.cpp index 593d976f2..915d5d670 100644 --- a/toolsrc/src/PostBuildLint_BuildType.cpp +++ b/toolsrc/src/PostBuildLint_BuildType.cpp @@ -4,7 +4,7 @@ namespace vcpkg::PostBuildLint::BuildType { - type value_of(const ConfigurationType::type& config, const LinkageType::type& linkage) + Type value_of(const ConfigurationType::type& config, const LinkageType::type& linkage) { if (config == ConfigurationType::DEBUG && linkage == LinkageType::STATIC) { @@ -29,17 +29,17 @@ namespace vcpkg::PostBuildLint::BuildType Checks::unreachable(VCPKG_LINE_INFO); } - const ConfigurationType::type& type::config() const + const ConfigurationType::type& Type::config() const { return this->m_config; } - const LinkageType::type& type::linkage() const + const LinkageType::type& Type::linkage() const { return this->m_linkage; } - const std::regex& type::crt_regex() const + const std::regex& Type::crt_regex() const { static const std::regex REGEX_DEBUG_STATIC(R"(/DEFAULTLIB:LIBCMTD)", std::regex_constants::icase); static const std::regex REGEX_DEBUG_DYNAMIC(R"(/DEFAULTLIB:MSVCRTD)", std::regex_constants::icase); @@ -61,7 +61,7 @@ namespace vcpkg::PostBuildLint::BuildType } } - const std::string& type::toString() const + const std::string& Type::toString() const { static const std::string NAME_DEBUG_STATIC("Debug,Static"); static const std::string NAME_DEBUG_DYNAMIC("Debug,Dynamic"); |