Skip to content

Commit

Permalink
Merge pull request zeromq#2633 from pavel-pimenov/fix-C4324
Browse files Browse the repository at this point in the history
Suppress C4324 (VC++2017)
  • Loading branch information
bluca authored Jul 27, 2017
2 parents a537ace + dfd9d48 commit 2991e6f
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/command.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -170,6 +171,7 @@ namespace zmq
} args;
#ifdef _MSC_VER
};
#pragma warning(pop)
#else
} __attribute__((aligned(64)));
#endif
Expand Down

0 comments on commit 2991e6f

Please sign in to comment.