From cec26f81e183f552ed9e93b8e39872372cfee0d6 Mon Sep 17 00:00:00 2001
From: Erik Frojdh <erik.frojdh@gmail.com>
Date: Mon, 29 Jun 2020 17:41:06 +0200
Subject: [PATCH] more using .empty()

---
 slsDetectorSoftware/src/CmdProxy.h | 4 ++--
 slsSupportLib/src/ZmqSocket.cpp    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/slsDetectorSoftware/src/CmdProxy.h b/slsDetectorSoftware/src/CmdProxy.h
index 06af4dfa7..d295fed18 100644
--- a/slsDetectorSoftware/src/CmdProxy.h
+++ b/slsDetectorSoftware/src/CmdProxy.h
@@ -283,7 +283,7 @@
                 WrongNumberOfParameters(0);                                    \
             }                                                                  \
             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) {                    \
             bool mv = false;                                                   \
             if (args.size() == 2) {                                            \
@@ -292,7 +292,7 @@
                                             ". Did you mean mv?");             \
                 }                                                              \
                 mv = true;                                                     \
-            } else if (args.size() > 2 || args.size() < 1) {                   \
+            } else if (args.size() > 2 || args.empty()) {                      \
                 WrongNumberOfParameters(1);                                    \
             }                                                                  \
             det->SETFCN(DAC_INDEX, StringTo<int>(args[0]), mv, {det_id});      \
diff --git a/slsSupportLib/src/ZmqSocket.cpp b/slsSupportLib/src/ZmqSocket.cpp
index 059e73340..47c989e5f 100644
--- a/slsSupportLib/src/ZmqSocket.cpp
+++ b/slsSupportLib/src/ZmqSocket.cpp
@@ -139,7 +139,7 @@ int ZmqSocket::SendHeader(int index, zmqHeader header) {
             // additional stuff
             header.flippedDataX, header.quad);
 
-    if (header.addJsonHeader.size() > 0) {
+    if (!header.addJsonHeader.empty()) {
         strcat(header_buffer.get(), ", ");
         strcat(header_buffer.get(), "\"addJsonHeader\": {");
         for (auto it = header.addJsonHeader.begin();