Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-12 02:55:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed test for unsigned long in serialization, and added back pragma to avoid strict aliasing error in rstypes.h

Browse source
This commit is contained in:
csoler 2019-01-25 14:23:08 +01:00
parent 3836ed836b
commit ad45a7781c
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libretroshare/src/serialiser/rstypeserializer.h
View file

@ -131,8 +131,7 @@ struct RsTypeSerializer
/// Generic types
template<typename T>
typename std::enable_if<std::is_same<RsTlvItem,T>::value
|| !(std::is_base_of<RsSerializable,T>::value || std::is_enum<T>::value || std::is_base_of<RsTlvItem,T>::value || std::is_same<unsigned long,T>::value)>::type
typename std::enable_if<std::is_same<RsTlvItem,T>::value || !(std::is_base_of<RsSerializable,T>::value || std::is_enum<T>::value || std::is_base_of<RsTlvItem,T>::value )>::type
static /*void*/ serial_process( RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx,
T& member, const std::string& member_name )