aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Mapper.cxx2
-rw-r--r--src/fs/AllocatedPath.hxx4
-rw-r--r--src/fs/Path.hxx4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Mapper.cxx b/src/Mapper.cxx
index 7189544e7..e6c7a248a 100644
--- a/src/Mapper.cxx
+++ b/src/Mapper.cxx
@@ -98,7 +98,7 @@ map_fs_to_utf8(Path _path_fs)
if (music_dir_fs.IsNull())
return std::string();
- path_fs = music_dir_fs.Relative(path_fs);
+ path_fs = music_dir_fs.Relative(_path_fs);
if (path_fs == nullptr || *path_fs == 0)
return std::string();
}
diff --git a/src/fs/AllocatedPath.hxx b/src/fs/AllocatedPath.hxx
index 58e12862d..e733c00a9 100644
--- a/src/fs/AllocatedPath.hxx
+++ b/src/fs/AllocatedPath.hxx
@@ -249,8 +249,8 @@ public:
* nullptr on mismatch.
*/
gcc_pure
- const char *Relative(const char *other_fs) const {
- return PathTraitsFS::Relative(c_str(), other_fs);
+ const_pointer Relative(Path other_fs) const {
+ return PathTraitsFS::Relative(c_str(), other_fs.c_str());
}
/**
diff --git a/src/fs/Path.hxx b/src/fs/Path.hxx
index ef663bf0b..56459723d 100644
--- a/src/fs/Path.hxx
+++ b/src/fs/Path.hxx
@@ -153,8 +153,8 @@ public:
* nullptr on mismatch.
*/
gcc_pure
- const_pointer Relative(const_pointer other_fs) const {
- return PathTraitsFS::Relative(value, other_fs);
+ const_pointer Relative(Path other_fs) const {
+ return PathTraitsFS::Relative(c_str(), other_fs.c_str());
}
gcc_pure