From d58570d76b342a64bf0ce8a904c525e1f20a1cb8 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Thu, 21 Jan 2021 00:23:54 -0600 Subject: [PATCH] [ox/fs] Fix C++20 compatibility issues --- deps/ox/src/ox/fs/filesystem/passthroughfs.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp b/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp index b6b51f80..a8362034 100644 --- a/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp +++ b/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp @@ -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 * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -19,6 +19,7 @@ #ifdef OX_HAS_PASSTHROUGHFS +#include #include "filesystem.hpp" namespace ox { @@ -90,7 +91,7 @@ template Error PassThroughFS::ls(const char *dir, F cb) { for (auto &p : std::filesystem::directory_iterator(m_path / stripSlash(dir))) { auto u8p = p.path().filename().u8string(); - oxReturnError(cb(u8p.c_str(), 0)); + oxReturnError(cb(ox::bit_cast(u8p.c_str()), 0)); } return OxError(0); }