From 9c58b4802c40e344a5ca217d237b12b09f097a00 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 12 Aug 2020 11:19:45 +0200 Subject: [PATCH] gcc4.8 still does not have strict order of evaluation from left to right for <<, so has to be separated --- slsDetectorSoftware/src/CmdProxy.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/slsDetectorSoftware/src/CmdProxy.cpp b/slsDetectorSoftware/src/CmdProxy.cpp index f44461b97..52a754ee2 100644 --- a/slsDetectorSoftware/src/CmdProxy.cpp +++ b/slsDetectorSoftware/src/CmdProxy.cpp @@ -962,12 +962,12 @@ std::string CmdProxy::DacValues(int action) { auto t = det->getDacList(); os << '['; auto it = t.cbegin(); - os << ToString(*it) << ' ' - << OutString(det->getDAC(*it++, mv, {det_id})) + os << ToString(*it) << ' '; + os << OutString(det->getDAC(*it++, mv, {det_id})) << (!args.empty() ? " mv" : ""); while (it != t.cend()) { - os << ", " << ToString(*it) << ' ' - << OutString(det->getDAC(*it++, mv, {det_id})) + os << ", " << ToString(*it) << ' '; + os << OutString(det->getDAC(*it++, mv, {det_id})) << (!args.empty() ? " mv" : ""); } os << "]\n"; @@ -2711,4 +2711,4 @@ std::string CmdProxy::UserDetails(int action) { return os.str(); } -} // namespace sls \ No newline at end of file +} // namespace sls