diff options
| author | Johannes Schickel | 2011-07-03 00:15:30 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-07-03 00:16:07 +0200 |
| commit | 7e4224e52a2202ba98dd93ffe209d231e5c1d35c (patch) | |
| tree | f026976cddcd30f74475e3f5d47c92d5804eefa3 /common | |
| parent | 0b1cb0ebbb9a3779f8e3d1fb0d3a44252394fe0c (diff) | |
| download | scummvm-rg350-7e4224e52a2202ba98dd93ffe209d231e5c1d35c.tar.gz scummvm-rg350-7e4224e52a2202ba98dd93ffe209d231e5c1d35c.tar.bz2 scummvm-rg350-7e4224e52a2202ba98dd93ffe209d231e5c1d35c.zip | |
COMMON: Fix compilation when USE_HASHMAP_MEMORY_POOL is not defined.
Diffstat (limited to 'common')
| -rw-r--r-- | common/debug.cpp | 1 | ||||
| -rw-r--r-- | common/hashmap.h | 11 | ||||
| -rw-r--r-- | common/xmlparser.h | 1 |
3 files changed, 12 insertions, 1 deletions
diff --git a/common/debug.cpp b/common/debug.cpp index 50f99753db..9c3a93e5a6 100644 --- a/common/debug.cpp +++ b/common/debug.cpp @@ -23,6 +23,7 @@ #include "common/debug-channels.h" #include "common/system.h" #include "common/textconsole.h" +#include "common/algorithm.h" #include <stdarg.h> // For va_list etc. diff --git a/common/hashmap.h b/common/hashmap.h index f2a4d843b8..347ac1fd25 100644 --- a/common/hashmap.h +++ b/common/hashmap.h @@ -106,8 +106,9 @@ private: HASHMAP_MEMORYPOOL_SIZE = HASHMAP_MIN_CAPACITY * HASHMAP_LOADFACTOR_NUMERATOR / HASHMAP_LOADFACTOR_DENOMINATOR }; - +#ifdef USE_HASHMAP_MEMORY_POOL ObjectPool<Node, HASHMAP_MEMORYPOOL_SIZE> _nodePool; +#endif Node **_storage; ///< hashtable of size arrsize. uint _mask; ///< Capacity of the HashMap minus one; must be a power of two of minus one @@ -128,12 +129,20 @@ private: #endif Node *allocNode(const Key &key) { +#ifdef USE_HASHMAP_MEMORY_POOL return new (_nodePool) Node(key); +#else + return new Node(key); +#endif } void freeNode(Node *node) { if (node && node != HASHMAP_DUMMY_NODE) +#ifdef USE_HASHMAP_MEMORY_POOL _nodePool.deleteChunk(node); +#else + delete node; +#endif } void assign(const HM_t &map); diff --git a/common/xmlparser.h b/common/xmlparser.h index 40c779b87e..d75dc0e4a9 100644 --- a/common/xmlparser.h +++ b/common/xmlparser.h @@ -31,6 +31,7 @@ #include "common/hashmap.h" #include "common/hash-str.h" #include "common/stack.h" +#include "common/memorypool.h" namespace Common { |