Commit b6b990f5 authored by Pieter Hintjens's avatar Pieter Hintjens

Merge pull request #1300 from moteus/master

Fix. Use C++03 compatible way to align struct. (Build on MSVC)
parents 3503fdad 57cb34f1
...@@ -59,7 +59,8 @@ namespace zmq ...@@ -59,7 +59,8 @@ namespace zmq
done done
} type; } type;
union { union args_t
{
// Sent to I/O thread to let it know that it should // Sent to I/O thread to let it know that it should
// terminate itself. // terminate itself.
...@@ -147,7 +148,7 @@ namespace zmq ...@@ -147,7 +148,7 @@ namespace zmq
} args; } 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 ]; unsigned char unused[ pad_size ];
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment