From 5649e158420f002cece9075cec8224e60fa36bef Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 1 Jun 2011 17:22:12 -0500 Subject: [PATCH] ca: Remove unnecessary mutable qualifiers These references are never actually "mutated", and break builds with a recent C++ compiler. Fixes lp:736273 --- src/ca/cac.h | 4 ++-- src/ca/udpiiu.h | 4 ++-- src/db/dbCAC.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ca/cac.h b/src/ca/cac.h index 4bac0cdb1..ae20eef27 100644 --- a/src/ca/cac.h +++ b/src/ca/cac.h @@ -266,8 +266,8 @@ private: // **** lock hierarchy **** // 1) callback lock must always be acquired before // the primary mutex if both locks are needed - mutable epicsMutex & mutex; - mutable epicsMutex & cbMutex; + epicsMutex & mutex; + epicsMutex & cbMutex; epicsEvent iiuUninstall; ipAddrToAsciiEngine & ipToAEngine; epicsTimerQueueActive & timerQueue; diff --git a/src/ca/udpiiu.h b/src/ca/udpiiu.h index 0f3d1a313..3c9327547 100644 --- a/src/ca/udpiiu.h +++ b/src/ca/udpiiu.h @@ -149,8 +149,8 @@ private: double rtteMean; double rtteMeanDev; cac & cacRef; - mutable epicsMutex & cbMutex; - mutable epicsMutex & cacMutex; + epicsMutex & cbMutex; + epicsMutex & cacMutex; epics_auto_ptr < epics_auto_ptr < class searchTimer >, eapt_array > ppSearchTmr; unsigned nBytesInXmitBuf; unsigned nTimers; diff --git a/src/db/dbCAC.h b/src/db/dbCAC.h index b25fe301e..3032023dc 100644 --- a/src/db/dbCAC.h +++ b/src/db/dbCAC.h @@ -196,8 +196,8 @@ private: dbContextReadNotifyCache readNotifyCache; dbEventCtx ctx; unsigned long stateNotifyCacheSize; - mutable epicsMutex & mutex; - mutable epicsMutex & cbMutex; + epicsMutex & mutex; + epicsMutex & cbMutex; cacContextNotify & notify; epics_auto_ptr < cacContext > pNetContext; char * pStateNotifyCache;