diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-04-28 17:27:07 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-04-30 03:36:55 -0700 |
| commit | cbc52bc6a4f92ac4c5379912b09adb37a6ea1918 (patch) | |
| tree | ebd28c77d4268f6ac8fc1c0906ce2e279e530e63 /toolsrc/src/PostBuildLint.cpp | |
| parent | 5419aebcfed8cf044f723e07dd785b839fd6bb5b (diff) | |
| download | vcpkg-cbc52bc6a4f92ac4c5379912b09adb37a6ea1918.tar.gz vcpkg-cbc52bc6a4f92ac4c5379912b09adb37a6ea1918.zip | |
[vcpkg] Remove OptBool in favor of Optional<bool>
Diffstat (limited to 'toolsrc/src/PostBuildLint.cpp')
| -rw-r--r-- | toolsrc/src/PostBuildLint.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp index 5d7d7b441..7df74cf31 100644 --- a/toolsrc/src/PostBuildLint.cpp +++ b/toolsrc/src/PostBuildLint.cpp @@ -59,19 +59,16 @@ namespace vcpkg::PostBuildLint } template<class T> - static bool contains_and_enabled(const std::map<T, OptBool> map, const T& key) + static bool contains_and_enabled(const std::map<T, bool> map, const T& key) { auto it = map.find(key); - if (it != map.cend() && it->second == OptBoolC::ENABLED) - { - return true; - } + if (it != map.cend()) return it->second; return false; } static LintStatus check_for_files_in_include_directory(const Files::Filesystem& fs, - const std::map<BuildPolicies, OptBool>& policies, + const std::map<BuildPolicies, bool>& policies, const fs::path& package_dir) { if (contains_and_enabled(policies, BuildPoliciesC::EMPTY_INCLUDE_FOLDER)) @@ -495,14 +492,13 @@ namespace vcpkg::PostBuildLint return LintStatus::ERROR_DETECTED; } - static LintStatus check_lib_files_are_available_if_dlls_are_available( - const std::map<BuildPolicies, OptBool>& policies, - const size_t lib_count, - const size_t dll_count, - const fs::path& lib_dir) + static LintStatus check_lib_files_are_available_if_dlls_are_available(const std::map<BuildPolicies, bool>& policies, + const size_t lib_count, + const size_t dll_count, + const fs::path& lib_dir) { auto it = policies.find(BuildPoliciesC::DLLS_WITHOUT_LIBS); - if (it != policies.cend() && it->second == OptBoolC::ENABLED) + if (it != policies.cend() && it->second) { return LintStatus::SUCCESS; } |
