thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

JANITORIAL: Avoid C4121 warnings in MSVC by reordering fields

Browse source 
C4121 is about 'symbol': alignment of a member was sensitive to packing
This commit is contained in:
Le Philousophe 2019-06-30 16:52:22 +02:00 • committed by Filippos Karapetis
parent f6cf78430b
commit 3a7219fa57
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/hashmap.h
View file

@ -88,8 +88,8 @@ private:
typedef HashMap<Key, Val, HashFunc, EqualFunc> HM_t; typedef HashMap<Key, Val, HashFunc, EqualFunc> HM_t;
struct Node { struct Node {
const Key _key;
Val _value; Val _value;
const Key _key;
explicit Node(const Key &key) : _key(key), _value() {} explicit Node(const Key &key) : _key(key), _value() {}
Node() : _key(), _value() {} Node() : _key(), _value() {}
}; };
@ -113,6 +113,9 @@ private:
ObjectPool<Node, HASHMAP_MEMORYPOOL_SIZE> _nodePool; ObjectPool<Node, HASHMAP_MEMORYPOOL_SIZE> _nodePool;
#endif #endif
/** Default value, returned by the const getVal. */
const Val _defaultVal;
Node **_storage; ///< hashtable of size arrsize. 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 _mask; ///< Capacity of the HashMap minus one; must be a power of two of minus one
size_type _size; size_type _size;
@ -121,9 +124,6 @@ private:
HashFunc _hash; HashFunc _hash;
EqualFunc _equal; EqualFunc _equal;
/** Default value, returned by the const getVal. */
const Val _defaultVal;
/** Dummy node, used as marker for erased objects. */ /** Dummy node, used as marker for erased objects. */
#define HASHMAP_DUMMY_NODE ((Node *)1) #define HASHMAP_DUMMY_NODE ((Node *)1)

8
graphics/VectorRenderer.h
View file

@ -43,6 +43,10 @@ typedef void (VectorRenderer::*DrawingFunctionCallback)(const Common::Rect &, co
struct DrawStep { struct DrawStep {
DrawingFunctionCallback drawingCall; /**< Pointer to drawing function */
Graphics::Surface* blitSrc;
Graphics::TransparentSurface* blitAlphaSrc;
struct Color { struct Color {
uint8 r, g, b; uint8 r, g, b;
bool set; bool set;
@ -81,10 +85,6 @@ struct DrawStep {
uint32 scale; /**< scale of all the coordinates in FIXED POINT with 16 bits mantissa */ uint32 scale; /**< scale of all the coordinates in FIXED POINT with 16 bits mantissa */
GUI::ThemeEngine::AutoScaleMode autoscale; /**< scale alphaimage if present */ GUI::ThemeEngine::AutoScaleMode autoscale; /**< scale alphaimage if present */
DrawingFunctionCallback drawingCall; /**< Pointer to drawing function */
Graphics::Surface *blitSrc;
Graphics::TransparentSurface *blitAlphaSrc;
}; };
VectorRenderer *createRenderer(int mode); VectorRenderer *createRenderer(int mode);