diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
| commit | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch) | |
| tree | c084bdf8afabc6220779645dcb5dbf71af6a151f /src/particlecontainer.h | |
| parent | bc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff) | |
| download | manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2 manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip | |
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/particlecontainer.h')
| -rw-r--r-- | src/particlecontainer.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/particlecontainer.h b/src/particlecontainer.h index 27b52f592..75cda83fc 100644 --- a/src/particlecontainer.h +++ b/src/particlecontainer.h @@ -26,6 +26,8 @@ #include <list> #include <vector> +#include "localconsts.h" + class Particle; /** @@ -42,7 +44,7 @@ public: * * delParent means that the destructor should also free the parent. */ - ParticleContainer(ParticleContainer *parent = NULL, bool delParent = true); + ParticleContainer(ParticleContainer *parent = nullptr, bool delParent = true); virtual ~ParticleContainer(); /** @@ -71,7 +73,7 @@ protected: class ParticleList : public ParticleContainer { public: - ParticleList(ParticleContainer *parent = NULL, bool delParent = true); + ParticleList(ParticleContainer *parent = nullptr, bool delParent = true); virtual ~ParticleList(); /** @@ -98,7 +100,7 @@ protected: class ParticleVector : public ParticleContainer { public: - ParticleVector(ParticleContainer *parent = NULL, bool delParent = true); + ParticleVector(ParticleContainer *parent = nullptr, bool delParent = true); virtual ~ParticleVector(); /** |