3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-28 16:15:23 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1300 from moteus/master

Browse Source 
Fix. Use C++03 compatible way to align struct. (Build on MSVC)
This commit is contained in:
Pieter Hintjens 2015-01-13 17:07:19 +01:00
commit b6b990f5f9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/command.hpp
View File

@ -59,7 +59,8 @@ namespace zmq
done
} type;
union {
union args_t
{
// Sent to I/O thread to let it know that it should
// terminate itself.
@ -147,7 +148,7 @@ namespace zmq
} args;
enum { pad_size = 64 - (sizeof(destination) + sizeof(args)) };
enum { pad_size = 64 - (sizeof(zmq::object_t*) + sizeof(args_t) + sizeof(type_t)) };
unsigned char unused[ pad_size ];
};