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

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

6
libretroshare/src/retroshare/rstypes.h
View file

@ -278,6 +278,9 @@ struct DirStub : RsSerializable
RS_SERIAL_PROCESS(type);
RS_SERIAL_PROCESS(name);
#if defined(__GNUC__) && !defined(__clang__)
# pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif // defined(__GNUC__) && !defined(__clang__)
// (Cyril) We have to do this because on some systems (MacOS) uintptr_t is unsigned long which is not well defined. It is always
// preferable to force type serialization to the correct size rather than letting the compiler choose for us.
// /!\ This structure cannot be sent over the network. The serialization would be inconsistent.
@ -295,6 +298,9 @@ struct DirStub : RsSerializable
else
std::cerr << __PRETTY_FUNCTION__ << ": cannot serialize raw pointer of size " << sizeof(ref) << std::endl;
#if defined(__GNUC__) && !defined(__clang__)
# pragma GCC diagnostic pop
#endif // defined(__GNUC__) && !defined(__clang__)
}
};