Skip to content

Commit

Permalink
Merge pull request zeromq#407 from jcfr/fix-macos-10.11.6-default-ini…
Browse files Browse the repository at this point in the history
…t-error

Fix error: default initialization of an object of const type
  • Loading branch information
sigiesec authored May 14, 2020
2 parents bb321ee + 5e28623 commit 9b824dd
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions zmq.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1301,19 +1301,19 @@ template<int Opt, int NullTerm = 1> struct array_option

#define ZMQ_DEFINE_INTEGRAL_OPT(OPT, NAME, TYPE) \
using NAME##_t = integral_option<OPT, TYPE, false>; \
ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME
ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME{}
#define ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(OPT, NAME, TYPE) \
using NAME##_t = integral_option<OPT, TYPE, true>; \
ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME
ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME{}
#define ZMQ_DEFINE_ARRAY_OPT(OPT, NAME) \
using NAME##_t = array_option<OPT>; \
ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME
ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME{}
#define ZMQ_DEFINE_ARRAY_OPT_BINARY(OPT, NAME) \
using NAME##_t = array_option<OPT, 0>; \
ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME
ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME{}
#define ZMQ_DEFINE_ARRAY_OPT_BIN_OR_Z85(OPT, NAME) \
using NAME##_t = array_option<OPT, 2>; \
ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME
ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME{}

// duplicate definition from libzmq 4.3.3
#if defined _WIN32
Expand Down

0 comments on commit 9b824dd

Please sign in to comment.