summaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2022-06-28 12:56:19 +0100
committerJonathan Wakely <jwakely@redhat.com>2022-06-28 12:58:18 +0100
commitbb1f266a7d602ffee4a070f586351bdfafcb6150 (patch)
tree5cbebac533b8e31ae59a3342b8e34872771cb3b1 /libstdc++-v3
parent133d0d422ebd18dbd215cfa5394aff9f938e7060 (diff)
downloadgcc-bb1f266a7d602ffee4a070f586351bdfafcb6150.tar.gz
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.
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/src/filesystem/dir-common.h14
1 files 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.