diff options
| author | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
| commit | c5959fd09de61604bedd75354401df6a57395d65 (patch) | |
| tree | 3b0227f631c8b20fb1a1a274b92f63f52f34af2c /cpp/src/Ice/BatchRequestQueue.cpp | |
| parent | Small fix (diff) | |
| parent | Enable -Wconversion with clang - Close #363 (diff) | |
| download | ice-c5959fd09de61604bedd75354401df6a57395d65.tar.bz2 ice-c5959fd09de61604bedd75354401df6a57395d65.tar.xz ice-c5959fd09de61604bedd75354401df6a57395d65.zip | |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'cpp/src/Ice/BatchRequestQueue.cpp')
| -rw-r--r-- | cpp/src/Ice/BatchRequestQueue.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/BatchRequestQueue.cpp b/cpp/src/Ice/BatchRequestQueue.cpp index 32ba60cc0f9..5fb44746696 100644 --- a/cpp/src/Ice/BatchRequestQueue.cpp +++ b/cpp/src/Ice/BatchRequestQueue.cpp @@ -76,7 +76,7 @@ BatchRequestQueue::BatchRequestQueue(const InstancePtr& instance, bool datagram) if(_maxSize > 0 && datagram) { const Ice::InitializationData& initData = instance->initializationData(); - size_t udpSndSize = initData.properties->getPropertyAsIntWithDefault("Ice.UDP.SndSize", 65535 - udpOverhead); + size_t udpSndSize = static_cast<size_t>(initData.properties->getPropertyAsIntWithDefault("Ice.UDP.SndSize", 65535 - udpOverhead)); if(udpSndSize < _maxSize) { _maxSize = udpSndSize; |