From 745977642eb3bdcaa0259dace9017a32ae4f7664 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Mon, 22 Jan 2001 23:36:44 +0000 Subject: [PATCH] fixed Solaris warnings introduced by prev change --- src/cas/generic/caServerIIL.h | 8 ++++---- src/cas/generic/casClient.cc | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cas/generic/caServerIIL.h b/src/cas/generic/caServerIIL.h index 263167750..ec7382073 100644 --- a/src/cas/generic/caServerIIL.h +++ b/src/cas/generic/caServerIIL.h @@ -53,11 +53,11 @@ inline caServer * caServerI::operator -> () // inline casRes *caServerI::lookupRes(const caResId &idIn, casResType type) { - chronIntId id (idIn); + chronIntId tmpId (idIn); casRes *pRes; this->lock(); - pRes = this->chronIntIdResTable::lookup (id); + pRes = this->chronIntIdResTable::lookup (tmpId); if (pRes) { if (pRes->resourceType()!=type) { pRes = NULL; @@ -70,11 +70,11 @@ inline casRes *caServerI::lookupRes(const caResId &idIn, casResType type) // // find the channel associated with a resource id // -inline casChannelI *caServerI::resIdToChannel(const caResId &id) +inline casChannelI *caServerI::resIdToChannel(const caResId &idIn) { casRes *pRes; - pRes = this->lookupRes(id, casChanT); + pRes = this->lookupRes(idIn, casChanT); // // safe to cast because we have checked the type code above diff --git a/src/cas/generic/casClient.cc b/src/cas/generic/casClient.cc index ad63075df..e9ecfce79 100644 --- a/src/cas/generic/casClient.cc +++ b/src/cas/generic/casClient.cc @@ -64,14 +64,14 @@ casClient::casClient(caServerI &serverInternal, bufSizeT ioSizeMinIn) : // // find the channel associated with a resource id // -casChannelI *casClient::resIdToChannel(const caResId &id) +casChannelI *casClient::resIdToChannel(const caResId &idIn) { casChannelI *pChan; // // look up the id in a hash table // - pChan = this->ctx.getServer()->resIdToChannel(id); + pChan = this->ctx.getServer()->resIdToChannel(idIn); // // update the context