From eff17371a5eaa783b63ce29fd904195e003e331c Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Thu, 17 Jan 2019 17:30:36 +0100 Subject: [PATCH] removed virtual --- slsDetectorSoftware/slsDetector/slsDetectorCommand.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.h b/slsDetectorSoftware/slsDetector/slsDetectorCommand.h index d5afb3fc0..16b228da6 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.h @@ -18,7 +18,7 @@ class slsDetectorCommand : public virtual slsDetectorDefs { slsDetectorCommand(multiSlsDetector *det); - virtual ~slsDetectorCommand(){}; + /* * Executes a set of string arguments according to a given format. @@ -29,7 +29,7 @@ class slsDetectorCommand : public virtual slsDetectorDefs { * @param action can be PUT_ACTION or GET_ACTION(from text client even READOUT_ACTION for acquisition) * @param detPos -1 for all detectors in multi detector list or position of a specific detector in list */ - virtual std::string executeLine(int narg, char *args[], int action, int detPos = -1); + std::string executeLine(int narg, char *args[], int action, int detPos = -1); /* /\** */ /* returns the help for the executeLine command */