epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

rename GUID -> ServerGUID

Browse Source 
avoid ambigious name on windows/mingw
This commit is contained in:
Michael Davidsaver
2017-07-04 17:57:20 +02:00
parent 3ea8d7c71c
commit 05b6da623a
14 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/remote/simpleChannelSearchManagerImpl.cpp
View File

@@ -139,7 +139,7 @@ void SimpleChannelSearchManagerImpl::unregisterSearchInstance(SearchInstance::sh
m_channels.erase(id);
}
void SimpleChannelSearchManagerImpl::searchResponse(const GUID & guid, pvAccessID cid, int32_t /*seqNo*/, int8_t minorRevision, osiSockAddr* serverAddress)
void SimpleChannelSearchManagerImpl::searchResponse(const ServerGUID & guid, pvAccessID cid, int32_t /*seqNo*/, int8_t minorRevision, osiSockAddr* serverAddress)
{
Lock guard(m_channelMutex);
m_channels_t::iterator channelsIter = m_channels.find(cid);