public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-1325] libstdc++: Fix filesystem build for Windows Date: Tue, 28 Jun 2022 11:59:02 +0000 (GMT) [thread overview] Message-ID: <20220628115902.A692238312A4@sourceware.org> (raw) https://gcc.gnu.org/g:bb1f266a7d602ffee4a070f586351bdfafcb6150 commit r13-1325-gbb1f266a7d602ffee4a070f586351bdfafcb6150 Author: Jonathan Wakely <jwakely@redhat.com> Date: Tue Jun 28 12:56:19 2022 +0100 libstdc++: Fix filesystem build for Windows I only half remembered to use char_type instead of char for filesystem paths, so that it works with wchar_t on Windows. This fixes the bootstrap failure. libstdc++-v3/ChangeLog: * src/filesystem/dir-common.h (_Dir_base::_At_path): Use char_type consistently for paths. Diff: --- libstdc++-v3/src/filesystem/dir-common.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/src/filesystem/dir-common.h b/libstdc++-v3/src/filesystem/dir-common.h index 4844b1ac453..228fab55afb 100644 --- a/libstdc++-v3/src/filesystem/dir-common.h +++ b/libstdc++-v3/src/filesystem/dir-common.h @@ -99,18 +99,22 @@ struct _Dir_base struct _At_path { // No file descriptor given, so interpret the pathname relative to the CWD. - _At_path(const char* p) noexcept + _At_path(const posix::char_type* p) noexcept : pathname(p), dir_fd(fdcwd()), offset(0) { } - _At_path(int fd, const char* p, size_t offset) noexcept + _At_path(int fd, const posix::char_type* p, size_t offset) noexcept : pathname(p), dir_fd(fd), offset(offset) { } - const char* path() const noexcept { return pathname; } + const posix::char_type* + path() const noexcept { return pathname; } - int dir() const noexcept { return dir_fd; } - const char* path_at_dir() const noexcept { return pathname + offset; } + int + dir() const noexcept { return dir_fd; } + + const posix::char_type* + path_at_dir() const noexcept { return pathname + offset; } private: const posix::char_type* pathname; // Full path relative to CWD.
reply other threads:[~2022-06-28 11:59 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220628115902.A692238312A4@sourceware.org \ --to=redi@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).