diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-29 18:08:53 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-29 18:11:18 -0800 |
| commit | 35152bb4fddc63f6166611a6a01fe7429e955743 (patch) | |
| tree | 55977a662639416bdc074dd87a5536adddb95881 /toolsrc/src | |
| parent | 0b996a002ec6d90d8a132e7603553b60b332c9fe (diff) | |
| download | vcpkg-35152bb4fddc63f6166611a6a01fe7429e955743.tar.gz vcpkg-35152bb4fddc63f6166611a6a01fe7429e955743.zip | |
Use new Files functions
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/post_build_lint.cpp | 5 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg_Files.cpp | 12 |
2 files changed, 7 insertions, 10 deletions
diff --git a/toolsrc/src/post_build_lint.cpp b/toolsrc/src/post_build_lint.cpp index 3ef906353..61fbba52a 100644 --- a/toolsrc/src/post_build_lint.cpp +++ b/toolsrc/src/post_build_lint.cpp @@ -568,10 +568,7 @@ namespace vcpkg { namespace PostBuildLint }, &misplaced_files); const fs::path debug_dir = package_dir / "debug"; - Files::non_recursive_find_matching_paths_in_dir(debug_dir, [](const fs::path& current) - { - return !fs::is_directory(current); - }, &misplaced_files); + Files::non_recursive_find_all_files_in_dir(debug_dir, &misplaced_files); if (!misplaced_files.empty()) { diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp index bb34915d7..86e7080e4 100644 --- a/toolsrc/src/vcpkg_Files.cpp +++ b/toolsrc/src/vcpkg_Files.cpp @@ -77,9 +77,9 @@ namespace vcpkg {namespace Files void recursive_find_all_files_in_dir(const fs::path& dir, std::vector<fs::path>* output) { recursive_find_matching_paths_in_dir(dir, [&](const fs::path& current) - { - return !fs::is_directory(current); - }, output); + { + return !fs::is_directory(current); + }, output); } std::vector<fs::path> recursive_find_all_files_in_dir(const fs::path& dir) @@ -92,9 +92,9 @@ namespace vcpkg {namespace Files void non_recursive_find_all_files_in_dir(const fs::path& dir, std::vector<fs::path>* output) { non_recursive_find_matching_paths_in_dir(dir, [&](const fs::path& current) - { - return !fs::is_directory(current); - }, output); + { + return !fs::is_directory(current); + }, output); } std::vector<fs::path> non_recursive_find_all_files_in_dir(const fs::path& dir) |