From 311c175f3184103950c72bc5c775174597430b83 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 14 Jul 2017 01:31:22 +0300 Subject: 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. --- src/resources/item/complexitem.cpp | 2 +- src/resources/item/complexitem.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/resources/item') 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::iterator, it, mChildItems) + FOR_EACH (STD_VECTOR::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 &getChilds() const noexcept2 A_WARN_UNUSED + const STD_VECTOR &getChilds() const noexcept2 A_WARN_UNUSED { return mChildItems; } protected: - std::vector mChildItems; + STD_VECTOR mChildItems; }; #endif // RESOURCES_ITEM_COMPLEXITEM_H -- cgit v1.2.3-70-g09d2