From 4fc2b7acffb9699c3ef4fbe5027124e589735be0 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Wed, 10 Feb 2021 12:27:49 +0100 Subject: wanda: port to standard ranges --- src/wanda/filesystem.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/wanda') diff --git a/src/wanda/filesystem.cpp b/src/wanda/filesystem.cpp index d94894a..4da30b1 100644 --- a/src/wanda/filesystem.cpp +++ b/src/wanda/filesystem.cpp @@ -1,8 +1,7 @@ #include -#include - #include +#include namespace wanda { @@ -12,10 +11,13 @@ namespace wanda { return std::nullopt; } - - auto begin = std::filesystem::recursive_directory_iterator{source}; - auto end = std::filesystem::recursive_directory_iterator{}; - return ranges::make_iterator_range(begin, end) | ranges::view::filter(filter); + auto entries = std::filesystem::recursive_directory_iterator{source}; + auto result = path_list{}; + for (auto & entry : entries | std::views::filter(filter)) + { + result.push_back(entry.path()); + } + return result; } std::filesystem::path random_pick(path_list const & paths) -- cgit v1.2.3