summaryrefslogtreecommitdiff
path: root/src/fs/virtfs/fszip.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-07-14 01:31:22 +0300
committerAndrei Karas <akaras@inbox.ru>2017-07-14 01:31:22 +0300
commit311c175f3184103950c72bc5c775174597430b83 (patch)
treead022dc44a1c4177b3d53bf0d7eaa5a1736c8cf1 /src/fs/virtfs/fszip.cpp
parent16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff)
downloadmanaverse-311c175f3184103950c72bc5c775174597430b83.tar.gz
manaverse-311c175f3184103950c72bc5c775174597430b83.tar.bz2
manaverse-311c175f3184103950c72bc5c775174597430b83.tar.xz
manaverse-311c175f3184103950c72bc5c775174597430b83.zip
Replace std::vector into macro STD_VECTOR.
In most case it equal to std::vector except debug modes. Now it can be also mse::mstd::vector, but sadly this class not support all required features.
Diffstat (limited to 'src/fs/virtfs/fszip.cpp')
-rw-r--r--src/fs/virtfs/fszip.cpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/fs/virtfs/fszip.cpp b/src/fs/virtfs/fszip.cpp
index 830909778..148df66fc 100644
--- a/src/fs/virtfs/fszip.cpp
+++ b/src/fs/virtfs/fszip.cpp
@@ -102,7 +102,7 @@ namespace FsZip
filename = pathJoin(subDir, filename);
dirName = pathJoin(subDir, dirName);
}
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -112,7 +112,7 @@ namespace FsZip
return true;
}
}
- FOR_EACH (std::vector<std::string>::const_iterator,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator,
it2,
zipEntry->mDirs)
{
@@ -136,14 +136,14 @@ namespace FsZip
filename = pathJoin(subDir, filename);
dirName = pathJoin(subDir, dirName);
}
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
if ((*it2)->fileName == filename)
return true;
}
- FOR_EACH (std::vector<std::string>::const_iterator,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator,
it2,
zipEntry->mDirs)
{
@@ -163,7 +163,7 @@ namespace FsZip
dirName = pathJoin(subDir, dirName);
if (dirName == dirSeparator)
{
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -188,7 +188,7 @@ namespace FsZip
}
else
{
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -226,7 +226,7 @@ namespace FsZip
dirName = pathJoin(subDir, dirName);
if (dirName == dirSeparator)
{
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -250,7 +250,7 @@ namespace FsZip
std::string dirName2 = pathJoin(dirName, fileName);
if (findLast(dirName2, std::string(dirSeparator)) == false)
dirName2 += dirSeparator;
- FOR_EACH (std::vector<std::string>::const_iterator,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator,
it,
zipEntry->mDirs)
{
@@ -267,7 +267,7 @@ namespace FsZip
}
else
{
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -296,7 +296,7 @@ namespace FsZip
{
dirName2 += dirSeparator;
}
- FOR_EACH (std::vector<std::string>::const_iterator,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator,
it,
zipEntry->mDirs)
{
@@ -327,7 +327,7 @@ namespace FsZip
dirNameFull = dirName;
if (dirNameFull == dirSeparator)
{
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -351,7 +351,7 @@ namespace FsZip
std::string dirName2 = pathJoin(dirNameFull, fileName);
if (findLast(dirName2, std::string(dirSeparator)) == false)
dirName2 += dirSeparator;
- FOR_EACH (std::vector<std::string>::const_iterator,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator,
it,
zipEntry->mDirs)
{
@@ -368,7 +368,7 @@ namespace FsZip
}
else
{
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -397,7 +397,7 @@ namespace FsZip
{
dirName2 += dirSeparator;
}
- FOR_EACH (std::vector<std::string>::const_iterator,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator,
it,
zipEntry->mDirs)
{
@@ -425,7 +425,7 @@ namespace FsZip
dirName = pathJoin(subDir, dirName);
if (dirName == dirSeparator)
{
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -449,7 +449,7 @@ namespace FsZip
std::string dirName2 = pathJoin(dirName, fileName);
if (findLast(dirName2, std::string(dirSeparator)) == false)
dirName2 += dirSeparator;
- FOR_EACH (std::vector<std::string>::const_iterator,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator,
it,
zipEntry->mDirs)
{
@@ -466,7 +466,7 @@ namespace FsZip
}
else
{
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -495,7 +495,7 @@ namespace FsZip
{
dirName2 += dirSeparator;
}
- FOR_EACH (std::vector<std::string>::const_iterator,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator,
it,
zipEntry->mDirs)
{
@@ -521,7 +521,7 @@ namespace FsZip
std::string subDir = zipEntry->subDir;
if (!subDir.empty())
dirName = pathJoin(subDir, dirName);
- FOR_EACH (std::vector<std::string>::const_iterator,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator,
it2,
zipEntry->mDirs)
{
@@ -546,7 +546,7 @@ namespace FsZip
std::string subDir = zipEntry->subDir;
if (!subDir.empty())
filename = pathJoin(subDir, filename);
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -679,7 +679,7 @@ namespace FsZip
const std::string subDir = zipEntry->subDir;
if (!subDir.empty())
filename = pathJoin(subDir, filename);
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{