drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[ox/fs] Fix C++20 compatibility issues

Browse Source
This commit is contained in:
Gary Talent 2021-01-21 00:23:54 -06:00
parent d7b82a6eed
commit d58570d76b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deps/ox/src/ox/fs/filesystem/passthroughfs.hpp vendored
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2015 - 2018 gtalent2@gmail.com * Copyright 2015 - 2021 gary@drinkingtea.net
* *
* This Source Code Form is subject to the terms of the Mozilla Public * This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
@ -19,6 +19,7 @@
#ifdef OX_HAS_PASSTHROUGHFS #ifdef OX_HAS_PASSTHROUGHFS
#include <ox/std/bit.hpp>
#include "filesystem.hpp" #include "filesystem.hpp"
namespace ox { namespace ox {
@ -90,7 +91,7 @@ template<typename F>
Error PassThroughFS::ls(const char *dir, F cb) { Error PassThroughFS::ls(const char *dir, F cb) {
for (auto &p : std::filesystem::directory_iterator(m_path / stripSlash(dir))) { for (auto &p : std::filesystem::directory_iterator(m_path / stripSlash(dir))) {
auto u8p = p.path().filename().u8string(); auto u8p = p.path().filename().u8string();
oxReturnError(cb(u8p.c_str(), 0)); oxReturnError(cb(ox::bit_cast<const char*>(u8p.c_str()), 0));
} }
return OxError(0); return OxError(0);
} }