Experimental Physics and
Industrial Control System

Andrew Johnson <[email protected]> · Mon, 1 Dec 2008 11:07:30 -0600

On Monday 01 December 2008 06:46:38 Mark Rivers wrote:
> This file was changed to fix a serious problem I mentioned on tech-talk
> recently.  I think the fix was added to CVS before it was tested with
> compiling.  Here is what I did to let it compile:

My apologies, I put the volatile keyword in the wrong place (in this case it's 
the pointer that is volatile, not the currentTime object itself).

- Andrew


Index: osdTime.cpp
===================================================================

--- osdTime.cpp 21 Nov 2008 23:23:25 -0000      1.38.2.8
+++ osdTime.cpp 1 Dec 2008 16:43:32 -0000
@@ -85,7 +85,7 @@ private:
     epicsTimerNotify::expireStatus expire ( const epicsTime & );
 };

-static volatile currentTime * pCurrentTime = 0;
+static currentTime * volatile pCurrentTime = 0;
 static const LONGLONG FILE_TIME_TICKS_PER_SEC = 10000000;
 static const LONGLONG EPICS_TIME_TICKS_PER_SEC = 1000000000;
 static const LONGLONG ET_TICKS_PER_FT_TICK =



-- 
Talk is cheap. Show me the code. -- Linus Torvalds


Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System