From d799a9335fc0ee0c2a47d55fd44690cf8d42885c Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Mon, 21 Jan 2019 11:29:30 +0100 Subject: [PATCH] Launcher::Job : All subclasses have now protected or private destructors to avoid conflicts between refcounting --- src/Launcher/Launcher_Job_Command.hxx | 3 ++- src/Launcher/Launcher_Job_CommandSALOME.hxx | 3 ++- src/Launcher/Launcher_Job_PythonSALOME.hxx | 3 ++- src/Launcher/Launcher_Job_SALOME.hxx | 3 ++- src/Launcher/Launcher_Job_YACSFile.hxx | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Launcher/Launcher_Job_Command.hxx b/src/Launcher/Launcher_Job_Command.hxx index d95b01b5d..75f91c5f9 100644 --- a/src/Launcher/Launcher_Job_Command.hxx +++ b/src/Launcher/Launcher_Job_Command.hxx @@ -33,9 +33,10 @@ namespace Launcher { class LAUNCHER_EXPORT Job_Command : virtual public Launcher::Job { + protected: + virtual ~Job_Command(); public: Job_Command(); - virtual ~Job_Command(); virtual void update_job(); diff --git a/src/Launcher/Launcher_Job_CommandSALOME.hxx b/src/Launcher/Launcher_Job_CommandSALOME.hxx index dd3884bcf..e3118d04f 100644 --- a/src/Launcher/Launcher_Job_CommandSALOME.hxx +++ b/src/Launcher/Launcher_Job_CommandSALOME.hxx @@ -33,9 +33,10 @@ namespace Launcher { class LAUNCHER_EXPORT Job_CommandSALOME : virtual public Launcher::Job_Command { + private: + virtual ~Job_CommandSALOME(); public: Job_CommandSALOME(); - virtual ~Job_CommandSALOME(); static const char TYPE_NAME[]; #ifdef WITH_LIBBATCH diff --git a/src/Launcher/Launcher_Job_PythonSALOME.hxx b/src/Launcher/Launcher_Job_PythonSALOME.hxx index 876f775db..6f27a791c 100644 --- a/src/Launcher/Launcher_Job_PythonSALOME.hxx +++ b/src/Launcher/Launcher_Job_PythonSALOME.hxx @@ -28,9 +28,10 @@ namespace Launcher { class LAUNCHER_EXPORT Job_PythonSALOME : virtual public Launcher::Job_SALOME { + private: + virtual ~Job_PythonSALOME(); public: Job_PythonSALOME(); - virtual ~Job_PythonSALOME(); virtual void setJobFile(const std::string & job_file); virtual void addJobTypeSpecificScript(std::ofstream & launch_script_stream); diff --git a/src/Launcher/Launcher_Job_SALOME.hxx b/src/Launcher/Launcher_Job_SALOME.hxx index 4e2a2dbd3..16a9fe4da 100644 --- a/src/Launcher/Launcher_Job_SALOME.hxx +++ b/src/Launcher/Launcher_Job_SALOME.hxx @@ -33,9 +33,10 @@ namespace Launcher { class LAUNCHER_EXPORT Job_SALOME : virtual public Launcher::Job { + protected: + virtual ~Job_SALOME(); public: Job_SALOME(); - virtual ~Job_SALOME(); virtual void setResourceDefinition(const ParserResourcesType & resource_definition); virtual void update_job(); diff --git a/src/Launcher/Launcher_Job_YACSFile.hxx b/src/Launcher/Launcher_Job_YACSFile.hxx index 657231244..e37499afd 100644 --- a/src/Launcher/Launcher_Job_YACSFile.hxx +++ b/src/Launcher/Launcher_Job_YACSFile.hxx @@ -28,9 +28,10 @@ namespace Launcher { class LAUNCHER_EXPORT Job_YACSFile : virtual public Launcher::Job_SALOME { + private: + virtual ~Job_YACSFile(); public: Job_YACSFile(); - virtual ~Job_YACSFile(); virtual void setJobFile(const std::string & job_file); virtual void addJobTypeSpecificScript(std::ofstream & launch_script_stream); -- 2.39.2