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

merge

Browse Source
This commit is contained in:
Matej Sekoranja
2011-09-20 17:51:37 +02:00
parent d03ac9d00f 6383b8933f
commit 018450b1bd
8 changed files with 71 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pvAccessApp/remote/blockingTCPTransport.cpp
View File

@@ -591,7 +591,7 @@ namespace epics {
// second byte version - major/minor nibble
int8 magic = _socketBuffer->getByte();
_version = _socketBuffer->getByte();
if(unlikely((magic != CA_MAGIC) || (((unsigned int8)_version) >> 4)!=CA_MAJOR_PROTOCOL_REVISION))
if(unlikely((magic != CA_MAGIC) || (((uint8_t)_version) >> 4)!=CA_MAJOR_PROTOCOL_REVISION))
{
// error... disconnect
LOG(