diff options
| author | oy <Tom_Adams@web.de> | 2010-07-17 14:10:43 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2010-07-17 14:10:43 +0200 |
| commit | 6193f354232b3cc9a7272c3b17cfc52b6415c9b8 (patch) | |
| tree | 1b1b8bd1698240391ad89923edf33899a1046237 /src/base | |
| parent | 052820dc888a0912fd2ff413389bc24b1cfbf08d (diff) | |
| parent | a8acf8c6ff3af78369a0194b7f3ee34b5ab9df5c (diff) | |
| download | zcatch-6193f354232b3cc9a7272c3b17cfc52b6415c9b8.tar.gz zcatch-6193f354232b3cc9a7272c3b17cfc52b6415c9b8.zip | |
Merge branch 'master' of http://github.com/matricks/teeworlds
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/tl/array.h | 2 | ||||
| -rw-r--r-- | src/base/vmath.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/base/tl/array.h b/src/base/tl/array.h index 580f4682..14c83295 100644 --- a/src/base/tl/array.h +++ b/src/base/tl/array.h @@ -283,7 +283,7 @@ public: */ int memusage() { - return sizeof(array) + sizeof(T)*size; + return sizeof(array) + sizeof(T)*list_size; } /* diff --git a/src/base/vmath.h b/src/base/vmath.h index 49dd26d1..2be3e6eb 100644 --- a/src/base/vmath.h +++ b/src/base/vmath.h @@ -2,6 +2,8 @@ #ifndef BASE_VMATH_H #define BASE_VMATH_H +#include <math.h> + // ------------------------------------ template<typename T> |