3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-10 16:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Suppress C4324 (VC++2017)
This commit is contained in:
Luca Boccassi 2017-07-27 10:10:03 +01:00 committed by GitHub
commit 2991e6f602
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/command.hpp
View File

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