Changed: rollback fixes of Strict aliasing warnings

--HG-- branch : item_group
8 years ago · ae6b3e38a0
parent de949a60a9
commit ae6b3e38a0
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
@ -424,13 +424,17 @@ namespace INVENTORIES
 private:

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

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