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

4
src/remote/beaconHandler.cpp
View File

@@ -34,7 +34,7 @@ BeaconHandler::~BeaconHandler()
}
void BeaconHandler::beaconNotify(osiSockAddr* /*from*/, int8 remoteTransportRevision,
TimeStamp* timestamp, GUID const & guid, int16 sequentalID,
TimeStamp* timestamp, ServerGUID const & guid, int16 sequentalID,
int16 changeCount,
PVFieldPtr /*data*/)
{
@@ -44,7 +44,7 @@ void BeaconHandler::beaconNotify(osiSockAddr* /*from*/, int8 remoteTransportRevi
}
bool BeaconHandler::updateBeacon(int8 /*remoteTransportRevision*/, TimeStamp* /*timestamp*/,
GUID const & guid, int16 /*sequentalID*/, int16 changeCount)
ServerGUID const & guid, int16 /*sequentalID*/, int16 changeCount)
{
Lock guard(_mutex);
// first beacon notification check