civodul pushed a commit to tag 1.8
in repository guix.
commit eea0401d7a8ed1292f71d697e7a59c429aa18d5d
Author: Eelco Dolstra <[email protected]>
Date: Fri Aug 1 17:30:51 2014 +0200
Eliminate redundant copy
---
src/libutil/util.cc | 2 +-
src/libutil/util.hh | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index 7dc6fe7..595e724 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -216,7 +216,7 @@ DirEntries readDirectory(const Path & path)
checkInterrupt();
string name = dirent->d_name;
if (name == "." || name == "..") continue;
- entries.emplace_back(DirEntry({ name, dirent->d_ino, dirent->d_type
}));
+ entries.emplace_back(name, dirent->d_ino, dirent->d_type);
}
if (errno) throw SysError(format("reading directory `%1%'") % path);
diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index 42215eb..ade52c3 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -69,6 +69,8 @@ struct DirEntry
string name;
ino_t ino;
unsigned char type; // one of DT_*
+ DirEntry(const string & name, ino_t ino, unsigned char type)
+ : name(name), ino(ino), type(type) { }
};
typedef vector<DirEntry> DirEntries;