zeroc-ice 3.7.1 → 3.7.6

data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -37,10 +32,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -38,10 +33,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -92,7 +87,7 @@ public:
      * @param compress Specifies whether or not compression should be used if available when using this endpoint.
      */
     EndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress) :
-        ::Ice::EndpointInfo(::std::move(underlying), timeout, compress)
+        ::Ice::EndpointInfo(underlying, timeout, compress)
     {
     }
 };
@@ -157,6 +152,11 @@ public:
         ::Ice::EndpointInfo(underlying, timeout, compress)
     {
     }
+
+#ifdef ICE_CPP11_COMPILER
+    EndpointInfo(const EndpointInfo&) = default;
+    EndpointInfo& operator=(const EndpointInfo&) = default;
+#endif
 };
 
 /// \cond INTERNAL

data/ext/ice/cpp/src/Ice/ACM.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ACM.h>
 #include <Ice/ConnectionI.h>
@@ -43,41 +38,41 @@ IceInternal::ACMConfig::ACMConfig(const Ice::PropertiesPtr& p,
     else
     {
         timeoutProperty = prefix + ".Timeout";
-    };
+    }
 
-    int timeout = p->getPropertyAsIntWithDefault(timeoutProperty, static_cast<int>(dflt.timeout.toSeconds()));
-    if(timeout >= 0)
+    int timeoutVal = p->getPropertyAsIntWithDefault(timeoutProperty, static_cast<int>(dflt.timeout.toSeconds()));
+    if(timeoutVal >= 0)
     {
-        this->timeout = IceUtil::Time::seconds(timeout);
+        timeout = IceUtil::Time::seconds(timeoutVal);
     }
     else
     {
         l->warning("invalid value for property `" + timeoutProperty + "', default value will be used instead");
-        this->timeout = dflt.timeout;
+        timeout = dflt.timeout;
     }
 
     int hb = p->getPropertyAsIntWithDefault(prefix + ".Heartbeat", static_cast<int>(dflt.heartbeat));
     if(hb >= static_cast<int>(ICE_ENUM(ACMHeartbeat, HeartbeatOff)) &&
        hb <= static_cast<int>(ICE_ENUM(ACMHeartbeat, HeartbeatAlways)))
     {
-        this->heartbeat = static_cast<Ice::ACMHeartbeat>(hb);
+        heartbeat = static_cast<Ice::ACMHeartbeat>(hb);
     }
     else
     {
         l->warning("invalid value for property `" + prefix + ".Heartbeat" + "', default value will be used instead");
-        this->heartbeat = dflt.heartbeat;
+        heartbeat = dflt.heartbeat;
     }
 
     int cl = p->getPropertyAsIntWithDefault(prefix + ".Close", static_cast<int>(dflt.close));
     if(cl >= static_cast<int>(ICE_ENUM(ACMClose, CloseOff)) &&
        cl <= static_cast<int>(ICE_ENUM(ACMClose, CloseOnIdleForceful)))
     {
-        this->close = static_cast<Ice::ACMClose>(cl);
+        close = static_cast<Ice::ACMClose>(cl);
     }
     else
     {
         l->warning("invalid value for property `" + prefix + ".Close" + "', default value will be used instead");
-        this->close = dflt.close;
+        close = dflt.close;
     }
 }
 
@@ -319,8 +314,11 @@ IceInternal::ConnectionACMMonitor::add(const ConnectionIPtr& connection)
 }
 
 void
-IceInternal::ConnectionACMMonitor::remove(const ConnectionIPtr& connection)
+IceInternal::ConnectionACMMonitor::remove(ICE_MAYBE_UNUSED const ConnectionIPtr& connection)
 {
+#ifdef _MSC_VER
+    UNREFERENCED_PARAMETER(connection);
+#endif
     Lock sync(*this);
     assert(_connection == connection);
     if(_config.timeout != IceUtil::Time())

data/ext/ice/cpp/src/Ice/ACM.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ACM_H
 #define ICE_ACM_H

data/ext/ice/cpp/src/Ice/ACMF.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ACM_F_H
 #define ICE_ACM_F_H

data/ext/ice/cpp/src/Ice/Acceptor.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Acceptor.h>
 

data/ext/ice/cpp/src/Ice/Acceptor.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ACCEPTOR_H
 #define ICE_ACCEPTOR_H

data/ext/ice/cpp/src/Ice/AcceptorF.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ACCEPTOR_F_H
 #define ICE_ACCEPTOR_F_H

data/ext/ice/cpp/src/Ice/ArgVector.cpp

@@ -1,22 +1,17 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ArgVector.h>
 #include <cstring>
 
-IceInternal::ArgVector::ArgVector(int argc, const char* const argv[])
+IceInternal::ArgVector::ArgVector(int argcP, const char* const argvP[])
 {
-    assert(argc >= 0);
-    _args.resize(argc);
-    for(int i = 0; i < argc; ++i)
+    assert(argcP >= 0);
+    _args.resize(static_cast<size_t>(argcP));
+    for(size_t i = 0; i < static_cast<size_t>(argcP); ++i)
     {
-        _args[i] = argv[i];
+        _args[i] = argvP[i];
     }
     setupArgcArgv();
 }
@@ -52,11 +47,11 @@ void
 IceInternal::ArgVector::setupArgcArgv()
 {
     argc = static_cast<int>(_args.size());
-    if((argv = new char*[argc + 1]) == 0)
+    if((argv = new char*[static_cast<size_t>(argc + 1)]) == 0)
     {
         throw ::std::bad_alloc();
     }
-    for(int i = 0; i < argc; i++)
+    for(size_t i = 0; i < static_cast<size_t>(argc); i++)
     {
         argv[i] = const_cast<char*>(_args[i].c_str());
     }

data/ext/ice/cpp/src/Ice/ArgVector.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ARGVECTOR_H
 #define ICE_ARGVECTOR_H

data/ext/ice/cpp/src/Ice/AsyncResult.cpp

@@ -1,15 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_CPP11_MAPPING
 
-#include <IceUtil/DisableWarnings.h>
 #include <Ice/AsyncResult.h>
 #include <Ice/Proxy.h>
 

data/ext/ice/cpp/src/Ice/Base64.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Base64.h>
 #include <iterator>
@@ -54,8 +49,8 @@ IceInternal::Base64::encode(const vector<unsigned char>& plainSeq)
         }
 
         by4 = by1 >> 2;
-        by5 = ((by1 & 0x3) << 4) | (by2 >> 4);
-        by6 = ((by2 & 0xf) << 2) | (by3 >> 6);
+        by5 = static_cast<unsigned char>((by1 & 0x3) << 4) | (by2 >> 4);
+        by6 = static_cast<unsigned char>((by2 & 0xf) << 2) | (by3 >> 6);
         by7 = by3 & 0x3f;
 
         retval += encode(by4);
@@ -137,7 +132,6 @@ IceInternal::Base64::decode(const string& str)
 
     for(size_t i = 0; i < newStr.length(); i += 4)
     {
-        c1 = 'A';
         c2 = 'A';
         c3 = 'A';
         c4 = 'A';
@@ -164,16 +158,16 @@ IceInternal::Base64::decode(const string& str)
         by3 = decode(c3);
         by4 = decode(c4);
 
-        retval.push_back((by1 << 2) | (by2 >> 4));
+        retval.push_back(static_cast<unsigned char>(by1 << 2) | (by2 >> 4));
 
         if(c3 != '=')
         {
-            retval.push_back(((by2 & 0xf) << 4) | (by3 >> 2));
+            retval.push_back(static_cast<unsigned char>((by2 & 0xf) << 4) | (by3 >> 2));
         }
 
         if(c4 != '=')
         {
-            retval.push_back(((by3 & 0x3) << 6) | by4);
+            retval.push_back(static_cast<unsigned char>((by3 & 0x3) << 6) | by4);
         }
     }
 
@@ -221,17 +215,17 @@ IceInternal::Base64::encode(unsigned char uc)
 {
     if(uc < 26)
     {
-        return 'A' + uc;
+        return 'A' + static_cast<char>(uc);
     }
 
     if(uc < 52)
     {
-        return 'a' + (uc - 26);
+        return 'a' + static_cast<char>(uc) - 26;
     }
 
     if(uc < 62)
     {
-        return '0' + (uc - 52);
+        return '0' + static_cast<char>(uc) - 52;
     }
 
     if(uc == 62)
@@ -247,17 +241,17 @@ IceInternal::Base64::decode(char c)
 {
     if(c >= 'A' && c <= 'Z')
     {
-        return c - 'A';
+        return static_cast<unsigned char>(c - 'A');
     }
 
     if(c >= 'a' && c <= 'z')
     {
-        return c - 'a' + 26;
+        return static_cast<unsigned char>(c - 'a' + 26);
     }
 
     if(c >= '0' && c <= '9')
     {
-        return c - '0' + 52;
+        return static_cast<unsigned char>(c - '0' + 52);
     }
 
     if(c == '+')

data/ext/ice/cpp/src/Ice/Base64.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BASE_64_H
 #define ICE_BASE_64_H

data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/BatchRequestQueue.h>
 #include <Ice/Instance.h>
@@ -81,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;

data/ext/ice/cpp/src/Ice/BatchRequestQueue.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BATCH_REQUEST_QUEUE_H
 #define ICE_BATCH_REQUEST_QUEUE_H

data/ext/ice/cpp/src/Ice/Buffer.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Buffer.h>
 #include <Ice/LocalException.h>
@@ -32,8 +27,8 @@ IceInternal::Buffer::Container::Container() :
 
 IceInternal::Buffer::Container::Container(const_iterator beg, const_iterator end) :
     _buf(const_cast<iterator>(beg)),
-    _size(end - beg),
-    _capacity(end - beg),
+    _size(static_cast<size_t>(end - beg)),
+    _capacity(static_cast<size_t>(end - beg)),
     _shrinkCounter(0),
     _owned(false)
 {