diff options
Diffstat (limited to 'src/buildtool/file_system')
-rw-r--r-- | src/buildtool/file_system/file_root.hpp | 8 | ||||
-rw-r--r-- | src/buildtool/file_system/file_system_manager.hpp | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/buildtool/file_system/file_root.hpp b/src/buildtool/file_system/file_root.hpp index 6b1454ad..f9085f52 100644 --- a/src/buildtool/file_system/file_root.hpp +++ b/src/buildtool/file_system/file_root.hpp @@ -61,19 +61,19 @@ class FilteredIterator { FilteredIterator(I first, I last, predicate_t p) noexcept : iterator_{std::find_if(first, last, p)}, end_{std::move(last)}, - p{std::move(p)} {} + p_{std::move(p)} {} auto operator*() const noexcept -> reference { return iterator_->first; } auto operator++() noexcept -> FilteredIterator& { ++iterator_; - iterator_ = std::find_if(iterator_, end_, p); + iterator_ = std::find_if(iterator_, end_, p_); return *this; } [[nodiscard]] auto begin() noexcept -> FilteredIterator& { return *this; } [[nodiscard]] auto end() const noexcept -> FilteredIterator { - return FilteredIterator{end_, end_, p}; + return FilteredIterator{end_, end_, p_}; } [[nodiscard]] friend auto operator==(FilteredIterator const& x, @@ -91,7 +91,7 @@ class FilteredIterator { private: I iterator_{}; const I end_{}; - predicate_t p{}; + predicate_t p_{}; }; class FileRoot { diff --git a/src/buildtool/file_system/file_system_manager.hpp b/src/buildtool/file_system/file_system_manager.hpp index 529c4064..f7bcaee0 100644 --- a/src/buildtool/file_system/file_system_manager.hpp +++ b/src/buildtool/file_system/file_system_manager.hpp @@ -79,9 +79,9 @@ class FileSystemManager { auto operator=(DirectoryAnchor const&) -> DirectoryAnchor& = delete; auto operator=(DirectoryAnchor&&) -> DirectoryAnchor& = delete; ~DirectoryAnchor() noexcept { - if (not kRestorePath.empty()) { + if (not restore_path_.empty()) { try { - std::filesystem::current_path(kRestorePath); + std::filesystem::current_path(restore_path_); } catch (std::exception const& e) { Logger::Log(LogLevel::Error, e.what()); } @@ -89,14 +89,14 @@ class FileSystemManager { } [[nodiscard]] auto GetRestorePath() const noexcept -> std::filesystem::path const& { - return kRestorePath; + return restore_path_; } private: - std::filesystem::path const kRestorePath; + std::filesystem::path const restore_path_; DirectoryAnchor() - : kRestorePath{FileSystemManager::GetCurrentDirectory()} {} + : restore_path_{FileSystemManager::GetCurrentDirectory()} {} DirectoryAnchor(DirectoryAnchor&&) = default; }; |