From 29d4eb8b417a49f32141de9e4c54b21c3b483116 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Wed, 20 Feb 2019 10:29:15 +0100 Subject: [PATCH] catch by ref --- slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp | 2 +- slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index 505e9f1b6..8647acb55 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -4370,7 +4370,7 @@ std::string slsDetectorCommand::cmdTimeLeft(int narg, char *args[], int action, ret = myDet->getTimeLeft(index, detPos); if ((ret != -1) && (index == ACQUISITION_TIME || index == FRAME_PERIOD || index == DELAY_AFTER_TRIGGER || index == ACTUAL_TIME || index == MEASUREMENT_TIME || - MEASURED_PERIOD || MEASURED_SUBPERIOD)) + index == MEASURED_PERIOD || index == MEASURED_SUBPERIOD)) rval = (double)ret * 1E-9; else rval = ret; diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp index 833006a46..f2550ee6c 100644 --- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp +++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp @@ -421,7 +421,7 @@ int slsReceiverTCPIPInterface::set_port() { try { mySocket = new MySocketTCP(p_number); strcpy(mySock->lastClientIP,oldLastClientIP); - } catch(SamePortSocketException e) { + } catch(SamePortSocketException &e) { ret = FAIL; sprintf(mess, "Could not bind port %d. It is already set\n", p_number); FILE_LOG(logERROR) << mess;