diff options
| author | Ira Rice <irarice@gmail.com> | 2008-09-25 00:15:44 +0000 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2008-09-25 00:15:44 +0000 |
| commit | 489a429bea6739dfa25503b9329bd9e33bffb856 (patch) | |
| tree | 8112f6fd988fdc0610329b6bc14ee3f9d5801092 /src/gui/shop.cpp | |
| parent | 2dc8eadff1e67bb70b1772ecc19c9e1e2e40a5b4 (diff) | |
| download | mana-489a429bea6739dfa25503b9329bd9e33bffb856.tar.gz mana-489a429bea6739dfa25503b9329bd9e33bffb856.tar.bz2 mana-489a429bea6739dfa25503b9329bd9e33bffb856.tar.xz mana-489a429bea6739dfa25503b9329bd9e33bffb856.zip | |
Merged the Tametomo branch into trunk.
Diffstat (limited to 'src/gui/shop.cpp')
| -rw-r--r-- | src/gui/shop.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp index 015e70d5..e7619547 100644 --- a/src/gui/shop.cpp +++ b/src/gui/shop.cpp @@ -25,8 +25,6 @@ #include "../utils/dtor.h" -#include <algorithm> - ShopItems::~ShopItems() { clear(); @@ -61,7 +59,7 @@ ShopItem* ShopItems::at(int i) const void ShopItems::clear() { - std::for_each(mShopItems.begin(), mShopItems.end(), make_dtor(mShopItems)); + delete_all(mShopItems); mShopItems.clear(); } |