From 912a82c0b521d8e894b0930d25582e98fcfe5686 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Wed, 8 Mar 2023 11:03:43 +0100 Subject: [PATCH] replace deprecated decrementing volatile with atomic decrement --- modules/libcom/test/epicsTimerTest.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/libcom/test/epicsTimerTest.cpp b/modules/libcom/test/epicsTimerTest.cpp index 74e1919b0..e8826cc49 100644 --- a/modules/libcom/test/epicsTimerTest.cpp +++ b/modules/libcom/test/epicsTimerTest.cpp @@ -21,6 +21,7 @@ #include "epicsEvent.h" #include "epicsAssert.h" #include "epicsGuard.h" +#include "epicsAtomic.h" #include "tsFreeList.h" #include "epicsUnitTest.h" #include "testMain.h" @@ -84,7 +85,7 @@ private: delayVerify & operator = ( const delayVerify & ); }; -static volatile unsigned expireCount; +static int expireCount; static epicsEvent expireEvent; delayVerify::delayVerify ( double expectedDelayIn, epicsTimerQueue &queueIn ) : @@ -128,7 +129,7 @@ inline void delayVerify::start ( const epicsTime &expireTime ) epicsTimerNotify::expireStatus delayVerify::expire ( const epicsTime ¤tTime ) { this->expireStamp = currentTime; - if ( --expireCount == 0u ) { + if ( epics::atomic::decrement ( expireCount ) == 0u ) { expireEvent.signal (); } return noRestart; @@ -155,7 +156,7 @@ void testAccuracy () } testOk1 ( timerCount == nTimers ); - expireCount = nTimers; + epics::atomic::set ( expireCount, nTimers ); for ( i = 0u; i < nTimers; i++ ) { epicsTime cur = epicsTime::getCurrent (); pTimers[i]->setBegin ( cur );