diff options
| author | Le Philousophe | 2019-06-30 16:52:22 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2019-06-30 21:43:58 +0300 |
| commit | 3a7219fa57c671822e4b61ddc3217b9acbeae848 (patch) | |
| tree | 982241cae3b5fc7cf87fa992ba478fc451c7185d /common | |
| parent | f6cf78430b258ad7bcfbf5e6cbbc02d1b38994fa (diff) | |
| download | scummvm-rg350-3a7219fa57c671822e4b61ddc3217b9acbeae848.tar.gz scummvm-rg350-3a7219fa57c671822e4b61ddc3217b9acbeae848.tar.bz2 scummvm-rg350-3a7219fa57c671822e4b61ddc3217b9acbeae848.zip | |
JANITORIAL: Avoid C4121 warnings in MSVC by reordering fields
C4121 is about 'symbol': alignment of a member was sensitive to packing
Diffstat (limited to 'common')
| -rw-r--r-- | common/hashmap.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/hashmap.h b/common/hashmap.h index 7913d8fc8b..00218417a0 100644 --- a/common/hashmap.h +++ b/common/hashmap.h @@ -88,8 +88,8 @@ private: typedef HashMap<Key, Val, HashFunc, EqualFunc> HM_t; struct Node { - const Key _key; Val _value; + const Key _key; explicit Node(const Key &key) : _key(key), _value() {} Node() : _key(), _value() {} }; @@ -113,6 +113,9 @@ private: ObjectPool<Node, HASHMAP_MEMORYPOOL_SIZE> _nodePool; #endif + /** Default value, returned by the const getVal. */ + const Val _defaultVal; + Node **_storage; ///< hashtable of size arrsize. size_type _mask; ///< Capacity of the HashMap minus one; must be a power of two of minus one size_type _size; @@ -121,9 +124,6 @@ private: HashFunc _hash; EqualFunc _equal; - /** Default value, returned by the const getVal. */ - const Val _defaultVal; - /** Dummy node, used as marker for erased objects. */ #define HASHMAP_DUMMY_NODE ((Node *)1) |