public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-1325] libstdc++: Fix filesystem build for Windows
@ 2022-06-28 11:59 Jonathan Wakely
0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2022-06-28 11:59 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
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.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-28 11:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-28 11:59 [gcc r13-1325] libstdc++: Fix filesystem build for Windows Jonathan Wakely
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).