From cab998f40dd950f916ba6dbbe75b299509a6a017 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Wed, 28 Apr 2004 22:15:06 +0000
Subject: [PATCH] renamed chronIntIdResTable::add to
 chronIntIdResTable::idAssignAdd to avoid hiding resTable::add in the public
 base class

---
 src/db/dbContext.cpp                  | 4 ++--
 src/libCom/cxxTemplates/resourceLib.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/db/dbContext.cpp b/src/db/dbContext.cpp
index 8e56e96d9..cb7b17b8d 100644
--- a/src/db/dbContext.cpp
+++ b/src/db/dbContext.cpp
@@ -242,7 +242,7 @@ void dbContext::subscribe (
         dbSubscriptionIO ( guard, this->mutex, *this, chan, 
             addr, notifyIn, type, count, mask, this->ctx );
     chan.dbContextPrivateListOfIO::eventq.add ( subscr );
-    this->ioTable.add ( subscr );
+    this->ioTable.idAssignAdd ( subscr );
 
     if ( pId ) {
         *pId = subscr.getId ();
@@ -260,7 +260,7 @@ void dbContext::initiatePutNotify (
         chan.dbContextPrivateListOfIO::pBlocker = 
             new ( this->dbPutNotifyBlockerFreeList ) 
                 dbPutNotifyBlocker ( this->mutex );
-        this->ioTable.add ( *chan.dbContextPrivateListOfIO::pBlocker );
+        this->ioTable.idAssignAdd ( *chan.dbContextPrivateListOfIO::pBlocker );
     }
     chan.dbContextPrivateListOfIO::pBlocker->initiatePutNotify ( 
         guard, notifyIn, addr, type, count, pValue );
diff --git a/src/libCom/cxxTemplates/resourceLib.h b/src/libCom/cxxTemplates/resourceLib.h
index 5d9531bdc..190a2c014 100644
--- a/src/libCom/cxxTemplates/resourceLib.h
+++ b/src/libCom/cxxTemplates/resourceLib.h
@@ -229,7 +229,7 @@ class chronIntIdResTable : public resTable<ITEM, chronIntId> {
 public:
     chronIntIdResTable ();
     virtual ~chronIntIdResTable ();
-    void add ( ITEM & item );
+    void idAssignAdd ( ITEM & item );
 private:
     unsigned allocId;
 	chronIntIdResTable ( const chronIntIdResTable & );
@@ -961,7 +961,7 @@ chronIntIdResTable<ITEM>::~chronIntIdResTable() {}
 // resources with the same id.
 //
 template <class ITEM>
-inline void chronIntIdResTable<ITEM>::add (ITEM &item)
+inline void chronIntIdResTable<ITEM>::idAssignAdd (ITEM &item)
 {
     int status;
     do {