Skip to content

Commit d0eb2ad

Browse files
authored
Merge pull request #756 from evoskuil/master
Work around value_t{ size_t } ambiguity (xcode).
2 parents fb38e40 + 01d5a5d commit d0eb2ad

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

  • include/bitcoin/network/messages/rpc

include/bitcoin/network/messages/rpc/model.hpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ struct value_t
104104
value_t(const any_t& value) NOEXCEPT : inner_{ value } {}
105105
value_t(any_t&& value) NOEXCEPT : inner_{ std::move(value) } {}
106106

107+
#if defined (HAVE_XCODE)
108+
value_t(size_t value) NOEXCEPT : inner_{
109+
system::possible_wide_cast<uint64_t>(value) } {}
110+
#endif
111+
107112
/// Forwarding constructors for in-place variant construction.
108113
FORWARD_VARIANT_CONSTRUCT(value_t, inner_)
109114
FORWARD_VARIANT_ASSIGNMENT(value_t, inner_)
@@ -122,7 +127,7 @@ struct value_t
122127
ALTERNATIVE_VARIANT_ASSIGNMENT(value_t, uint64_t, inner_)
123128
ALTERNATIVE_VARIANT_ASSIGNMENT(value_t, json_t, inner_)
124129
ALTERNATIVE_VARIANT_ASSIGNMENT(value_t, any_t, inner_)
125-
130+
126131
inner_t& value() NOEXCEPT
127132
{
128133
return inner_;

0 commit comments

Comments
 (0)