diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-05-15 20:23:33 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-05-15 20:24:26 +0200 |
| commit | eb3cb526d17260ccb4cbe527d12083e91d03ac5b (patch) | |
| tree | d090ae74487a0cdc800adcda9b0f451e27c90891 | |
| parent | 7aaef445cee89e2b01f04cc72914e2cf527b73b0 (diff) | |
| download | manaserv-eb3cb526d17260ccb4cbe527d12083e91d03ac5b.tar.gz manaserv-eb3cb526d17260ccb4cbe527d12083e91d03ac5b.tar.bz2 manaserv-eb3cb526d17260ccb4cbe527d12083e91d03ac5b.tar.xz manaserv-eb3cb526d17260ccb4cbe527d12083e91d03ac5b.zip | |
Fixed compile with GCC 4.6
* Include cstddef to be able to use size_t
* Replace NULL with 0 since NULL doesn't happen to be defined
in any included header file
| -rw-r--r-- | src/game-server/autoattack.h | 1 | ||||
| -rw-r--r-- | src/game-server/thing.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/game-server/autoattack.h b/src/game-server/autoattack.h index 2ce5c71d..268f429c 100644 --- a/src/game-server/autoattack.h +++ b/src/game-server/autoattack.h @@ -21,6 +21,7 @@ #ifndef AUTOATTACK_H #define AUTOATTACK_H +#include <cstddef> #include <list> #include <limits> diff --git a/src/game-server/thing.h b/src/game-server/thing.h index a5e1bd8f..9409a0b2 100644 --- a/src/game-server/thing.h +++ b/src/game-server/thing.h @@ -37,7 +37,7 @@ class MapComposite; class Thing { public: - Thing(ThingType type, MapComposite *map = NULL) + Thing(ThingType type, MapComposite *map = 0) : mMap(map), mType(type) {} |