diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-05-05 01:02:44 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-05-05 01:24:38 +0300 |
commit | 7594ad94dfdf580a82fb07ddb346442160b3d91d (patch) | |
tree | 9c9d0fc0b9ea0b7b1f4c550454ed0e3b458b7e2d /src/fs/virtfs/virtfs.cpp | |
parent | 78195f2492032637bfa9ce663ae7903dbf07f609 (diff) | |
download | manaplus-7594ad94dfdf580a82fb07ddb346442160b3d91d.tar.gz manaplus-7594ad94dfdf580a82fb07ddb346442160b3d91d.tar.bz2 manaplus-7594ad94dfdf580a82fb07ddb346442160b3d91d.tar.xz manaplus-7594ad94dfdf580a82fb07ddb346442160b3d91d.zip |
Add VirtFs namespace into all files in virtfs directory.
Diffstat (limited to 'src/fs/virtfs/virtfs.cpp')
-rw-r--r-- | src/fs/virtfs/virtfs.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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<VirtFsEntry*> mEntries; -} // namespace - #ifdef UNITTESTS #define reportNonTests logger->log #else // UNITTESTS @@ -52,6 +47,11 @@ namespace namespace VirtFs { + namespace + { + std::vector<VirtFsEntry*> 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<VirtDirEntry*>( + DirEntry *const dirEntry = static_cast<DirEntry*>( 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<VirtDirEntry*>(entry); + delete static_cast<DirEntry*>(entry); else if (entry->type == FsEntryType::Zip) delete static_cast<VirtZipEntry*>(entry); else |