fixed Solaris warnings introduced by prev change
This commit is contained in:
@@ -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<casRes>::lookup (id);
|
||||
pRes = this->chronIntIdResTable<casRes>::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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user