From 22d218a182855f28038e865cb75bf5897ff0c786 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 28 Sep 2020 10:30:20 +0100 Subject: [PATCH] Problem: CI fails with formatting errors Solution: run make clang-format-diff --- include/zmq.h | 3 ++- src/socket_base.hpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/zmq.h b/include/zmq.h index ff02881c..a14237c0 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -252,7 +252,8 @@ typedef struct zmq_msg_t { #if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64)) __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]; #elif defined(__GNUC__) || defined(__INTEL_COMPILER) \ || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x590) \ diff --git a/src/socket_base.hpp b/src/socket_base.hpp index 888503e8..92deb9f7 100644 --- a/src/socket_base.hpp +++ b/src/socket_base.hpp @@ -164,7 +164,7 @@ class socket_base_t : public own_t, // after gathering the data asynchronously. Requires event monitoring to // be enabled. int query_pipes_stats (); - + bool is_disconnected () const; protected: @@ -347,7 +347,7 @@ class socket_base_t : public own_t, mutex_t _monitor_sync; ZMQ_NON_COPYABLE_NOR_MOVABLE (socket_base_t) - + // Add a flag for mark disconnect action bool _disconnected; };