diff options
| author | Max Lingua | 2009-03-07 05:01:56 +0000 |
|---|---|---|
| committer | Max Lingua | 2009-03-07 05:01:56 +0000 |
| commit | ccf9dedecbfa82767137620483242ee6257d0b93 (patch) | |
| tree | 2805f7db03adb07531c8fedd471af2aebaa564c3 | |
| parent | f1dd168aae21d3139d47f3e121e1b09731a42f36 (diff) | |
| download | scummvm-rg350-ccf9dedecbfa82767137620483242ee6257d0b93.tar.gz scummvm-rg350-ccf9dedecbfa82767137620483242ee6257d0b93.tar.bz2 scummvm-rg350-ccf9dedecbfa82767137620483242ee6257d0b93.zip | |
Modified HashMap ctr to skip _defaultVal() on PS2 to avoid gcc 3.2.2 ICE
svn-id: r39174
| -rw-r--r-- | common/hashmap.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/common/hashmap.h b/common/hashmap.h index bc04c0dbb4..e840267796 100644 --- a/common/hashmap.h +++ b/common/hashmap.h @@ -262,8 +262,15 @@ public: * Base constructor, creates an empty hashmap. */ template<class Key, class Val, class HashFunc, class EqualFunc> -HashMap<Key, Val, HashFunc, EqualFunc>::HashMap() : - _defaultVal() { +HashMap<Key, Val, HashFunc, EqualFunc>::HashMap() +// +// We have to skip _defaultVal() on PS2 to avoid gcc 3.2.2 ICE +// +#ifdef __PLAYSTATION2__ + { +#else + : _defaultVal() { +#endif _mask = HASHMAP_MIN_CAPACITY - 1; _storage = new Node *[HASHMAP_MIN_CAPACITY]; assert(_storage != NULL); |