diff options
Diffstat (limited to 'cpp/src/IceSSL/SecureTransportTransceiverI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/SecureTransportTransceiverI.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp index 7d33252b749..bbb7715e9f0 100644 --- a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +++ b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp @@ -212,8 +212,10 @@ IceSSL::SecureTransport::TransceiverI::initialize(IceInternal::Buffer& readBuffe // if(_delegate->getNativeInfo()->fd() != INVALID_SOCKET) { - _maxSendPacketSize = std::max(512, IceInternal::getSendBufferSize(_delegate->getNativeInfo()->fd())); - _maxRecvPacketSize = std::max(512, IceInternal::getRecvBufferSize(_delegate->getNativeInfo()->fd())); + _maxSendPacketSize = + static_cast<size_t>(std::max(512, IceInternal::getSendBufferSize(_delegate->getNativeInfo()->fd()))); + _maxRecvPacketSize = + static_cast<size_t>(std::max(512, IceInternal::getRecvBufferSize(_delegate->getNativeInfo()->fd()))); } else { @@ -289,7 +291,7 @@ IceSSL::SecureTransport::TransceiverI::initialize(IceInternal::Buffer& readBuffe throw ProtocolException(__FILE__, __LINE__, os.str()); } - for(int i = 0, count = SecTrustGetCertificateCount(_trust.get()); i < count; ++i) + for(CFIndex i = 0, count = SecTrustGetCertificateCount(_trust.get()); i < count; ++i) { SecCertificateRef cert = SecTrustGetCertificateAtIndex(_trust.get(), i); CFRetain(cert); @@ -583,7 +585,7 @@ IceSSL::SecureTransport::TransceiverI::writeRaw(const char* data, size_t* length IceInternal::SocketOperation op = _delegate->write(buf); if(op == IceInternal::SocketOperationWrite) { - *length = buf.i - buf.b.begin(); + *length = static_cast<size_t>(buf.i - buf.b.begin()); _tflags |= SSLWantWrite; return errSSLWouldBlock; } @@ -616,7 +618,7 @@ IceSSL::SecureTransport::TransceiverI::readRaw(char* data, size_t* length) const IceInternal::SocketOperation op = _delegate->read(buf); if(op == IceInternal::SocketOperationRead) { - *length = buf.i - buf.b.begin(); + *length = static_cast<size_t>(buf.i - buf.b.begin()); _tflags |= SSLWantRead; return errSSLWouldBlock; } |