Skip to content

windows: open files via std::filesystem::path so libc++ accepts wide paths #1084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jean-Michaël Celerier (jcelerier) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

windows: open files via std::filesystem::path so libc++ accepts wide paths #1084

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion base/file_sys.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include <string>
#include <fstream>
#include <filesystem>


namespace ort_extensions {
Expand Down Expand Up @@ -51,7 +52,12 @@ class path {
std::ifstream open(ios_base::openmode mode = ios_base::in) const {
// if Windows, need to convert the string to UTF-16
#ifdef _WIN32
return std::ifstream(w_path_, mode);
// libc++ (the Windows clang toolchain) provides no std::ifstream ctor
// taking a std::wstring -- that overload is an MSVC-STL extension. Route
// the wide path through std::filesystem::path, whose basic_ifstream ctor
// overload is standard C++17 and is honoured by libc++/libstdc++/MSVC STL
// alike, while still preserving the UTF-16 path. (microsoft/onnxruntime-extensions#1071)
return std::ifstream(std::filesystem::path(w_path_), mode);
#else
return std::ifstream(path_, mode);
#endif // _WIN32
Expand Down