diff options
Diffstat (limited to 'toolsrc/src/PostBuildLint.cpp')
| -rw-r--r-- | toolsrc/src/PostBuildLint.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp index 5e3d4129f..5d7d7b441 100644 --- a/toolsrc/src/PostBuildLint.cpp +++ b/toolsrc/src/PostBuildLint.cpp @@ -36,24 +36,24 @@ namespace vcpkg::PostBuildLint const std::vector<OutdatedDynamicCrt>& get_outdated_dynamic_crts() { - static const std::vector<OutdatedDynamicCrt> v = { { "msvcp100.dll", R"(msvcp100\.dll)" }, - { "msvcp100d.dll", R"(msvcp100d\.dll)" }, - { "msvcp110.dll", R"(msvcp110\.dll)" }, - { "msvcp110_win.dll", R"(msvcp110_win\.dll)" }, - { "msvcp120.dll", R"(msvcp120\.dll)" }, - { "msvcp120_clr0400.dll", R"(msvcp120_clr0400\.dll)" }, - { "msvcp60.dll", R"(msvcp60\.dll)" }, - { "msvcp60.dll", R"(msvcp60\.dll)" }, - - { "msvcr100.dll", R"(msvcr100\.dll)" }, - { "msvcr100d.dll", R"(msvcr100d\.dll)" }, - { "msvcr100_clr0400.dll", R"(msvcr100_clr0400\.dll)" }, - { "msvcr110.dll", R"(msvcr110\.dll)" }, - { "msvcr120.dll", R"(msvcr120\.dll)" }, - { "msvcr120_clr0400.dll", R"(msvcr120_clr0400\.dll)" }, - { "msvcrt.dll", R"(msvcrt\.dll)" }, - { "msvcrt20.dll", R"(msvcrt20\.dll)" }, - { "msvcrt40.dll", R"(msvcrt40\.dll)" } }; + static const std::vector<OutdatedDynamicCrt> v = {{"msvcp100.dll", R"(msvcp100\.dll)"}, + {"msvcp100d.dll", R"(msvcp100d\.dll)"}, + {"msvcp110.dll", R"(msvcp110\.dll)"}, + {"msvcp110_win.dll", R"(msvcp110_win\.dll)"}, + {"msvcp120.dll", R"(msvcp120\.dll)"}, + {"msvcp120_clr0400.dll", R"(msvcp120_clr0400\.dll)"}, + {"msvcp60.dll", R"(msvcp60\.dll)"}, + {"msvcp60.dll", R"(msvcp60\.dll)"}, + + {"msvcr100.dll", R"(msvcr100\.dll)"}, + {"msvcr100d.dll", R"(msvcr100d\.dll)"}, + {"msvcr100_clr0400.dll", R"(msvcr100_clr0400\.dll)"}, + {"msvcr110.dll", R"(msvcr110\.dll)"}, + {"msvcr120.dll", R"(msvcr120\.dll)"}, + {"msvcr120_clr0400.dll", R"(msvcr120_clr0400\.dll)"}, + {"msvcrt.dll", R"(msvcrt\.dll)"}, + {"msvcrt20.dll", R"(msvcrt20\.dll)"}, + {"msvcrt40.dll", R"(msvcrt40\.dll)"}}; return v; } @@ -402,7 +402,7 @@ namespace vcpkg::PostBuildLint if (expected_architecture != actual_architecture) { - binaries_with_invalid_architecture.push_back({ file, actual_architecture }); + binaries_with_invalid_architecture.push_back({file, actual_architecture}); } } @@ -435,7 +435,7 @@ namespace vcpkg::PostBuildLint const std::string actual_architecture = get_actual_architecture(info.machine_types.at(0)); if (expected_architecture != actual_architecture) { - binaries_with_invalid_architecture.push_back({ file, actual_architecture }); + binaries_with_invalid_architecture.push_back({file, actual_architecture}); } } @@ -618,7 +618,7 @@ namespace vcpkg::PostBuildLint { if (std::regex_search(ec_data.output.cbegin(), ec_data.output.cend(), bad_build_type.crt_regex())) { - libs_with_invalid_crt.push_back({ lib, bad_build_type }); + libs_with_invalid_crt.push_back({lib, bad_build_type}); break; } } @@ -672,7 +672,7 @@ namespace vcpkg::PostBuildLint { if (std::regex_search(ec_data.output.cbegin(), ec_data.output.cend(), outdated_crt.regex)) { - dlls_with_outdated_crt.push_back({ dll, outdated_crt }); + dlls_with_outdated_crt.push_back({dll, outdated_crt}); break; } } |