mirror of
https://github.com/zeromq/libzmq.git
synced 2025-03-16 16:13:58 +00:00
Merge pull request #2526 from bjovke/my_work
Problem: GCC 6 build fails due to misleading indentation and visually ambiguous if/else block ordering.
This commit is contained in:
commit
dfde9a22cc
@ -319,7 +319,7 @@ int zmq::proxy (
|
|||||||
if (msg.size () == 6 && memcmp (msg.data (), "RESUME", 6) == 0) {
|
if (msg.size () == 6 && memcmp (msg.data (), "RESUME", 6) == 0) {
|
||||||
state = active;
|
state = active;
|
||||||
poller_wait = poller_in;
|
poller_wait = poller_in;
|
||||||
} else
|
} else {
|
||||||
if (msg.size () == 9 && memcmp (msg.data (), "TERMINATE", 9) == 0)
|
if (msg.size () == 9 && memcmp (msg.data (), "TERMINATE", 9) == 0)
|
||||||
state = terminated;
|
state = terminated;
|
||||||
else {
|
else {
|
||||||
@ -327,7 +327,8 @@ int zmq::proxy (
|
|||||||
puts ("E: invalid command sent to proxy");
|
puts ("E: invalid command sent to proxy");
|
||||||
zmq_assert (false);
|
zmq_assert (false);
|
||||||
}
|
}
|
||||||
control_in = false;
|
}
|
||||||
|
control_in = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state == active) {
|
if (state == active) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user