diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-12-08 21:13:38 +0100 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-12-08 21:22:43 +0100 |
commit | ddc93c461070fb3d868fbb5426e8361d1b93ee38 (patch) | |
tree | 250eacd391542d36a51c4d3aa398d4f6346619fb /src/resources/itemdb.cpp | |
parent | d129ce9776a6fd0e165b676a3addd14186c5d85d (diff) | |
download | mana-ddc93c461070fb3d868fbb5426e8361d1b93ee38.tar.gz mana-ddc93c461070fb3d868fbb5426e8361d1b93ee38.tar.bz2 mana-ddc93c461070fb3d868fbb5426e8361d1b93ee38.tar.xz mana-ddc93c461070fb3d868fbb5426e8361d1b93ee38.zip |
Introduced another template to make deleting all values in a container easier.
Inspired by qDeleteAll() from Qt.
Conflicts:
ChangeLog
src/beingmanager.cpp
src/channelmanager.cpp
src/gui/skill.cpp
src/map.cpp
src/resources/monsterinfo.cpp
(cherry picked from mainline)
Diffstat (limited to 'src/resources/itemdb.cpp')
-rw-r--r-- | src/resources/itemdb.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index e6f2fd1f..c05d4604 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -19,7 +19,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <algorithm> #include <cassert> #include <libxml/tree.h> @@ -144,7 +143,7 @@ void ItemDB::unload() delete mUnknown; mUnknown = NULL; - for_each(mItemInfos.begin(), mItemInfos.end(), make_dtor(mItemInfos)); + delete_all(mItemInfos); mItemInfos.clear(); mLoaded = false; } |