summaryrefslogtreecommitdiff
path: root/src/resources/atlas/atlasresource.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/resources/atlas/atlasresource.cpp
parent16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff)
downloadplus-311c175f3184103950c72bc5c775174597430b83.tar.gz
plus-311c175f3184103950c72bc5c775174597430b83.tar.bz2
plus-311c175f3184103950c72bc5c775174597430b83.tar.xz
plus-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/resources/atlas/atlasresource.cpp')
-rw-r--r--src/resources/atlas/atlasresource.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/atlas/atlasresource.cpp b/src/resources/atlas/atlasresource.cpp
index 51a807975..b97823ebb 100644
--- a/src/resources/atlas/atlasresource.cpp
+++ b/src/resources/atlas/atlasresource.cpp
@@ -31,12 +31,12 @@
AtlasResource::~AtlasResource()
{
- FOR_EACH (std::vector<TextureAtlas*>::iterator, it, atlases)
+ FOR_EACH (STD_VECTOR<TextureAtlas*>::iterator, it, atlases)
{
TextureAtlas *const atlas = *it;
if (atlas != nullptr)
{
- FOR_EACH (std::vector<AtlasItem*>::iterator, it2, atlas->items)
+ FOR_EACH (STD_VECTOR<AtlasItem*>::iterator, it2, atlas->items)
{
AtlasItem *const item = *it2;
if (item != nullptr)
@@ -80,7 +80,7 @@ int AtlasResource::calcMemoryLocal() const
int AtlasResource::calcMemoryChilds(const int level) const
{
int sz = 0;
- FOR_EACH (std::vector<TextureAtlas*>::const_iterator, it, atlases)
+ FOR_EACH (STD_VECTOR<TextureAtlas*>::const_iterator, it, atlases)
{
TextureAtlas *const atlas = *it;
sz += atlas->calcMemory(level + 1);