@@ -328,8 +328,8 @@ inline int poll(std::vector<zmq_pollitem_t> &items, long timeout_ = -1)
328
328
}
329
329
330
330
template <std::size_t SIZE>
331
- inline int poll (std::array<zmq_pollitem_t , SIZE>& items,
332
- std::chrono::milliseconds timeout)
331
+ inline int poll (std::array<zmq_pollitem_t , SIZE> & items,
332
+ std::chrono::milliseconds timeout)
333
333
{
334
334
return poll (items.data (), items.size (), static_cast <long >(timeout.count ()));
335
335
}
@@ -350,13 +350,14 @@ inline std::tuple<int, int, int> version()
350
350
}
351
351
352
352
#if !defined(ZMQ_CPP11_PARTIAL)
353
- namespace detail {
353
+ namespace detail
354
+ {
354
355
template <class T > struct is_char_type
355
356
{
356
357
// true if character type for string literals in C++11
357
358
static constexpr bool value =
358
- std::is_same<T, char >::value || std::is_same<T, wchar_t >::value ||
359
- std::is_same<T, char16_t >::value || std::is_same<T, char32_t >::value;
359
+ std::is_same<T, char >::value || std::is_same<T, wchar_t >::value
360
+ || std::is_same<T, char16_t >::value || std::is_same<T, char32_t >::value;
360
361
};
361
362
}
362
363
#endif
@@ -397,8 +398,7 @@ class message_t
397
398
int rc = zmq_msg_init_size (&msg, size_);
398
399
if (rc != 0 )
399
400
throw error_t ();
400
- if (size_)
401
- {
401
+ if (size_) {
402
402
// this constructor allows (nullptr, 0),
403
403
// memcpy with a null pointer is UB
404
404
memcpy (data (), data_, size_);
@@ -418,13 +418,12 @@ class message_t
418
418
// when called with a string literal.
419
419
// An overload taking const char* can not be added because
420
420
// it would be preferred over this function and break compatiblity.
421
- template <class Char , size_t N,
422
- typename = typename std::enable_if<
423
- detail::is_char_type<Char>::value
424
- >::type
425
- >
426
- ZMQ_DEPRECATED (
427
- " from 4.7.0, use constructors taking iterators, (pointer, size) or strings instead" )
421
+ template <
422
+ class Char ,
423
+ size_t N,
424
+ typename = typename std::enable_if<detail::is_char_type<Char>::value>::type>
425
+ ZMQ_DEPRECATED (" from 4.7.0, use constructors taking iterators, (pointer, size) "
426
+ " or strings instead" )
428
427
explicit message_t(const Char (&data)[N]) :
429
428
message_t(detail::ranges::begin(data), detail::ranges::end(data))
430
429
{
@@ -441,16 +440,10 @@ class message_t
441
440
{
442
441
}
443
442
444
- explicit message_t (const std::string &str) :
445
- message_t(str.data(), str.size())
446
- {
447
- }
443
+ explicit message_t (const std::string &str) : message_t(str.data(), str.size()) {}
448
444
449
445
#if CPPZMQ_HAS_STRING_VIEW
450
- explicit message_t (std::string_view str) :
451
- message_t(str.data(), str.size())
452
- {
453
- }
446
+ explicit message_t (std::string_view str) : message_t(str.data(), str.size()) {}
454
447
#endif
455
448
456
449
#endif
@@ -1367,19 +1360,19 @@ template<int Opt, int NullTerm = 1> struct array_option
1367
1360
1368
1361
#define ZMQ_DEFINE_INTEGRAL_OPT (OPT, NAME, TYPE ) \
1369
1362
using NAME##_t = integral_option<OPT, TYPE, false >; \
1370
- ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME{}
1363
+ ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME {}
1371
1364
#define ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT (OPT, NAME, TYPE ) \
1372
1365
using NAME##_t = integral_option<OPT, TYPE, true >; \
1373
- ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME{}
1366
+ ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME {}
1374
1367
#define ZMQ_DEFINE_ARRAY_OPT (OPT, NAME ) \
1375
1368
using NAME##_t = array_option<OPT>; \
1376
- ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME{}
1369
+ ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME {}
1377
1370
#define ZMQ_DEFINE_ARRAY_OPT_BINARY (OPT, NAME ) \
1378
1371
using NAME##_t = array_option<OPT, 0 >; \
1379
- ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME{}
1372
+ ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME {}
1380
1373
#define ZMQ_DEFINE_ARRAY_OPT_BIN_OR_Z85 (OPT, NAME ) \
1381
1374
using NAME##_t = array_option<OPT, 2 >; \
1382
- ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME{}
1375
+ ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME {}
1383
1376
1384
1377
// duplicate definition from libzmq 4.3.3
1385
1378
#if defined _WIN32
@@ -2191,7 +2184,6 @@ class socket_t : public detail::socket_base
2191
2184
throw error_t ();
2192
2185
if (ctxptr == ZMQ_NULLPTR)
2193
2186
throw error_t ();
2194
-
2195
2187
}
2196
2188
};
2197
2189
0 commit comments