From a2531d6bc93df085cd6ad049213f36223fb56f2c Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Thu, 15 Jan 2004 02:51:35 +0000
Subject: [PATCH] fixed gnu warnings

---
 src/ca/nciu.h          | 4 +++-
 src/ca/oldAccess.h     | 3 ++-
 src/db/dbChannelIO.cpp | 2 +-
 src/db/dbChannelIO.h   | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/ca/nciu.h b/src/ca/nciu.h
index 3aea55ecc..a835f87c9 100644
--- a/src/ca/nciu.h
+++ b/src/ca/nciu.h
@@ -142,6 +142,9 @@ public:
         epicsGuard < epicsMutex > &, epicsGuard < epicsMutex > & );
     bool connected ( epicsGuard < epicsMutex > & ) const;
 
+protected:
+    ~nciu ();
+
 private:
     tsDLList < class baseNMIU > eventq;
     caAccessRights accessRightState;
@@ -154,7 +157,6 @@ private:
     unsigned short nameLength; // channel name length
     ca_uint16_t typeCode;
     ca_uint8_t priority; 
-    ~nciu ();
     virtual void destroy (
         epicsGuard < epicsMutex > & callbackControlGuard, 
         epicsGuard < epicsMutex > & mutualExclusionGuard );
diff --git a/src/ca/oldAccess.h b/src/ca/oldAccess.h
index e6ab4d0d5..0de35d373 100644
--- a/src/ca/oldAccess.h
+++ b/src/ca/oldAccess.h
@@ -105,6 +105,8 @@ public:
         tsFreeList < struct oldChannelNotify, 1024, epicsMutexNOOP > & );
     epicsPlacementDeleteOperator (( void * , 
         tsFreeList < struct oldChannelNotify, 1024, epicsMutexNOOP > & ))
+protected:
+    ~oldChannelNotify ();
 private:
     ca_client_context & cacCtx;
     cacChannel & io;
@@ -114,7 +116,6 @@ private:
     unsigned ioSeqNo;
     bool currentlyConnected;
     bool prevConnected;
-    ~oldChannelNotify ();
     void connectNotify ( epicsGuard < epicsMutex > & );
     void disconnectNotify ( epicsGuard < epicsMutex > & );
     void serviceShutdownNotify ();
diff --git a/src/db/dbChannelIO.cpp b/src/db/dbChannelIO.cpp
index 0ed2429a9..22f165b4c 100644
--- a/src/db/dbChannelIO.cpp
+++ b/src/db/dbChannelIO.cpp
@@ -43,7 +43,7 @@
 dbChannelIO::dbChannelIO ( 
     epicsMutex & mutexIn, cacChannelNotify & notify, 
     const dbAddr & addrIn, dbContext & serviceIO ) :
-    mutex ( mutexIn ), cacChannel ( notify ), serviceIO ( serviceIO ), 
+    cacChannel ( notify ), mutex ( mutexIn ), serviceIO ( serviceIO ), 
     addr ( addrIn )
 {
 }
diff --git a/src/db/dbChannelIO.h b/src/db/dbChannelIO.h
index 2c0f1caf8..06a41dec9 100644
--- a/src/db/dbChannelIO.h
+++ b/src/db/dbChannelIO.h
@@ -60,6 +60,8 @@ public:
         tsFreeList < dbChannelIO, 256, epicsMutexNOOP > & );
     epicsPlacementDeleteOperator (( void *, 
         tsFreeList < dbChannelIO, 256, epicsMutexNOOP > & ))
+protected:
+    ~dbChannelIO ();
 private:
     epicsMutex & mutex;
     dbContext & serviceIO;
@@ -90,7 +92,6 @@ private:
 	dbChannelIO & operator = ( const dbChannelIO & );
     void * operator new ( size_t size );
     void operator delete ( void * );
-    ~dbChannelIO ();
 };