1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 <2011> 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 | Index | 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 <2011> 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 |
<== Date ==> | <== Thread ==> |
---|
Subject: | Re: epics base 3.14.12.1 build error on fedora 16 |
From: | "Florian Feldbauer" <[email protected]> |
To: | "Pavel Masloff" <[email protected]> |
Cc: | EPICS Tech Talk <[email protected]> |
Date: | 16 Dec 2011 11:39:19 +0100 |
Hello Pavel, I had the same problems on Fedora15. I used these two patches to fix the problems. Best regards, Florian On 12/16/2011 11:31 AM, Pavel Masloff wrote: Hello Miroslav! -- ------------------------------------- | Florian Feldbauer | | Ph.D. student | | | | Institut für Experimentalphysik I | | Ruhr-Universität Bochum | | Universitätsstr. 150 | | D-44780 Bochum | | | | Office: NB 2/173 | | Phone: (+49)234 / 32-23538 | | Fax: (+49)234 / 32-14170 | | Web: http://www.ep1.rub.de | ------------------------------------- |
>From 86968a0af746bfbb2108f5342c83a8293edae957 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver <[email protected]> Date: Tue, 31 May 2011 08:40:01 -0400 Subject: Drop "mutable" references It doesn't appear that any code is attempting to actually change them... --- src/ca/cac.h | 4 ++-- src/ca/udpiiu.h | 4 ++-- src/db/dbCAC.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git src/ca/cac.h src/ca/cac.h index 4bac0cd..ae20eef 100644 --- src/ca/cac.h +++ 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 src/ca/udpiiu.h src/ca/udpiiu.h index 0f3d1a3..3c93275 100644 --- src/ca/udpiiu.h +++ 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 src/db/dbCAC.h src/db/dbCAC.h index b25fe30..3032023 100644 --- src/db/dbCAC.h +++ 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; -- 1.7.3.4
diff -rc base-3.14.12.1/src/libCom/cxxTemplates/epicsSingleton.h new-3.14.12.1/src/libCom/cxxTemplates/epicsSingleton.h *** base-3.14.12.1/src/libCom/cxxTemplates/epicsSingleton.h Tue Apr 26 22:40:09 2011 --- new-3.14.12.1/src/libCom/cxxTemplates/epicsSingleton.h Mon Aug 8 18:07:58 2011 *************** *** 34,40 **** void * pInstance () const; private: void * _pInstance; ! size_t _refCount; SingletonUntyped ( const SingletonUntyped & ); SingletonUntyped & operator = ( const SingletonUntyped & ); }; --- 34,40 ---- void * pInstance () const; private: void * _pInstance; ! std :: size_t _refCount; SingletonUntyped ( const SingletonUntyped & ); SingletonUntyped & operator = ( const SingletonUntyped & ); };