mirror of
https://github.com/zeromq/libzmq.git
synced 2025-03-10 07:56:09 +00:00
Merge pull request #1533 from c-rack/fix-tests
Problem: tests fail after PR #1531
This commit is contained in:
commit
7d42aac0c5
@ -239,6 +239,7 @@ int zmq::msg_t::close ()
|
|||||||
if (u.base.metadata->drop_ref ()) {
|
if (u.base.metadata->drop_ref ()) {
|
||||||
LIBZMQ_DELETE(u.base.metadata);
|
LIBZMQ_DELETE(u.base.metadata);
|
||||||
}
|
}
|
||||||
|
u.base.metadata = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Make the message invalid.
|
// Make the message invalid.
|
||||||
@ -393,9 +394,11 @@ void zmq::msg_t::set_metadata (zmq::metadata_t *metadata_)
|
|||||||
void zmq::msg_t::reset_metadata ()
|
void zmq::msg_t::reset_metadata ()
|
||||||
{
|
{
|
||||||
if (u.base.metadata) {
|
if (u.base.metadata) {
|
||||||
if (u.base.metadata->drop_ref ())
|
if (u.base.metadata->drop_ref ()) {
|
||||||
LIBZMQ_DELETE(u.base.metadata);
|
LIBZMQ_DELETE(u.base.metadata);
|
||||||
}
|
}
|
||||||
|
u.base.metadata = NULL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool zmq::msg_t::is_identity () const
|
bool zmq::msg_t::is_identity () const
|
||||||
|
Loading…
x
Reference in New Issue
Block a user