From 44d3317dd2d0fc63e196328c2e00f88ed223c3bc Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Thu, 8 Aug 2024 11:22:21 +0400 Subject: [PATCH] replacing conflicting namespace --- contrib/epee/include/file_io_utils.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/epee/include/file_io_utils.h b/contrib/epee/include/file_io_utils.h index 746b6420..b6fedbc1 100644 --- a/contrib/epee/include/file_io_utils.h +++ b/contrib/epee/include/file_io_utils.h @@ -38,10 +38,10 @@ #if __has_include() #include -namespace fs = std::filesystem; +namespace stdfs = std::filesystem; #elif __has_include() #include -namespace fs = std::experimental::filesystem; +namespace stdfs = std::experimental::filesystem; #else #error "Neither nor are available." #endif @@ -574,10 +574,10 @@ namespace file_io_utils try { - fs::directory_iterator end_itr; // default construction yields past-the-end - for ( fs::directory_iterator itr( epee::string_encoding::utf8_to_wstring(path) ); itr != end_itr; ++itr ) + stdfs::directory_iterator end_itr; // default construction yields past-the-end + for (stdfs::directory_iterator itr( epee::string_encoding::utf8_to_wstring(path) ); itr != end_itr; ++itr ) { - if ( only_files && fs::is_directory(itr->status()) ) + if ( only_files && stdfs::is_directory(itr->status()) ) { continue; }