zeroc-ice 3.7.1 → 3.7.6

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

@@ -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>
 //
@@ -39,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 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/ObserverHelper.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/ObserverHelper.h>
 #include <Ice/Reference.h>

data/ext/ice/cpp/src/Ice/OpaqueEndpointI.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/OpaqueEndpointI.h>
 #include <Ice/OutputStream.h>
@@ -57,7 +52,7 @@ class OpaqueEndpointInfoI : public Ice::OpaqueEndpointInfo
 {
 public:
 
-    OpaqueEndpointInfoI(Ice::Short type, const Ice::EncodingVersion& rawEncoding, const Ice::ByteSeq& rawByes);
+    OpaqueEndpointInfoI(Ice::Short type, const Ice::EncodingVersion& rawEncoding, const Ice::ByteSeq& rawBytes);
 
     virtual Ice::Short
     type() const ICE_NOEXCEPT
@@ -86,9 +81,9 @@ private:
 //
 // COMPILERFIX: inlining this constructor causes crashes with gcc 4.0.1.
 //
-OpaqueEndpointInfoI::OpaqueEndpointInfoI(Ice::Short type, const Ice::EncodingVersion& rawEncoding,
-                                         const Ice::ByteSeq& rawBytes) :
-    Ice::OpaqueEndpointInfo(ICE_NULLPTR, -1, false, rawEncoding, rawBytes),
+OpaqueEndpointInfoI::OpaqueEndpointInfoI(Ice::Short type, const Ice::EncodingVersion& rawEncodingP,
+                                         const Ice::ByteSeq& rawBytesP) :
+    Ice::OpaqueEndpointInfo(ICE_NULLPTR, -1, false, rawEncodingP, rawBytesP),
     _type(type)
 {
 }

data/ext/ice/cpp/src/Ice/OpaqueEndpointI.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_UNKNOWN_ENDPOINT_I_H
 #define ICE_UNKNOWN_ENDPOINT_I_H

data/ext/ice/cpp/src/Ice/OutgoingAsync.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/OutgoingAsync.h>
 #include <Ice/ConnectionI.h>
@@ -369,9 +364,9 @@ OutgoingAsyncBase::cancel(const Ice::LocalException& ex)
     CancellationHandlerPtr handler;
     {
         Lock sync(_m);
-        ICE_SET_EXCEPTION_FROM_CLONE(_cancellationException, ex.ice_clone());
         if(!_cancellationHandler)
         {
+            ICE_SET_EXCEPTION_FROM_CLONE(_cancellationException, ex.ice_clone());
             return;
         }
         handler = _cancellationHandler;
@@ -643,7 +638,7 @@ ProxyOutgoingAsyncBase::cancelable(const CancellationHandlerPtr& handler)
 }
 
 void
-ProxyOutgoingAsyncBase::retryException(const Exception& ex)
+ProxyOutgoingAsyncBase::retryException(const Exception&)
 {
     try
     {
@@ -907,7 +902,7 @@ OutgoingAsync::prepare(const string& operation, OperationMode mode, const Contex
 
 #if defined(_MSC_VER) && (_MSC_VER <= 1600)
     //
-    // COMPILERFIX VC90 and VC100 get confused with namespaces and we need to
+    // COMPILERFIX v90 and v100 get confused with namespaces and we need to
     // defined both Ice::noExplicitContext and IceProxy::Ice::noExplicitContext
     // see comments in Ice/Proxy.h.
     //
@@ -1036,6 +1031,7 @@ OutgoingAsync::response()
                 ex->facet = facet;
                 ex->operation = operation;
                 ex->ice_throw();
+                break;
             }
 
             case replyUnknownException:
@@ -1075,6 +1071,7 @@ OutgoingAsync::response()
 
                 ex->unknown = unknown;
                 ex->ice_throw();
+                break;
             }
 
             default:

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

@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// 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 <IceUtil/DisableWarnings.h>
 #include <Ice/OutputStream.h>
 #include <Ice/DefaultsAndOverrides.h>
 #include <Ice/Instance.h>
@@ -48,7 +42,7 @@ public:
             //
             // Return unused bytes
             //
-            _stream.resize(firstUnused - _stream.b.begin());
+            _stream.resize(static_cast<size_t>(firstUnused - _stream.b.begin()));
         }
 
         //
@@ -261,8 +255,8 @@ Ice::OutputStream::write(const Byte* begin, const Byte* end)
     if(sz > 0)
     {
         Container::size_type pos = b.size();
-        resize(pos + sz);
-        memcpy(&b[pos], begin, sz);
+        resize(pos + static_cast<size_t>(sz));
+        memcpy(&b[pos], begin, static_cast<size_t>(sz));
     }
 }
 
@@ -274,7 +268,7 @@ Ice::OutputStream::write(const vector<bool>& v)
     if(sz > 0)
     {
         Container::size_type pos = b.size();
-        resize(pos + sz);
+        resize(pos + static_cast<size_t>(sz));
         copy(v.begin(), v.end(), b.begin() + pos);
     }
 }
@@ -287,9 +281,9 @@ struct WriteBoolHelper
 {
     static void write(const bool* begin, OutputStream::Container::size_type pos, OutputStream::Container& b, Int sz)
     {
-        for(int idx = 0; idx < sz; ++idx)
+        for(size_t idx = 0; idx < static_cast<size_t>(sz); ++idx)
         {
-           b[pos + idx] = static_cast<Byte>(*(begin + idx));
+            b[pos + idx] = static_cast<Byte>(*(begin + idx));
         }
     }
 };
@@ -299,7 +293,7 @@ struct WriteBoolHelper<1>
 {
     static void write(const bool* begin, OutputStream::Container::size_type pos, OutputStream::Container& b, Int sz)
     {
-        memcpy(&b[pos], begin, sz);
+        memcpy(&b[pos], begin, static_cast<size_t>(sz));
     }
 };
 
@@ -313,7 +307,7 @@ Ice::OutputStream::write(const bool* begin, const bool* end)
     if(sz > 0)
     {
         Container::size_type pos = b.size();
-        resize(pos + sz);
+        resize(pos + static_cast<size_t>(sz));
         WriteBoolHelper<sizeof(bool)>::write(begin, pos, b, sz);
     }
 }
@@ -343,7 +337,7 @@ Ice::OutputStream::write(const Short* begin, const Short* end)
     if(sz > 0)
     {
         Container::size_type pos = b.size();
-        resize(pos + sz * sizeof(Short));
+        resize(pos + static_cast<size_t>(sz) * sizeof(Short));
 #ifdef ICE_BIG_ENDIAN
         const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Short) - 1;
         Byte* dest = &(*(b.begin() + pos));
@@ -354,7 +348,7 @@ Ice::OutputStream::write(const Short* begin, const Short* end)
             src += 2 * sizeof(Short);
         }
 #else
-        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Short));
+        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), static_cast<size_t>(sz) * sizeof(Short));
 #endif
     }
 }
@@ -367,7 +361,7 @@ Ice::OutputStream::write(const Int* begin, const Int* end)
     if(sz > 0)
     {
         Container::size_type pos = b.size();
-        resize(pos + sz * sizeof(Int));
+        resize(pos + static_cast<size_t>(sz) * sizeof(Int));
 #ifdef ICE_BIG_ENDIAN
         const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Int) - 1;
         Byte* dest = &(*(b.begin() + pos));
@@ -380,7 +374,7 @@ Ice::OutputStream::write(const Int* begin, const Int* end)
             src += 2 * sizeof(Int);
         }
 #else
-        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Int));
+        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), static_cast<size_t>(sz) * sizeof(Int));
 #endif
     }
 }
@@ -422,7 +416,7 @@ Ice::OutputStream::write(const Long* begin, const Long* end)
     if(sz > 0)
     {
         Container::size_type pos = b.size();
-        resize(pos + sz * sizeof(Long));
+        resize(pos + static_cast<size_t>(sz) * sizeof(Long));
 #ifdef ICE_BIG_ENDIAN
         const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Long) - 1;
         Byte* dest = &(*(b.begin() + pos));
@@ -439,7 +433,7 @@ Ice::OutputStream::write(const Long* begin, const Long* end)
             src += 2 * sizeof(Long);
         }
 #else
-        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Long));
+        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), static_cast<size_t>(sz) * sizeof(Long));
 #endif
     }
 }
@@ -473,7 +467,7 @@ Ice::OutputStream::write(const Float* begin, const Float* end)
     if(sz > 0)
     {
         Container::size_type pos = b.size();
-        resize(pos + sz * sizeof(Float));
+        resize(pos + static_cast<size_t>(sz) * sizeof(Float));
 #ifdef ICE_BIG_ENDIAN
         const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Float) - 1;
         Byte* dest = &(*(b.begin() + pos));
@@ -486,7 +480,7 @@ Ice::OutputStream::write(const Float* begin, const Float* end)
             src += 2 * sizeof(Float);
         }
 #else
-        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Float));
+        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), static_cast<size_t>(sz) * sizeof(Float));
 #endif
     }
 }
@@ -509,16 +503,6 @@ Ice::OutputStream::write(Double v)
     *dest = *src;
 #else
     const Byte* src = reinterpret_cast<const Byte*>(&v);
-#  if defined(ICE_LITTLEBYTE_BIGWORD)
-    dest[4] = *src++;
-    dest[5] = *src++;
-    dest[6] = *src++;
-    dest[7] = *src++;
-    dest[0] = *src++;
-    dest[1] = *src++;
-    dest[2] = *src++;
-    dest[3] = *src;
-#  else
     *dest++ = *src++;
     *dest++ = *src++;
     *dest++ = *src++;
@@ -527,7 +511,6 @@ Ice::OutputStream::write(Double v)
     *dest++ = *src++;
     *dest++ = *src++;
     *dest = *src;
-#  endif
 #endif
 }
 
@@ -539,7 +522,7 @@ Ice::OutputStream::write(const Double* begin, const Double* end)
     if(sz > 0)
     {
         Container::size_type pos = b.size();
-        resize(pos + sz * sizeof(Double));
+        resize(pos + static_cast<size_t>(sz) * sizeof(Double));
 #ifdef ICE_BIG_ENDIAN
         const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Double) - 1;
         Byte* dest = &(*(b.begin() + pos));
@@ -555,23 +538,8 @@ Ice::OutputStream::write(const Double* begin, const Double* end)
             *dest++ = *src--;
             src += 2 * sizeof(Double);
         }
-#elif defined(ICE_LITTLEBYTE_BIGWORD)
-        const Byte* src = reinterpret_cast<const Byte*>(begin);
-        Byte* dest = &(*(b.begin() + pos));
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            dest[4] = *src++;
-            dest[5] = *src++;
-            dest[6] = *src++;
-            dest[7] = *src++;
-            dest[0] = *src++;
-            dest[1] = *src++;
-            dest[2] = *src++;
-            dest[3] = *src++;
-            dest += sizeof(Double);
-        }
 #else
-        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Double));
+        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), static_cast<size_t>(sz) * sizeof(Double));
 #endif
     }
 }
@@ -637,7 +605,7 @@ Ice::OutputStream::writeConverted(const char* vdata, size_t vsize)
 
         if(lastByte != b.end())
         {
-            resize(lastByte - b.begin());
+            resize(static_cast<size_t>(lastByte - b.begin()));
         }
         size_t lastIndex = b.size();
 
@@ -655,14 +623,14 @@ Ice::OutputStream::writeConverted(const char* vdata, size_t vsize)
                 // Use memmove instead of memcpy since the source and destination typically overlap.
                 //
                 resize(b.size() + 4);
-                memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize);
+                memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, static_cast<size_t>(actualSize));
             }
             else if(guessedSize > 254 && actualSize <= 254)
             {
                 //
                 // Move the UTF-8 sequence 4 bytes back
                 //
-                memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize);
+                memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, static_cast<size_t>(actualSize));
                 resize(b.size() - 4);
             }
 
@@ -689,9 +657,9 @@ Ice::OutputStream::write(const string* begin, const string* end, bool convert)
     writeSize(sz);
     if(sz > 0)
     {
-        for(int i = 0; i < sz; ++i)
+        for(int j = 0; j < sz; ++j)
         {
-            write(begin[i], convert);
+            write(begin[j], convert);
         }
     }
 }
@@ -732,7 +700,7 @@ Ice::OutputStream::write(const wstring& v)
 
         if(lastByte != b.end())
         {
-            resize(lastByte - b.begin());
+            resize(static_cast<size_t>(lastByte - b.begin()));
         }
         size_t lastIndex = b.size();
 
@@ -750,14 +718,14 @@ Ice::OutputStream::write(const wstring& v)
                 // Use memmove instead of memcpy since the source and destination typically overlap.
                 //
                 resize(b.size() + 4);
-                memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize);
+                memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, static_cast<size_t>(actualSize));
             }
             else if(guessedSize > 254 && actualSize <= 254)
             {
                 //
                 // Move the UTF-8 sequence 4 bytes back
                 //
-                memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize);
+                memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, static_cast<size_t>(actualSize));
                 resize(b.size() - 4);
             }
 
@@ -784,9 +752,9 @@ Ice::OutputStream::write(const wstring* begin, const wstring* end)
     writeSize(sz);
     if(sz > 0)
     {
-        for(int i = 0; i < sz; ++i)
+        for(int j = 0; j < sz; ++j)
         {
-            write(begin[i]);
+            write(begin[j]);
         }
     }
 }

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

@@ -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>
 //
@@ -39,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 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -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