Skip to content

Workaround build error with clang/libc++ in agi::fs::path #366

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

Draft
driver1998 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Workaround build error with clang/libc++ in agi::fs::path #366

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions libaegisub/common/io.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ using namespace agi::fs;
std::unique_ptr<std::istream> Open(path const& file, bool binary) {
LOG_D("agi/io/open/file") << file;

auto stream = std::make_unique<std::ifstream>(file, (binary ? std::ios::binary : std::ios::in));
auto stream = std::make_unique<std::ifstream>(file.string(), (binary ? std::ios::binary : std::ios::in));
if (stream->fail()) {
acs::CheckFileRead(file);
throw IOFatal("Unknown fatal error occurred opening " + file.string());
Expand All @@ -42,7 +42,7 @@ Save::Save(path const& file, bool binary)
{
LOG_D("agi/io/save/file") << file;

fp = std::make_unique<std::ofstream>(tmp_name, binary ? std::ios::binary : std::ios::out);
fp = std::make_unique<std::ofstream>(tmp_name.string(), binary ? std::ios::binary : std::ios::out);
if (!fp->good()) {
acs::CheckDirWrite(file.parent_path());
acs::CheckFileWrite(file);
Expand Down
2 changes: 1 addition & 1 deletion libaegisub/common/log.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Message::~Message() {
}

JsonEmitter::JsonEmitter(agi::fs::path const& directory)
: fp(new std::ofstream(directory/util::strftime("%Y-%m-%d-%H-%M-%S.json")))
: fp(new std::ofstream((directory/util::strftime("%Y-%m-%d-%H-%M-%S.json")).string()))
{
}

Expand Down
2 changes: 1 addition & 1 deletion src/crash_writer_minidump.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ void Write() {
}

void Write(std::string const& error) {
std::ofstream file(crashlog_path, std::ios::app);
std::ofstream file(crashlog_path.string(), std::ios::app);
if (file.is_open()) {
file << agi::util::strftime("--- %y-%m-%d %H:%M:%S ------------------\n");
agi::format(file, "VER - %s\n", GetAegisubLongVersionString());
Expand Down