From aa6bcecb1ab860e733c09e0360197aeb331cb703 Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Tue, 3 Dec 2013 12:08:45 +0100 Subject: [PATCH] win32: some warning removed --- pvAccessApp/ca/caChannel.cpp | 10 +++++----- pvAccessApp/factory/CreateRequestFactory.cpp | 2 +- pvAccessApp/pva/pvaConstants.h | 4 ++-- pvAccessApp/remote/abstractResponseHandler.cpp | 2 +- pvAccessApp/remote/blockingClientTCPTransport.cpp | 6 +++--- pvAccessApp/remote/blockingServerTCPTransport.cpp | 6 +++--- pvAccessApp/remote/blockingTCP.h | 4 ++-- pvAccessApp/remote/blockingTCPConnector.cpp | 2 +- pvAccessApp/remote/blockingTCPTransport.cpp | 6 +++--- pvAccessApp/remote/simpleChannelSearchManagerImpl.cpp | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pvAccessApp/ca/caChannel.cpp b/pvAccessApp/ca/caChannel.cpp index cc79500..455d448 100644 --- a/pvAccessApp/ca/caChannel.cpp +++ b/pvAccessApp/ca/caChannel.cpp @@ -518,7 +518,7 @@ CAChannelGet::CAChannelGet(CAChannel::shared_pointer const & _channel, channelGetRequester(_channelGetRequester), getType(getDBRType(pvRequest, _channel->getNativeType())), pvStructure(createPVStructure(_channel, getType)), - bitSet(new BitSet(pvStructure->getStructure()->getNumberFields())) + bitSet(new BitSet(static_cast(pvStructure->getStructure()->getNumberFields()))) { // TODO bitSet->set(0); @@ -936,7 +936,7 @@ CAChannelPut::CAChannelPut(CAChannel::shared_pointer const & _channel, channelPutRequester(_channelPutRequester), getType(getDBRType(pvRequest, _channel->getNativeType())), pvStructure(createPVStructure(_channel, getType)), - bitSet(new BitSet(pvStructure->getStructure()->getNumberFields())) + bitSet(new BitSet(static_cast(pvStructure->getStructure()->getNumberFields()))) { // NOTE: we require value type, we can only put value field bitSet->set(pvStructure->getSubField("value")->getFieldOffset()); @@ -996,7 +996,7 @@ int doPut_pvStructure(CAChannel::shared_pointer const & channel, void *usrArg, P std::tr1::static_pointer_cast(pvStructure->getScalarArrayField("value", sT)); const pT* val = value->view().data(); - int result = ca_array_put_callback(channel->getNativeType(), value->getLength(), + int result = ca_array_put_callback(channel->getNativeType(), static_cast(value->getLength()), channel->getChannelID(), val, ca_put_handler, usrArg); @@ -1230,8 +1230,8 @@ CAChannelMonitor::CAChannelMonitor(CAChannel::shared_pointer const & _channel, monitorRequester(_monitorRequester), getType(getDBRType(pvRequest, _channel->getNativeType())), pvStructure(createPVStructure(_channel, getType)), - changedBitSet(new BitSet(pvStructure->getStructure()->getNumberFields())), - overrunBitSet(new BitSet(pvStructure->getStructure()->getNumberFields())), + changedBitSet(new BitSet(static_cast(pvStructure->getStructure()->getNumberFields()))), + overrunBitSet(new BitSet(static_cast(pvStructure->getStructure()->getNumberFields()))), count(0), element(new MonitorElement()) { diff --git a/pvAccessApp/factory/CreateRequestFactory.cpp b/pvAccessApp/factory/CreateRequestFactory.cpp index 00d75bb..6943964 100644 --- a/pvAccessApp/factory/CreateRequestFactory.cpp +++ b/pvAccessApp/factory/CreateRequestFactory.cpp @@ -35,7 +35,7 @@ private: else str.erase(str.begin(), str.end()); } - static size_t findMatchingBrace(String& request, int index, int numOpen) { + static size_t findMatchingBrace(String& request, size_t index, int numOpen) { size_t openBrace = request.find('{', index+1); size_t closeBrace = request.find('}', index+1); if(openBrace == String::npos && closeBrace == std::string::npos) return std::string::npos; diff --git a/pvAccessApp/pva/pvaConstants.h b/pvAccessApp/pva/pvaConstants.h index 3e623d8..d95f088 100644 --- a/pvAccessApp/pva/pvaConstants.h +++ b/pvAccessApp/pva/pvaConstants.h @@ -23,7 +23,7 @@ namespace epics { namespace pvAccess { /** PVA protocol magic number */ - const epics::pvData::int8 PVA_MAGIC = 0xCA; + const epics::pvData::int8 PVA_MAGIC = static_cast(0xCA); /** PVA protocol revision (implemented by this library). */ const epics::pvData::int8 PVA_PROTOCOL_REVISION = 0; @@ -70,7 +70,7 @@ namespace pvAccess { const epics::pvData::uint32 MAX_CHANNEL_NAME_LENGTH = 500; /** Invalid data type. */ - const epics::pvData::int16 INVALID_DATA_TYPE = 0xFFFF; + const epics::pvData::int16 INVALID_DATA_TYPE = static_cast(0xFFFF); /** Invalid IOID. */ const epics::pvData::int32 INVALID_IOID = 0; diff --git a/pvAccessApp/remote/abstractResponseHandler.cpp b/pvAccessApp/remote/abstractResponseHandler.cpp index 60af2d0..2d36e1f 100644 --- a/pvAccessApp/remote/abstractResponseHandler.cpp +++ b/pvAccessApp/remote/abstractResponseHandler.cpp @@ -34,7 +34,7 @@ namespace epics { hexDump(prologue.str(), _description, (const int8*)payloadBuffer->getArray(), - payloadBuffer->getPosition(), payloadSize); + payloadBuffer->getPosition(), static_cast(payloadSize)); } } } diff --git a/pvAccessApp/remote/blockingClientTCPTransport.cpp b/pvAccessApp/remote/blockingClientTCPTransport.cpp index 660b0f2..ff6f2c6 100644 --- a/pvAccessApp/remote/blockingClientTCPTransport.cpp +++ b/pvAccessApp/remote/blockingClientTCPTransport.cpp @@ -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(getReceiveBufferSize())); // socket receive buffer size - buffer->putInt(getSocketReceiveBufferSize()); + buffer->putInt(static_cast(getSocketReceiveBufferSize())); // connection priority buffer->putShort(getPriority()); diff --git a/pvAccessApp/remote/blockingServerTCPTransport.cpp b/pvAccessApp/remote/blockingServerTCPTransport.cpp index fb448b0..9a7bc94 100644 --- a/pvAccessApp/remote/blockingServerTCPTransport.cpp +++ b/pvAccessApp/remote/blockingServerTCPTransport.cpp @@ -99,7 +99,7 @@ namespace pvAccess { int BlockingServerTCPTransport::getChannelCount() { Lock lock(_channelsMutex); - return _channels.size(); + return static_cast(_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(getReceiveBufferSize())); // socket receive buffer size - buffer->putInt(getSocketReceiveBufferSize()); + buffer->putInt(static_cast(getSocketReceiveBufferSize())); // send immediately control->flush(true); diff --git a/pvAccessApp/remote/blockingTCP.h b/pvAccessApp/remote/blockingTCP.h index 63a2ca5..35d9945 100644 --- a/pvAccessApp/remote/blockingTCP.h +++ b/pvAccessApp/remote/blockingTCP.h @@ -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; diff --git a/pvAccessApp/remote/blockingTCPConnector.cpp b/pvAccessApp/remote/blockingTCPConnector.cpp index 56f3788..44397d8 100644 --- a/pvAccessApp/remote/blockingTCPConnector.cpp +++ b/pvAccessApp/remote/blockingTCPConnector.cpp @@ -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); diff --git a/pvAccessApp/remote/blockingTCPTransport.cpp b/pvAccessApp/remote/blockingTCPTransport.cpp index 9d076ff..7109095 100644 --- a/pvAccessApp/remote/blockingTCPTransport.cpp +++ b/pvAccessApp/remote/blockingTCPTransport.cpp @@ -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(...) { diff --git a/pvAccessApp/remote/simpleChannelSearchManagerImpl.cpp b/pvAccessApp/remote/simpleChannelSearchManagerImpl.cpp index 96502c5..773a2bc 100644 --- a/pvAccessApp/remote/simpleChannelSearchManagerImpl.cpp +++ b/pvAccessApp/remote/simpleChannelSearchManagerImpl.cpp @@ -99,7 +99,7 @@ void SimpleChannelSearchManagerImpl::cancel() int32_t SimpleChannelSearchManagerImpl::registeredCount() { Lock guard(m_channelMutex); - return m_channels.size(); + return static_cast(m_channels.size()); } void SimpleChannelSearchManagerImpl::registerSearchInstance(SearchInstance::shared_pointer const & channel)