summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/file/posixdir.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2016-06-25 09:56:05 +1000
committer Vas Crabb <vas@vastheman.com>2016-06-25 09:56:05 +1000
commite363c5e154994dc647c7318cefa967f672663fb7 (patch)
treebe5ddcb8a3698b6a9ce2c57e7a7e79fe10786f4d /src/osd/modules/file/posixdir.cpp
parentca4485d760d18962f27f422341cb48431dc087a4 (diff)
Revert "This worked by pure luck (nw)"
This reverts commit b3491464e41b6afea81e188fe6a350d4f778854b.
Diffstat (limited to 'src/osd/modules/file/posixdir.cpp')
-rw-r--r--src/osd/modules/file/posixdir.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/osd/modules/file/posixdir.cpp b/src/osd/modules/file/posixdir.cpp
index a14c45aac0b..5b86a92444e 100644
--- a/src/osd/modules/file/posixdir.cpp
+++ b/src/osd/modules/file/posixdir.cpp
@@ -99,7 +99,7 @@ public:
virtual const entry *read() override;
- virtual bool opendir(std::string const &dirname) override;
+ bool open(std::string const &dirname);
private:
typedef std::unique_ptr<DIR, int (*)(DIR *)> dir_ptr;
@@ -183,10 +183,10 @@ const osd::directory::entry *posix_directory::read()
//============================================================
-// posix_directory::opendir
+// posix_directory::open
//============================================================
-bool posix_directory::opendir(std::string const &dirname)
+bool posix_directory::open(std::string const &dirname)
{
assert(!m_fd);
@@ -205,10 +205,10 @@ bool posix_directory::opendir(std::string const &dirname)
directory::ptr directory::open(std::string const &dirname)
{
ptr dir;
- try { dir = std::make_unique<posix_directory>(); }
+ try { dir.reset(new posix_directory); }
catch (...) { return nullptr; }
- if (!dir->opendir(dirname))
+ if (!dir->open(dirname))
return nullptr;
return dir;