summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2016-06-25 10:46:55 +1000
committer Vas Crabb <vas@vastheman.com>2016-06-25 10:46:55 +1000
commit9fccecfcf393e8d23e307e3a1a1fc590829b2136 (patch)
treeed32fca2a53c9638eb586921b5da9a4b249aef01
parent52e65cb56786c645898589fd84c7fe0926b108b8 (diff)
Fine, be that way GCC (nw)
-rw-r--r--src/osd/modules/file/posixdir.cpp8
-rw-r--r--src/osd/modules/file/windir.cpp8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/osd/modules/file/posixdir.cpp b/src/osd/modules/file/posixdir.cpp
index f5db69c0132..161ea62c404 100644
--- a/src/osd/modules/file/posixdir.cpp
+++ b/src/osd/modules/file/posixdir.cpp
@@ -96,7 +96,7 @@ public:
virtual const entry *read() override;
- bool open(std::string const &dirname);
+ bool open_impl(std::string const &dirname);
private:
typedef std::unique_ptr<DIR, int (*)(DIR *)> dir_ptr;
@@ -180,10 +180,10 @@ const osd::directory::entry *posix_directory::read()
//============================================================
-// posix_directory::open
+// posix_directory::open_impl
//============================================================
-bool posix_directory::open(std::string const &dirname)
+bool posix_directory::open_impl(std::string const &dirname)
{
assert(!m_fd);
@@ -205,7 +205,7 @@ directory::ptr directory::open(std::string const &dirname)
try { dir.reset(new posix_directory); }
catch (...) { return nullptr; }
- if (!dir->open(dirname))
+ if (!dir->open_impl(dirname))
return nullptr;
return ptr(std::move(dir));
diff --git a/src/osd/modules/file/windir.cpp b/src/osd/modules/file/windir.cpp
index 88f296689e7..8b5f05e9847 100644
--- a/src/osd/modules/file/windir.cpp
+++ b/src/osd/modules/file/windir.cpp
@@ -40,7 +40,7 @@ public:
virtual const entry *read() override;
- bool open(std::string const &dirname);
+ bool open_impl(std::string const &dirname);
private:
HANDLE m_find; // handle to the finder
@@ -106,10 +106,10 @@ const directory::entry *win_directory::read()
//============================================================
-// win_directory::open
+// win_directory::open_impl
//============================================================
-bool win_directory::open(std::string const &dirname)
+bool win_directory::open_impl(std::string const &dirname)
{
assert(m_find == INVALID_HANDLE_VALUE);
@@ -144,7 +144,7 @@ directory::ptr directory::open(std::string const &dirname)
try { dir.reset(new win_directory()); }
catch (...) { return nullptr; }
- if (!dir->open(dirname))
+ if (!dir->open_impl(dirname))
return false;
return ptr(std::move(dir));