0
0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-26 23:01:04 +08:00

Problem: CI fails with formatting errors

Solution: run make clang-format-diff
This commit is contained in:
Luca Boccassi 2020-09-28 10:30:20 +01:00
parent d4f03edd47
commit 22d218a182
2 changed files with 4 additions and 3 deletions

View File

@ -252,7 +252,8 @@ typedef struct zmq_msg_t
{ {
#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64)) #if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64))
__declspec(align (8)) unsigned char _[64]; __declspec(align (8)) unsigned char _[64];
#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_ARM_ARMV7VE) || defined(_M_ARM)) #elif defined(_MSC_VER) \
&& (defined(_M_IX86) || defined(_M_ARM_ARMV7VE) || defined(_M_ARM))
__declspec(align (4)) unsigned char _[64]; __declspec(align (4)) unsigned char _[64];
#elif defined(__GNUC__) || defined(__INTEL_COMPILER) \ #elif defined(__GNUC__) || defined(__INTEL_COMPILER) \
|| (defined(__SUNPRO_C) && __SUNPRO_C >= 0x590) \ || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x590) \

View File

@ -164,7 +164,7 @@ class socket_base_t : public own_t,
// after gathering the data asynchronously. Requires event monitoring to // after gathering the data asynchronously. Requires event monitoring to
// be enabled. // be enabled.
int query_pipes_stats (); int query_pipes_stats ();
bool is_disconnected () const; bool is_disconnected () const;
protected: protected:
@ -347,7 +347,7 @@ class socket_base_t : public own_t,
mutex_t _monitor_sync; mutex_t _monitor_sync;
ZMQ_NON_COPYABLE_NOR_MOVABLE (socket_base_t) ZMQ_NON_COPYABLE_NOR_MOVABLE (socket_base_t)
// Add a flag for mark disconnect action // Add a flag for mark disconnect action
bool _disconnected; bool _disconnected;
}; };