zeroc-ice 3.7.2 → 3.7.3

data/ext/ice/cpp/include/generated/Ice/RouterF.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -33,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/include/generated/Ice/ServantLocator.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -34,10 +34,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -32,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -32,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/include/generated/Ice/ValueFactory.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -32,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/include/generated/Ice/Version.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -32,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -61,15 +61,14 @@ namespace Ice
  */
 struct ProtocolVersion
 {
-    Byte major;
-    Byte minor;
+    ::Ice::Byte major;
+    ::Ice::Byte minor;
 
     /**
-     * Obtains a tuple containing all of the exception's data members.
+     * Obtains a tuple containing all of the struct's data members.
      * @return The data members in a tuple.
      */
-
-    std::tuple<const Byte&, const Byte&> ice_tuple() const
+    std::tuple<const ::Ice::Byte&, const ::Ice::Byte&> ice_tuple() const
     {
         return std::tie(major, minor);
     }
@@ -81,15 +80,14 @@ struct ProtocolVersion
  */
 struct EncodingVersion
 {
-    Byte major;
-    Byte minor;
+    ::Ice::Byte major;
+    ::Ice::Byte minor;
 
     /**
-     * Obtains a tuple containing all of the exception's data members.
+     * Obtains a tuple containing all of the struct's data members.
      * @return The data members in a tuple.
      */
-
-    std::tuple<const Byte&, const Byte&> ice_tuple() const
+    std::tuple<const ::Ice::Byte&, const ::Ice::Byte&> ice_tuple() const
     {
         return std::tie(major, minor);
     }
@@ -156,8 +154,8 @@ namespace Ice
  */
 struct ProtocolVersion
 {
-    Byte major;
-    Byte minor;
+    ::Ice::Byte major;
+    ::Ice::Byte minor;
 
     bool operator==(const ProtocolVersion& rhs_) const
     {
@@ -225,8 +223,8 @@ struct ProtocolVersion
  */
 struct EncodingVersion
 {
-    Byte major;
-    Byte minor;
+    ::Ice::Byte major;
+    ::Ice::Byte minor;
 
     bool operator==(const EncodingVersion& rhs_) const
     {

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -35,10 +35,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -32,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -33,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -8,8 +8,8 @@
 IceInternal::ArgVector::ArgVector(int argcP, const char* const argvP[])
 {
     assert(argcP >= 0);
-    _args.resize(argcP);
-    for(int i = 0; i < argcP; ++i)
+    _args.resize(static_cast<size_t>(argcP));
+    for(size_t i = 0; i < static_cast<size_t>(argcP); ++i)
     {
         _args[i] = argvP[i];
     }
@@ -51,7 +51,7 @@ IceInternal::ArgVector::setupArgcArgv()
     {
         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/Base64.cpp

@@ -49,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);
@@ -132,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';
@@ -159,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);
         }
     }
 
@@ -216,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)
@@ -242,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/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;

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

@@ -27,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)
 {

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -34,10 +34,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -38,10 +38,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -32,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif