Experimental Physics and
Industrial Control System

Martin Konrad has proposed merging ~info-martin-konrad/epics-base:make-protected-dtors-non-virtual into epics-base:3.15.

Requested reviews:
  Jeff Hill (johill-lanl)

For more details, see:
https://code.launchpad.net/~info-martin-konrad/epics-base/+git/epics-base/+merge/382156
-- 
Your team EPICS Core Developers is subscribed to branch epics-base:3.15.

diff --git a/src/libCom/timer/epicsTimer.h b/src/libCom/timer/epicsTimer.h
index 72270f2..0839ea8 100644
--- a/src/libCom/timer/epicsTimer.h
+++ b/src/libCom/timer/epicsTimer.h
@@ -67,7 +67,7 @@ public:
     double getExpireDelay ();
     virtual void show ( unsigned int level ) const = 0;
 protected:
-    virtual ~epicsTimer () = 0; /* protected => delete() must not be called */
+    ~epicsTimer (); /* protected => delete() must not be called */
 };
 
 class epicsTimerQueue {
@@ -75,7 +75,7 @@ public:
     virtual epicsTimer & createTimer () = 0;
     virtual void show ( unsigned int level ) const = 0;
 protected:
-    epicsShareFunc virtual ~epicsTimerQueue () = 0;
+    epicsShareFunc ~epicsTimerQueue ();
 };
 
 class epicsTimerQueueActive
@@ -85,7 +85,7 @@ public:
         bool okToShare, unsigned threadPriority = epicsThreadPriorityMin + 10 );
     virtual void release () = 0; 
 protected:
-    epicsShareFunc virtual ~epicsTimerQueueActive () = 0;
+    epicsShareFunc ~epicsTimerQueueActive ();
 };
 
 class epicsTimerQueueNotify {
@@ -97,7 +97,7 @@ public:
     /* return this quantum in seconds. If unknown then return zero. */
     virtual double quantum () = 0;
 protected:
-    epicsShareFunc virtual ~epicsTimerQueueNotify () = 0;
+    epicsShareFunc ~epicsTimerQueueNotify ();
 };
 
 class epicsTimerQueuePassive

Replies:

Minor change to existing timer code Martin Konrad via Core-talk

Re: [Merge] ~info-martin-konrad/epics-base:make-protected-dtors-non-virtual into epics-base:3.15 mdavidsaver via Core-talk

Navigate by Date:

Prev: Re: [Merge] ~info-martin-konrad/epics-base:fix-log-issues into epics-base:3.15 mdavidsaver via Core-talk

Next: Minor change to existing timer code Martin Konrad via Core-talk

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  2019  <2020>  2021  2022  2023  2024 

Navigate by Thread:

Prev: Build completed: epics-base base-fix-log-issues-1 AppVeyor via Core-talk

Next: Minor change to existing timer code Martin Konrad via Core-talk

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  2019  <2020>  2021  2022  2023  2024