diff options
| author | Max Horn | 2006-11-26 22:39:34 +0000 |
|---|---|---|
| committer | Max Horn | 2006-11-26 22:39:34 +0000 |
| commit | 5c8de9b3b0411f6f7b84a4209279a42f69fe19ac (patch) | |
| tree | 9416f00510be83e925580d0819b7e3a1d8b55f8e | |
| parent | 360da37d2e888a7672ace778e9d7c740d154d4ab (diff) | |
| download | scummvm-rg350-5c8de9b3b0411f6f7b84a4209279a42f69fe19ac.tar.gz scummvm-rg350-5c8de9b3b0411f6f7b84a4209279a42f69fe19ac.tar.bz2 scummvm-rg350-5c8de9b3b0411f6f7b84a4209279a42f69fe19ac.zip | |
Replaced #ifdef hack in the HashMap code by a much nicer and cleaner 'friend class' statement (a similar change might be possible in class List)
svn-id: r24791
| -rw-r--r-- | common/hashmap.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/common/hashmap.h b/common/hashmap.h index 1493b9ff3d..606230d9f4 100644 --- a/common/hashmap.h +++ b/common/hashmap.h @@ -83,12 +83,8 @@ uint nextTableSize(uint x); */ template <class Key, class Val, class HashFunc = Hash<Key>, class EqualFunc = EqualTo<Key> > class HashMap { + friend class const_iterator; private: -#if defined (_WIN32_WCE) || defined (_MSC_VER) || defined (__SYMBIAN32__) || defined (PALMOS_MODE) || defined (__MINT__) -//FIXME evc4, msvc6,msvc7 & GCC 2.9x doesn't like it as private member -public: -#endif - struct Node { Key _key; Val _value; @@ -114,8 +110,8 @@ public: typedef const HashMap<Key, Val, HashFunc, EqualFunc> * hashmap_t; friend class HashMap<Key, Val, HashFunc, EqualFunc>; protected: - hashmap_t _hashmap; uint _idx; + hashmap_t _hashmap; const_iterator(uint idx, hashmap_t hashmap) : _idx(idx), _hashmap(hashmap) {} const Node *deref() const { |