fix: Wrong usage of sizeof(this) in BitFlags::xfer(), W3DMPO::glueEnforcer() (#1947)

Author: bobtista

Core/Libraries/Source/WWVegas/WWLib/always.h

@@ -144,7 +144,7 @@ private: \
 		return The##ARGCLASS##Pool; \
 	} \
 protected: \
-	virtual int glueEnforcer() const { return sizeof(this); } \
+	virtual void glueEnforcer() const { } \
 public: \
 	inline void* operator new(size_t s) { return allocateFromW3DMemPool(getClassMemoryPool(), s); } \
 	inline void operator delete(void *p) { freeFromW3DMemPool(getClassMemoryPool(), p); } \
@@ -162,7 +162,7 @@ class W3DMPO
 	}
 protected:
 	// we never call this; it is present to cause compile errors in descendent classes
-	virtual int glueEnforcer() const = 0;
+	virtual void glueEnforcer() const = 0;
 public:
 	virtual ~W3DMPO() { /* nothing */ }
 };

Generals/Code/GameEngine/Include/Common/BitFlagsIO.h

@@ -214,7 +214,11 @@ void BitFlags<NUMBITS>::xfer(Xfer* xfer)
 	{
 
 		// just call the xfer implementation on the data values
+#if RETAIL_COMPATIBLE_CRC
 		xfer->xferUser( this, sizeof( this ) );
+#else
+		xfer->xferUser( this, sizeof( *this ) );
+#endif
 
 	}
 	else

GeneralsMD/Code/GameEngine/Include/Common/BitFlagsIO.h

@@ -214,7 +214,11 @@ void BitFlags<NUMBITS>::xfer(Xfer* xfer)
 	{
 
 		// just call the xfer implementation on the data values
+#if RETAIL_COMPATIBLE_CRC
 		xfer->xferUser( this, sizeof( this ) );
+#else
+		xfer->xferUser( this, sizeof( *this ) );
+#endif
 
 	}
 	else