aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/PostBuildLint.cpp
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-04-25 17:36:15 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-04-25 17:56:19 -0700
commitd3d00b33dd524815b47f1bc6e6f8080dc7054d29 (patch)
tree155cff5ec1ccbe0a0bb8a939256a88e6e8570214 /toolsrc/src/PostBuildLint.cpp
parent1ac0f768b7209b33e3f33730649a9f4e33dec37a (diff)
downloadvcpkg-d3d00b33dd524815b47f1bc6e6f8080dc7054d29.tar.gz
vcpkg-d3d00b33dd524815b47f1bc6e6f8080dc7054d29.zip
Rework BuildType enum
Diffstat (limited to 'toolsrc/src/PostBuildLint.cpp')
-rw-r--r--toolsrc/src/PostBuildLint.cpp8
1 files changed, 4 insertions, 4 deletions
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<fs::path>& libs, const fs::path dumpbin_exe)
+ static LintStatus check_crt_linkage_of_libs(const BuildType& 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> 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<BuildType_and_file> 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()))
{