Commit 2991e6f6 authored by Luca Boccassi's avatar Luca Boccassi Committed by GitHub

Merge pull request #2633 from pavel-pimenov/fix-C4324

Suppress C4324 (VC++2017)
parents a537ace0 dfd9d484
......@@ -44,10 +44,11 @@ namespace zmq
// This structure defines the commands that can be sent between threads.
#ifdef _MSC_VER
__declspec(align(64)) struct command_t
#else
struct command_t
#pragma warning(push)
#pragma warning(disable: 4324) // C4324: alignment padding warnings
__declspec(align(64))
#endif
struct command_t
{
// Object to process the command.
zmq::object_t *destination;
......@@ -170,6 +171,7 @@ namespace zmq
} args;
#ifdef _MSC_VER
};
#pragma warning(pop)
#else
} __attribute__((aligned(64)));
#endif
......
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