From 51fa417e9f8da5e580c31944e72da0c5e40f267b Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Thu, 14 Sep 2000 00:38:45 +0000
Subject: [PATCH] proper cleanup of local channels and remove static from
 operator new/delete  following convention

---
 src/db/dbCAC.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/db/dbCAC.h b/src/db/dbCAC.h
index 23feb9c9d..c9eee678e 100644
--- a/src/db/dbCAC.h
+++ b/src/db/dbCAC.h
@@ -38,8 +38,8 @@ public:
         unsigned long count, const void *pValue);
     void completion ();
     void destroy ();
-    static void * operator new ( size_t size );
-    static void operator delete ( void *pCadaver, size_t size );
+    void * operator new ( size_t size );
+    void operator delete ( void *pCadaver, size_t size );
 private:
     putNotify pn;
     dbPutNotifyBlocker &blocker;
@@ -56,8 +56,8 @@ public:
     int begin ( struct dbAddr &addr, unsigned mask );
     void destroy ();
     void show ( unsigned level ) const;
-    static void * operator new ( size_t size );
-    static void operator delete ( void *pCadaver, size_t size );
+    void * operator new ( size_t size );
+    void operator delete ( void *pCadaver, size_t size );
 private:
     dbChannelIO &chan;
     dbEventSubscription es;
@@ -79,8 +79,8 @@ public:
             unsigned type, unsigned long count, const void *pValue);
     void putNotifyDestroyNotify ();
     void show ( unsigned level ) const;
-    static void * operator new ( size_t size );
-    static void operator delete ( void *pCadaver, size_t size );
+    void * operator new ( size_t size );
+    void operator delete ( void *pCadaver, size_t size );
 private:
     osiEvent block;
     dbPutNotifyIO *pPN;
@@ -95,14 +95,14 @@ private:
 
 class dbChannelIO : public cacLocalChannelIO {
 public:
-    dbChannelIO (  cacChannel &chan, const dbAddr &addr, dbServiceIO &serviceIO );
+    dbChannelIO ( cac &, cacChannel &chan, const dbAddr &addr, dbServiceIO &serviceIO );
     void destroy ();
     void subscriptionUpdate ( unsigned type, unsigned long count, 
             const struct db_field_log *pfl, cacNotifyIO &notify );
     dbEventSubscription subscribe ( dbSubscriptionIO &subscr, unsigned mask );
     void show ( unsigned level ) const;
-    static void * operator new ( size_t size);
-    static void operator delete ( void *pCadaver, size_t size );
+    void * operator new ( size_t size);
+    void operator delete ( void *pCadaver, size_t size );
 
 private:
     dbServiceIO &serviceIO;
@@ -141,7 +141,7 @@ class dbServiceIO : public cacServiceIO {
 public:
     dbServiceIO ();
     virtual ~dbServiceIO ();
-    cacLocalChannelIO *createChannelIO ( cacChannel &chan, const char *pName );
+    cacLocalChannelIO *createChannelIO ( const char *pName, cac &, cacChannel & );
     void subscriptionUpdate ( struct dbAddr &addr, unsigned type, unsigned long count, 
             const struct db_field_log *pfl, cacNotifyIO &notify );
     dbEventSubscription subscribe ( struct dbAddr &addr, dbSubscriptionIO &subscr, unsigned mask );