diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-12-25 05:22:59 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-12-25 05:22:59 +0100 |
| commit | b855183f0878fac7f09017539b6a4504e00cf6e4 (patch) | |
| tree | b98753dac466735020681b7534787b2133fd204c /src/RemoteControl.cpp | |
| parent | 8ff127f33a6173d612a00a7c3cb4dd25b9bffcd0 (diff) | |
| parent | 515959935cd7c741db5aca5b20bfb7611749fbfb (diff) | |
| download | dabmod-b855183f0878fac7f09017539b6a4504e00cf6e4.tar.gz dabmod-b855183f0878fac7f09017539b6a4504e00cf6e4.tar.bz2 dabmod-b855183f0878fac7f09017539b6a4504e00cf6e4.zip | |
Merge branch 'next' into outputRefactoring
Diffstat (limited to 'src/RemoteControl.cpp')
| -rw-r--r-- | src/RemoteControl.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/RemoteControl.cpp b/src/RemoteControl.cpp index ceae942..a050278 100644 --- a/src/RemoteControl.cpp +++ b/src/RemoteControl.cpp @@ -422,11 +422,11 @@ void RemoteControllerZmq::process() std::string msg_s = ss.str(); - zmq::message_t msg(ss.str().size()); - memcpy ((void*) msg.data(), msg_s.data(), msg_s.size()); + zmq::message_t zmsg(ss.str().size()); + memcpy ((void*) zmsg.data(), msg_s.data(), msg_s.size()); int flag = (--cohort_size > 0) ? ZMQ_SNDMORE : 0; - repSocket.send(msg, flag); + repSocket.send(zmsg, flag); } } else if (msg.size() == 2 && command == "show") { @@ -437,11 +437,11 @@ void RemoteControllerZmq::process() for (auto ¶m_val : r) { std::stringstream ss; ss << param_val[0] << ": " << param_val[1] << endl; - zmq::message_t msg(ss.str().size()); - memcpy(msg.data(), ss.str().data(), ss.str().size()); + zmq::message_t zmsg(ss.str().size()); + memcpy(zmsg.data(), ss.str().data(), ss.str().size()); int flag = (--r_size > 0) ? ZMQ_SNDMORE : 0; - repSocket.send(msg, flag); + repSocket.send(zmsg, flag); } } catch (ParameterError &e) { @@ -454,9 +454,9 @@ void RemoteControllerZmq::process() try { std::string value = rcs.get_param(module, parameter); - zmq::message_t msg(value.size()); - memcpy ((void*) msg.data(), value.data(), value.size()); - repSocket.send(msg, 0); + zmq::message_t zmsg(value.size()); + memcpy ((void*) zmsg.data(), value.data(), value.size()); + repSocket.send(zmsg, 0); } catch (ParameterError &err) { send_fail_reply(repSocket, err.what()); |