From db20e29af6a3fc31f783c4584739ca1592beaabb Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 23 Feb 2014 22:02:02 +0100 Subject: Directory: pass std::string&& to constructor --- src/db/Directory.cxx | 4 ++-- src/db/Directory.hxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/db/Directory.cxx b/src/db/Directory.cxx index 9c7c83314..04bdfa88f 100644 --- a/src/db/Directory.cxx +++ b/src/db/Directory.cxx @@ -41,10 +41,10 @@ extern "C" { #include #include -Directory::Directory(const char *_path_utf8, Directory *_parent) +Directory::Directory(std::string &&_path_utf8, Directory *_parent) :parent(_parent), mtime(0), have_stat(false), - path(_path_utf8) + path(std::move(_path_utf8)) { INIT_LIST_HEAD(&children); INIT_LIST_HEAD(&songs); diff --git a/src/db/Directory.hxx b/src/db/Directory.hxx index ebca95935..391ca2db4 100644 --- a/src/db/Directory.hxx +++ b/src/db/Directory.hxx @@ -85,7 +85,7 @@ struct Directory { std::string path; public: - Directory(const char *_path_utf8, Directory *_parent); + Directory(std::string &&_path_utf8, Directory *_parent); ~Directory(); /** @@ -93,7 +93,7 @@ public: */ gcc_malloc static Directory *NewRoot() { - return new Directory("", nullptr); + return new Directory(std::string(), nullptr); } /** -- cgit v1.2.3