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

win32: some warning removed

Browse Source
This commit is contained in:
Matej Sekoranja
2013-12-03 12:08:45 +01:00
parent ebef394fe3
commit aa6bcecb1a
10 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pvAccessApp/remote/abstractResponseHandler.cpp
View File

@@ -34,7 +34,7 @@ namespace epics {
hexDump(prologue.str(), _description,
(const int8*)payloadBuffer->getArray(),
payloadBuffer->getPosition(), payloadSize);
payloadBuffer->getPosition(), static_cast<int>(payloadSize));
}
}
}

6
pvAccessApp/remote/blockingClientTCPTransport.cpp
View File

@@ -127,7 +127,7 @@ namespace epics {
void BlockingClientTCPTransport::closedNotifyClients() {
// check if still acquired
int refs = _owners.size();
size_t refs = _owners.size();
if(refs>0) {
char ipAddrStr[48];
ipAddrToDottedIP(&_socketAddress.ia, ipAddrStr, sizeof(ipAddrStr));
@@ -215,10 +215,10 @@ namespace epics {
control->startMessage(CMD_CONNECTION_VALIDATION, 2*sizeof(int32)+sizeof(int16));
// receive buffer size
buffer->putInt(getReceiveBufferSize());
buffer->putInt(static_cast<int32>(getReceiveBufferSize()));
// socket receive buffer size
buffer->putInt(getSocketReceiveBufferSize());
buffer->putInt(static_cast<int32>(getSocketReceiveBufferSize()));
// connection priority
buffer->putShort(getPriority());

6
pvAccessApp/remote/blockingServerTCPTransport.cpp
View File

@@ -99,7 +99,7 @@ namespace pvAccess {
int BlockingServerTCPTransport::getChannelCount() {
Lock lock(_channelsMutex);
return _channels.size();
return static_cast<int>(_channels.size());
}
void BlockingServerTCPTransport::send(ByteBuffer* buffer,
@@ -123,10 +123,10 @@ namespace pvAccess {
control->startMessage(CMD_CONNECTION_VALIDATION, 2*sizeof(int32));
// receive buffer size
buffer->putInt(getReceiveBufferSize());
buffer->putInt(static_cast<int32>(getReceiveBufferSize()));
// socket receive buffer size
buffer->putInt(getSocketReceiveBufferSize());
buffer->putInt(static_cast<int32>(getSocketReceiveBufferSize()));
// send immediately
control->flush(true);

4
pvAccessApp/remote/blockingTCP.h
View File

@@ -315,12 +315,12 @@ namespace epics {
/**
* Remote side transport receive buffer size.
*/
int _remoteTransportReceiveBufferSize;
size_t _remoteTransportReceiveBufferSize;
/**
* Remote side transport socket receive buffer size.
*/
int _remoteTransportSocketReceiveBufferSize;
size_t _remoteTransportSocketReceiveBufferSize;

2
pvAccessApp/remote/blockingTCPConnector.cpp
View File

@@ -163,7 +163,7 @@ namespace epics {
_namedLocker.releaseSynchronizationObject(&address);
return transport;
} catch(std::exception& ex) {
} catch(std::exception&) {
if(transport.get())
transport->close();
else if(socket!=INVALID_SOCKET) epicsSocketDestroy(socket);

6
pvAccessApp/remote/blockingTCPTransport.cpp
View File

@@ -408,7 +408,7 @@ namespace pvAccess {
}
_sendBuffer->putInt(_lastMessageStartPosition+sizeof(int16)+2, payloadSize);
_sendBuffer->putInt(_lastMessageStartPosition+sizeof(int16)+2, (int32)payloadSize);
int flagsPosition = _lastMessageStartPosition+sizeof(int16);
// set segmented bit
@@ -552,7 +552,7 @@ namespace pvAccess {
// append segmented message header
startMessage(_lastSegmentedMessageCommand, 0);
// set segmented message size
_sendBuffer->putInt(_lastMessageStartPosition+sizeof(int16)+2, count);
_sendBuffer->putInt(_lastMessageStartPosition+sizeof(int16)+2, (int32)count);
// flush (TODO this is code is duplicated)
bool moreToSend = true;
@@ -1203,7 +1203,7 @@ namespace pvAccess {
flush(true);
else
endMessage(false);// automatic end (to set payload)
} catch(std::exception &e) {
} catch(std::exception &) {
//LOG(logLevelError, "%s", e.what());
_sendBuffer->setPosition(_lastMessageStartPosition);
} catch(...) {

2
pvAccessApp/remote/simpleChannelSearchManagerImpl.cpp
View File

@@ -99,7 +99,7 @@ void SimpleChannelSearchManagerImpl::cancel()
int32_t SimpleChannelSearchManagerImpl::registeredCount()
{
Lock guard(m_channelMutex);
return m_channels.size();
return static_cast<int32_t>(m_channels.size());
}
void SimpleChannelSearchManagerImpl::registerSearchInstance(SearchInstance::shared_pointer const & channel)