From 7594ad94dfdf580a82fb07ddb346442160b3d91d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 5 May 2017 01:02:44 +0300 Subject: Add VirtFs namespace into all files in virtfs directory. --- src/fs/virtfs/virtfs.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/fs/virtfs/virtfs.cpp') diff --git a/src/fs/virtfs/virtfs.cpp b/src/fs/virtfs/virtfs.cpp index 732bd0ed3..301068233 100644 --- a/src/fs/virtfs/virtfs.cpp +++ b/src/fs/virtfs/virtfs.cpp @@ -39,11 +39,6 @@ const char *dirSeparator = nullptr; -namespace -{ - std::vector mEntries; -} // namespace - #ifdef UNITTESTS #define reportNonTests logger->log #else // UNITTESTS @@ -52,6 +47,11 @@ namespace namespace VirtFs { + namespace + { + std::vector mEntries; + } // namespace + void init(const std::string &restrict name) { updateDirSeparator(); @@ -353,7 +353,7 @@ namespace VirtFs return false; } logger->log("Add virtual directory: " + newDir); - addEntry(new VirtDirEntry(newDir, rootDir, VirtFsDir::getFuncs()), + addEntry(new DirEntry(newDir, rootDir, VirtFsDir::getFuncs()), append); return true; } @@ -408,7 +408,7 @@ namespace VirtFs if (entry->root == oldDir && entry->type == FsEntryType::Dir) { - VirtDirEntry *const dirEntry = static_cast( + DirEntry *const dirEntry = static_cast( entry); logger->log("Remove virtual directory: " + oldDir); mEntries.erase(it); @@ -563,7 +563,7 @@ namespace VirtFs { VirtFsEntry *const entry = *it; if (entry->type == FsEntryType::Dir) - delete static_cast(entry); + delete static_cast(entry); else if (entry->type == FsEntryType::Zip) delete static_cast(entry); else -- cgit v1.2.3-60-g2f50