zeroc-ice 3.7.0 → 3.7.5

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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_IP_ENDPOINT_I_H
 #define ICE_IP_ENDPOINT_I_H
@@ -34,9 +29,9 @@ public:
     IPEndpointInfoI(const EndpointIPtr&);
     virtual ~IPEndpointInfoI();
 
-    virtual Ice::Short type() const;
-    virtual bool datagram() const;
-    virtual bool secure() const;
+    virtual Ice::Short type() const ICE_NOEXCEPT;
+    virtual bool datagram() const ICE_NOEXCEPT;
+    virtual bool secure() const ICE_NOEXCEPT;
 
 private:
 
@@ -52,7 +47,7 @@ public:
 
     virtual void streamWriteImpl(Ice::OutputStream*) const;
 
-    virtual Ice::EndpointInfoPtr getInfo() const;
+    virtual Ice::EndpointInfoPtr getInfo() const ICE_NOEXCEPT;
     virtual Ice::Short type() const;
     virtual const std::string& protocol() const;
     virtual bool secure() const;

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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_IP_ENDPOINT_I_F_H
 #define ICE_IP_ENDPOINT_I_F_H

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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/IconvStringConverter.h>
 

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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.0
+// Ice version 3.7.5
 //
 // <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 < 0
+#   if ICE_INT_VERSION % 100 < 5
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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.0
+// Ice version 3.7.5
 //
 // <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 < 0
+#   if ICE_INT_VERSION % 100 < 5
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -69,7 +64,9 @@ Ice::ImplicitContext::~ImplicitContext()
 {
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::ImplicitContext* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(ImplicitContext* p) { return p; }
+/// \endcond
 
 namespace Ice
 {

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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.0
+// Ice version 3.7.5
 //
 // <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 < 0
+#   if ICE_INT_VERSION % 100 < 5
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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/ImplicitContextI.h>
 #include <Ice/OutputStream.h>
@@ -39,7 +34,6 @@ private:
     IceUtil::Mutex _mutex;
 };
 
-#ifndef ICE_OS_UWP
 class PerThreadImplicitContext : public ImplicitContextI
 {
 public:
@@ -103,7 +97,6 @@ private:
     size_t _index; // index in all SlotVector
     long _id; // corresponds to owner in the Slot
 };
-#endif
 }
 
 extern "C" void iceImplicitContextThreadDestructor(void*);
@@ -121,24 +114,17 @@ ImplicitContextI::create(const std::string& kind)
     }
     else if(kind == "PerThread")
     {
-#ifndef ICE_OS_UWP
         return ICE_MAKE_SHARED(PerThreadImplicitContext);
-#else
-        throw InitializationException(__FILE__, __LINE__,
-                                      "'PerThread' Ice.ImplicitContext isn't supported for UWP.");
-        return 0; // Keep the compiler happy.
-#endif
     }
     else
     {
         throw Ice::InitializationException(
             __FILE__, __LINE__,
             "'" + kind + "' is not a valid value for Ice.ImplicitContext");
-        return 0; // Keep the compiler happy.
     }
 }
 
-#if defined(_WIN32) && !defined(ICE_OS_UWP)
+#if defined(_WIN32)
 void
 ImplicitContextI::cleanupThread()
 {
@@ -259,7 +245,6 @@ SharedImplicitContext::combine(const Context& proxyCtx, Context& ctx) const
 //
 // PerThreadImplicitContext implementation
 //
-#ifndef ICE_OS_UWP
 long PerThreadImplicitContext::_nextId;
 long PerThreadImplicitContext::_destroyedIds;
 size_t PerThreadImplicitContext::_slotVectors;
@@ -486,7 +471,7 @@ PerThreadImplicitContext::clearThreadContext() const
 #   ifdef _WIN32
             if(TlsSetValue(_key, 0) == 0)
             {
-                IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
+                throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
             }
 #   else
             if(int err = pthread_setspecific(_key, 0))
@@ -668,5 +653,3 @@ extern "C" void iceImplicitContextThreadDestructor(void* v)
         }
     }
 }
-
-#endif

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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_IMPLICIT_CONTEXT_I_H
 #define ICE_IMPLICIT_CONTEXT_I_H

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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/Incoming.h>
 #include <Ice/IncomingAsync.h>
@@ -64,9 +59,12 @@ IceInternal::IncomingBase::IncomingBase(Instance* instance, ResponseHandler* res
     _current.con = connection;
 #endif
     _current.requestId = requestId;
+    _current.encoding.major = 0;
+    _current.encoding.minor = 0;
 }
 
 IceInternal::IncomingBase::IncomingBase(IncomingBase& other) :
+    IceUtil::noncopyable(), // TODO, remove noncopyable base class
     _current(other._current),
     _servant(other._servant),
     _locator(other._locator),
@@ -389,7 +387,7 @@ IceInternal::IncomingBase::handleException(const std::exception& exc, bool amd)
             _responseHandler->sendNoResponse();
         }
     }
-    else if(const UserException* ex = dynamic_cast<const UserException*>(&exc))
+    else if(const UserException* uex = dynamic_cast<const UserException*>(&exc))
     {
         _observer.userException();
 
@@ -402,7 +400,7 @@ IceInternal::IncomingBase::handleException(const std::exception& exc, bool amd)
             _os.write(_current.requestId);
             _os.write(replyUserException);
             _os.startEncapsulation(_current.encoding, _format);
-            _os.write(*ex);
+            _os.write(*uex);
             _os.endEncapsulation();
             _observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4));
             _responseHandler->sendResponse(_current.requestId, &_os, _compress, amd);
@@ -454,11 +452,11 @@ IceInternal::IncomingBase::handleException(const std::exception& exc, bool amd)
                 }
                 _os.write(str.str(), false);
             }
-            else if(const UserException* ue = dynamic_cast<const UserException*>(&exc))
+            else if(const UserException* use = dynamic_cast<const UserException*>(&exc))
             {
                 _os.write(replyUnknownUserException);
                 ostringstream str;
-                str << *ue;
+                str << *use;
                 if(IceUtilInternal::printStackTraces)
                 {
                     str <<  '\n' << ex->ice_stackTrace();
@@ -659,11 +657,11 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, InputStre
     if(obsv)
     {
         // Read the parameter encapsulation size.
-        Ice::Int sz;
-        _is->read(sz);
+        Ice::Int encapsSize;
+        _is->read(encapsSize);
         _is->i -= 4;
 
-        _observer.attach(obsv->getDispatchObserver(_current, static_cast<Int>(_is->i - start + sz)));
+        _observer.attach(obsv->getDispatchObserver(_current, static_cast<Int>(_is->i - start + encapsSize)));
     }
 
     //

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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/IncomingAsync.h>
 #include <Ice/ServantLocator.h>

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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_INCOMING_REQUEST_H
 #define ICE_INCOMING_REQUEST_H

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

@@ -1,14 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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 <IceUtil/DisableWarnings.h>
 #include <Ice/CommunicatorI.h>
 #include <Ice/PropertiesI.h>
 #include <Ice/Initialize.h>
@@ -419,7 +413,7 @@ Ice::CommunicatorHolder::operator=(shared_ptr<Communicator> communicator)
 }
 
 Ice::CommunicatorHolder&
-Ice::CommunicatorHolder::operator=(CommunicatorHolder&& other)
+Ice::CommunicatorHolder::operator=(CommunicatorHolder&& other) noexcept
 {
     if(_communicator)
     {
@@ -576,11 +570,12 @@ Ice::stringToIdentity(const string& s)
     // Find unescaped separator; note that the string may contain an escaped
     // backslash before the separator.
     //
-    string::size_type slash = string::npos, pos = 0;
+    string::size_type slash = string::npos;
+    string::size_type pos = 0;
     while((pos = s.find('/', pos)) != string::npos)
     {
-        int escapes = 0;
-        while(static_cast<int>(pos) - escapes > 0 && s[pos - escapes - 1] == '\\')
+        string::size_type escapes = 0;
+        while(static_cast<int>(pos - escapes) > 0 && s[pos - escapes - 1] == '\\')
         {
             escapes++;
         }
@@ -599,9 +594,7 @@ Ice::stringToIdentity(const string& s)
                 //
                 // Extra unescaped slash found.
                 //
-                IdentityParseException ex(__FILE__, __LINE__);
-                ex.str = "unescaped '/' in identity `" + s + "'";
-                throw ex;
+                throw IdentityParseException(__FILE__, __LINE__, "unescaped '/' in identity `" + s + "'");
             }
         }
         pos++;
@@ -613,11 +606,9 @@ Ice::stringToIdentity(const string& s)
         {
             ident.name = unescapeString(s, 0, s.size(), "/");
         }
-        catch(const IceUtil::IllegalArgumentException& e)
+        catch(const IceUtil::IllegalArgumentException& ex)
         {
-            IdentityParseException ex(__FILE__, __LINE__);
-            ex.str = "invalid identity name `" + s + "': " + e.reason();
-            throw ex;
+            throw IdentityParseException(__FILE__, __LINE__, "invalid identity name `" + s + "': " + ex.reason());
         }
     }
     else
@@ -626,11 +617,10 @@ Ice::stringToIdentity(const string& s)
         {
             ident.category = unescapeString(s, 0, slash, "/");
         }
-        catch(const IceUtil::IllegalArgumentException& e)
+        catch(const IceUtil::IllegalArgumentException& ex)
         {
-            IdentityParseException ex(__FILE__, __LINE__);
-            ex.str = "invalid category in identity `" + s + "': " + e.reason();
-            throw ex;
+            throw IdentityParseException(__FILE__, __LINE__, "invalid category in identity `" + s + "': " +
+                                         ex.reason());
         }
 
         if(slash + 1 < s.size())
@@ -639,11 +629,10 @@ Ice::stringToIdentity(const string& s)
             {
                 ident.name = unescapeString(s, slash + 1, s.size(), "/");
             }
-            catch(const IceUtil::IllegalArgumentException& e)
+            catch(const IceUtil::IllegalArgumentException& ex)
             {
-                IdentityParseException ex(__FILE__, __LINE__);
-                ex.str = "invalid name in identity `" + s + "': " + e.reason();
-                throw ex;
+                throw IdentityParseException(__FILE__, __LINE__, "invalid name in identity `" + s + "': " +
+                                             ex.reason());
             }
         }
     }

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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/InputStream.h>
@@ -224,22 +219,22 @@ Ice::InputStream::setCompactIdResolver(const CompactIdResolverPtr& r)
 
 #ifndef ICE_CPP11_MAPPING
 void
-Ice::InputStream::setCollectObjects(bool b)
+Ice::InputStream::setCollectObjects(bool on)
 {
-    _collectObjects = b;
+    _collectObjects = on;
 }
 #endif
 
 void
-Ice::InputStream::setSliceValues(bool b)
+Ice::InputStream::setSliceValues(bool on)
 {
-    _sliceValues = b;
+    _sliceValues = on;
 }
 
 void
-Ice::InputStream::setTraceSlicing(bool b)
+Ice::InputStream::setTraceSlicing(bool on)
 {
-    _traceSlicing = b;
+    _traceSlicing = on;
 }
 
 void
@@ -336,7 +331,7 @@ Ice::InputStream::skipEncapsulation()
     EncodingVersion encoding;
     read(encoding.major);
     read(encoding.minor);
-    i += sz - sizeof(Int) - 2;
+    i += static_cast<size_t>(sz) - sizeof(Int) - 2;
     return encoding;
 }
 
@@ -437,7 +432,7 @@ Ice::InputStream::read(std::vector<Ice::Byte>& v)
     read(p);
     if(p.first != p.second)
     {
-        v.resize(static_cast<Ice::Int>(p.second - p.first));
+        v.resize(static_cast<size_t>(p.second - p.first));
         copy(p.first, p.second, v.begin());
     }
     else
@@ -468,7 +463,7 @@ Ice::InputStream::read(vector<bool>& v)
     Int sz = readAndCheckSeqSize(1);
     if(sz > 0)
     {
-        v.resize(sz);
+        v.resize(static_cast<size_t>(sz));
         copy(i, i + sz, v.begin());
         i += sz;
     }
@@ -486,7 +481,7 @@ struct ReadBoolHelper
 {
     static bool* read(pair<const bool*, const bool*>& v, Int sz, InputStream::Container::iterator& i)
     {
-        bool* array = new bool[sz];
+        bool* array = new bool[static_cast<size_t>(sz)];
         for(int idx = 0; idx < sz; ++idx)
         {
             array[idx] = static_cast<bool>(*(i + idx));
@@ -576,7 +571,7 @@ Ice::InputStream::read(vector<Short>& v)
     {
         Container::iterator begin = i;
         i += sz * static_cast<int>(sizeof(Short));
-        v.resize(sz);
+        v.resize(static_cast<size_t>(sz));
 #ifdef ICE_BIG_ENDIAN
         const Byte* src = &(*begin);
         Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Short) - 1;
@@ -656,7 +651,7 @@ Ice::InputStream::read(vector<Int>& v)
     {
         Container::iterator begin = i;
         i += sz * static_cast<int>(sizeof(Int));
-        v.resize(sz);
+        v.resize(static_cast<size_t>(sz));
 #ifdef ICE_BIG_ENDIAN
         const Byte* src = &(*begin);
         Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Int) - 1;
@@ -773,7 +768,7 @@ Ice::InputStream::read(vector<Long>& v)
     {
         Container::iterator begin = i;
         i += sz * static_cast<int>(sizeof(Long));
-        v.resize(sz);
+        v.resize(static_cast<size_t>(sz));
 #ifdef ICE_BIG_ENDIAN
         const Byte* src = &(*begin);
         Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Long) - 1;
@@ -890,7 +885,7 @@ Ice::InputStream::read(vector<Float>& v)
     {
         Container::iterator begin = i;
         i += sz * static_cast<int>(sizeof(Float));
-        v.resize(sz);
+        v.resize(static_cast<size_t>(sz));
 #ifdef ICE_BIG_ENDIAN
         const Byte* src = &(*begin);
         Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Float) - 1;
@@ -988,16 +983,6 @@ Ice::InputStream::read(Double& v)
     *dest = *src;
 #else
     Byte* dest = reinterpret_cast<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++;
@@ -1006,7 +991,6 @@ Ice::InputStream::read(Double& v)
     *dest++ = *src++;
     *dest++ = *src++;
     *dest = *src;
-#  endif
 #endif
 }
 
@@ -1018,7 +1002,7 @@ Ice::InputStream::read(vector<Double>& v)
     {
         Container::iterator begin = i;
         i += sz * static_cast<int>(sizeof(Double));
-        v.resize(sz);
+        v.resize(static_cast<size_t>(sz));
 #ifdef ICE_BIG_ENDIAN
         const Byte* src = &(*begin);
         Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Double) - 1;
@@ -1034,21 +1018,6 @@ Ice::InputStream::read(vector<Double>& v)
             *dest-- = *src++;
             dest += 2 * sizeof(Double);
         }
-#elif defined(ICE_LITTLEBYTE_BIGWORD)
-        const Byte* src = &(*begin);
-        Byte* dest = reinterpret_cast<Byte*>(&v[0]);
-        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
         copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
 #endif
@@ -1104,22 +1073,6 @@ Ice::InputStream::read(pair<const Double*, const Double*>& v, IceUtil::ScopedArr
             *dest-- = *src++;
             dest += 2 * sizeof(Double);
         }
-#  elif defined(ICE_LITTLEBYTE_BIGWORD)
-        const Byte* src = &(*begin);
-        Byte* dest = reinterpret_cast<Byte*>(&result[0]);
-        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
         copy(begin, i, reinterpret_cast<Byte*>(&result[0]));
 #  endif
@@ -1313,8 +1266,8 @@ Ice::InputStream::read(vector<string>& v, bool convert)
     Int sz = readAndCheckSeqSize(1);
     if(sz > 0)
     {
-        v.resize(sz);
-        for(int j = 0; j < sz; ++j)
+        v.resize(static_cast<size_t>(sz));
+        for(size_t j = 0; j < static_cast<size_t>(sz); ++j)
         {
             read(v[j], convert);
         }
@@ -1365,11 +1318,11 @@ Ice::InputStream::read(wstring& v)
 void
 Ice::InputStream::read(vector<wstring>& v)
 {
-    Int sz = readAndCheckSeqSize(1);
+    size_t sz = static_cast<size_t>(readAndCheckSeqSize(1));
     if(sz > 0)
     {
         v.resize(sz);
-        for(int j = 0; j < sz; ++j)
+        for(size_t j = 0; j < sz; ++j)
         {
             read(v[j]);
         }
@@ -1526,7 +1479,7 @@ Ice::InputStream::skipOptional(OptionalFormat type)
         }
         case ICE_SCOPED_ENUM(OptionalFormat, VSize):
         {
-            skip(readSize());
+            skip(static_cast<size_t>(readSize()));
             break;
         }
         case ICE_SCOPED_ENUM(OptionalFormat, FSize):
@@ -1537,7 +1490,7 @@ Ice::InputStream::skipOptional(OptionalFormat type)
             {
                 throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
             }
-            skip(sz);
+            skip(static_cast<size_t>(sz));
             break;
         }
         case ICE_SCOPED_ENUM(OptionalFormat, Class):
@@ -1866,12 +1819,17 @@ Ice::InputStream::EncapsDecoder::addPatchEntry(Int index, PatchFunc patchFunc, v
     assert(index > 0);
 
     //
-    // Check if we already unmarshaled the object. If that's the case,
-    // just patch the object smart pointer and we're done.
+    // Check if we already unmarshaled the object. If that's the case, just patch the object smart pointer
+    // and we're done. A null value indicates we've encountered a cycle and Ice.AllowClassCycles is false.
     //
     IndexToPtrMap::iterator p = _unmarshaledMap.find(index);
     if(p != _unmarshaledMap.end())
     {
+        if (p->second == ICE_NULLPTR)
+        {
+            assert(!_stream->_instance->acceptClassCycles());
+            throw MarshalException(__FILE__, __LINE__, "cycle detected during Value unmarshaling");
+        }
         (*patchFunc)(patchAddr, p->second);
         return;
     }
@@ -1909,7 +1867,10 @@ Ice::InputStream::EncapsDecoder::unmarshal(Int index, const Ice::ValuePtr& v)
     // Add the object to the map of unmarshaled instances, this must
     // be done before reading the instances (for circular references).
     //
-    _unmarshaledMap.insert(make_pair(index, v));
+    // If circular references are not allowed we insert null (for cycle detection) and add
+    // the object to the map once it has been fully unmarshaled.
+    //
+    _unmarshaledMap.insert(make_pair(index, _stream->_instance->acceptClassCycles() ? v : Ice::ValuePtr()));
 
     //
     // Read the object.
@@ -1962,6 +1923,13 @@ Ice::InputStream::EncapsDecoder::unmarshal(Int index, const Ice::ValuePtr& v)
             _valueList.clear();
         }
     }
+
+    if(!_stream->_instance->acceptClassCycles())
+    {
+        // This class has been fully unmarshaled without creating any cycles
+        // It can be added to the map now.
+        _unmarshaledMap[index] = v;
+    }
 }
 
 void
@@ -2163,7 +2131,7 @@ Ice::InputStream::EncapsDecoder10::skipSlice()
 {
     _stream->traceSkipSlice(_typeId, _sliceType);
     assert(_sliceSize >= 4);
-    _stream->skip(_sliceSize - sizeof(Int));
+    _stream->skip(static_cast<size_t>(_sliceSize) - sizeof(Int));
 }
 
 void
@@ -2493,7 +2461,7 @@ Ice::InputStream::EncapsDecoder11::endSlice()
     //
     if(_current->sliceFlags & FLAG_HAS_INDIRECTION_TABLE)
     {
-        IndexList indirectionTable(_stream->readAndCheckSeqSize(1));
+        IndexList indirectionTable(static_cast<size_t>(_stream->readAndCheckSeqSize(1)));
         for(IndexList::iterator p = indirectionTable.begin(); p != indirectionTable.end(); ++p)
         {
             *p = readInstance(_stream->readSize(), 0, 0);
@@ -2524,7 +2492,7 @@ Ice::InputStream::EncapsDecoder11::endSlice()
             {
                 throw MarshalException(__FILE__, __LINE__, "indirection out of range");
             }
-            addPatchEntry(indirectionTable[p->index], p->patchFunc, p->patchAddr);
+            addPatchEntry(indirectionTable[static_cast<size_t>(p->index)], p->patchFunc, p->patchAddr);
         }
         _current->indirectPatchList.clear();
     }
@@ -2540,7 +2508,7 @@ Ice::InputStream::EncapsDecoder11::skipSlice()
     if(_current->sliceFlags & FLAG_HAS_SLICE_SIZE)
     {
         assert(_current->sliceSize >= 4);
-        _stream->skip(_current->sliceSize - sizeof(Int));
+        _stream->skip(static_cast<size_t>(_current->sliceSize) - sizeof(Int));
     }
     else
     {
@@ -2591,7 +2559,7 @@ Ice::InputStream::EncapsDecoder11::skipSlice()
     if(_current->sliceFlags & FLAG_HAS_INDIRECTION_TABLE)
     {
         IndexList& table = _current->indirectionTables.back();
-        table.resize(_stream->readAndCheckSeqSize(1));
+        table.resize(static_cast<size_t>(_stream->readAndCheckSeqSize(1)));
         for(IndexList::iterator p = table.begin(); p != table.end(); ++p)
         {
             *p = readInstance(_stream->readSize(), 0, 0);