Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

replacing conflicting namespace

Browse source
This commit is contained in:
cryptozoidberg 2024-08-08 11:22:21 +04:00
parent f48811ff44
commit 44d3317dd2
No known key found for this signature in database
GPG key ID: 2E10CC61CAC8F36D
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
contrib/epee/include/file_io_utils.h
View file

@ -38,10 +38,10 @@
#if __has_include(<filesystem>)
#include <filesystem>
namespace fs = std::filesystem;
namespace stdfs = std::filesystem;
#elif __has_include(<experimental/filesystem>)
#include <experimental/filesystem>
namespace fs = std::experimental::filesystem;
namespace stdfs = std::experimental::filesystem;
#else
#error "Neither <filesystem> nor <experimental/filesystem> 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;
}