Changed: rollback fixes of Strict aliasing warnings

--HG-- branch : compatibility-develop
8 years ago · d33d0ffdc5
parent b40d52a5b1
commit d33d0ffdc5
1 changed files with 7 additions and 3 deletions
--- a/code/ryzom/common/src/game_share/inventories.h
+++ b/code/ryzom/common/src/game_share/inventories.h
@ -425,13 +425,17 @@ private:

 	struct COneProp
 	{
-		TItemPropId				ItemPropId;
+		union
+		{
+			TItemPropId				ItemPropId;
+			uint32					ItemPropIdUint32;
+		};
 		sint32					ItemPropValue;

 		void serial( NLMISC::CBitMemStream& bms )
 		{
-			bms.serial( (uint32&)ItemPropId, NbBitsForItemPropId );
-			bms.serial( (uint32&)ItemPropValue, CItemSlot::DataBitSize[ItemPropId] );
+			bms.serial((uint32&)ItemPropIdUint32, NbBitsForItemPropId);
+			bms.serial((uint32&)ItemPropValue, CItemSlot::DataBitSize[ItemPropId]);
 		}
 	};