summaryrefslogtreecommitdiff
path: root/src/resources/item
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/item
parent16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff)
downloadmanaplus-311c175f3184103950c72bc5c775174597430b83.tar.gz
manaplus-311c175f3184103950c72bc5c775174597430b83.tar.bz2
manaplus-311c175f3184103950c72bc5c775174597430b83.tar.xz
manaplus-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/item')
-rw-r--r--src/resources/item/complexitem.cpp2
-rw-r--r--src/resources/item/complexitem.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/item/complexitem.cpp b/src/resources/item/complexitem.cpp
index b9de8dbe1..1fd703f8c 100644
--- a/src/resources/item/complexitem.cpp
+++ b/src/resources/item/complexitem.cpp
@@ -62,7 +62,7 @@ void ComplexItem::addChild(const Item *const item,
return;
increaseQuantity(amount);
Item *child = nullptr;
- FOR_EACH (std::vector<Item*>::iterator, it, mChildItems)
+ FOR_EACH (STD_VECTOR<Item*>::iterator, it, mChildItems)
{
Item *const item1 = *it;
if (item1->getId() == item->getId() &&
diff --git a/src/resources/item/complexitem.h b/src/resources/item/complexitem.h
index 6103f23b6..aa41fb3fd 100644
--- a/src/resources/item/complexitem.h
+++ b/src/resources/item/complexitem.h
@@ -55,11 +55,11 @@ class ComplexItem final : public Item
void addChild(const Item *const item,
const int amount);
- const std::vector<Item*> &getChilds() const noexcept2 A_WARN_UNUSED
+ const STD_VECTOR<Item*> &getChilds() const noexcept2 A_WARN_UNUSED
{ return mChildItems; }
protected:
- std::vector<Item*> mChildItems;
+ STD_VECTOR<Item*> mChildItems;
};
#endif // RESOURCES_ITEM_COMPLEXITEM_H