=== modified file 'src/ca/cac.h'
--- src/ca/cac.h	2010-08-23 20:17:16 +0000
+++ src/ca/cac.h	2011-06-01 22:22:12 +0000
@@ -266,8 +266,8 @@
     // **** 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;

=== modified file 'src/ca/udpiiu.h'
--- src/ca/udpiiu.h	2010-08-10 21:05:46 +0000
+++ src/ca/udpiiu.h	2011-06-01 22:22:12 +0000
@@ -149,8 +149,8 @@
     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;

=== modified file 'src/db/dbCAC.h'
--- src/db/dbCAC.h	2010-10-05 19:27:37 +0000
+++ src/db/dbCAC.h	2011-06-01 22:22:12 +0000
@@ -196,8 +196,8 @@
     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;

=== modified file 'src/libCom/cxxTemplates/epicsSingleton.h'
--- src/libCom/cxxTemplates/epicsSingleton.h	2010-10-05 19:27:37 +0000
+++ src/libCom/cxxTemplates/epicsSingleton.h	2011-08-08 16:31:19 +0000
@@ -34,7 +34,7 @@
     void * pInstance () const;
 private:
     void * _pInstance;
-    size_t _refCount;
+    std :: size_t _refCount;
     SingletonUntyped ( const SingletonUntyped & );
     SingletonUntyped & operator = ( const SingletonUntyped & );
 };