detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 11:20:04 +02:00
Code Issues Actions Packages Releases Activity

more using .empty()

Browse Source
This commit is contained in:
Erik Frojdh 2020-06-29 17:41:06 +02:00
parent 19e40cf0e6
commit cec26f81e1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/src/CmdProxy.h
View File

@ -283,7 +283,7 @@
WrongNumberOfParameters(0); \ WrongNumberOfParameters(0); \
} \ } \
auto t = det->GETFCN(DAC_INDEX, mv, {det_id}); \ auto t = det->GETFCN(DAC_INDEX, mv, {det_id}); \
os << OutString(t) << (args.size() > 0 ? " mv\n" : "\n"); \ os << OutString(t) << (!args.empty() ? " mv\n" : "\n"); \
} else if (action == slsDetectorDefs::PUT_ACTION) { \ } else if (action == slsDetectorDefs::PUT_ACTION) { \
bool mv = false; \ bool mv = false; \
if (args.size() == 2) { \ if (args.size() == 2) { \
@ -292,7 +292,7 @@
". Did you mean mv?"); \ ". Did you mean mv?"); \
} \ } \
mv = true; \ mv = true; \
} else if (args.size() > 2 || args.size() < 1) { \ } else if (args.size() > 2 || args.empty()) { \
WrongNumberOfParameters(1); \ WrongNumberOfParameters(1); \
} \ } \
det->SETFCN(DAC_INDEX, StringTo<int>(args[0]), mv, {det_id}); \ det->SETFCN(DAC_INDEX, StringTo<int>(args[0]), mv, {det_id}); \

2
slsSupportLib/src/ZmqSocket.cpp
View File

@ -139,7 +139,7 @@ int ZmqSocket::SendHeader(int index, zmqHeader header) {
// additional stuff // additional stuff
header.flippedDataX, header.quad); header.flippedDataX, header.quad);
if (header.addJsonHeader.size() > 0) { if (!header.addJsonHeader.empty()) {
strcat(header_buffer.get(), ", "); strcat(header_buffer.get(), ", ");
strcat(header_buffer.get(), "\"addJsonHeader\": {"); strcat(header_buffer.get(), "\"addJsonHeader\": {");
for (auto it = header.addJsonHeader.begin(); for (auto it = header.addJsonHeader.begin();