zeroc-ice 3.7.0 → 3.7.5

data/ext/ice/cpp/src/Ice/EndpointFactoryManager.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_ENDPOINT_FACTORY_MANAGER_H
 #define ICE_ENDPOINT_FACTORY_MANAGER_H

data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.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_ENDPOINT_FACTORY_MANAGER_F_H
 #define ICE_ENDPOINT_FACTORY_MANAGER_F_H

data/ext/ice/cpp/src/Ice/EndpointI.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/EndpointI.h>
 #include <Ice/OutputStream.h>
@@ -31,7 +26,7 @@ IceInternal::EndpointI::streamWrite(Ice::OutputStream* s) const
 }
 
 string
-IceInternal::EndpointI::toString() const
+IceInternal::EndpointI::toString() const ICE_NOEXCEPT
 {
     //
     // WARNING: Certain features, such as proxy validation in Glacier2,

data/ext/ice/cpp/src/Ice/EndpointI.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_ENDPOINT_I_H
 #define ICE_ENDPOINT_I_H
@@ -164,7 +159,7 @@ public:
     //
     virtual std::string options() const = 0;
 
-    virtual std::string toString() const;
+    virtual std::string toString() const ICE_NOEXCEPT;
     void initWithOptions(std::vector<std::string>&);
 
 protected:
@@ -196,19 +191,19 @@ public:
     }
 
     virtual Ice::Short
-    type() const
+    type() const ICE_NOEXCEPT
     {
         return _endpoint->type();
     }
 
     virtual bool
-    datagram() const
+    datagram() const ICE_NOEXCEPT
     {
         return _endpoint->datagram();
     }
 
     virtual bool
-    secure() const
+    secure() const ICE_NOEXCEPT
     {
         return _endpoint->secure();
     }

data/ext/ice/cpp/src/Ice/EndpointIF.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_ENDPOINT_I_F_H
 #define ICE_ENDPOINT_I_F_H

data/ext/ice/cpp/src/Ice/EndpointTypes.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/EventHandler.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/EventHandler.h>
 #include <Ice/Instance.h>

data/ext/ice/cpp/src/Ice/EventHandler.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_EVENT_HANDLER_H
 #define ICE_EVENT_HANDLER_H

data/ext/ice/cpp/src/Ice/EventHandlerF.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_EVENT_HANDLER_F_H
 #define ICE_EVENT_HANDLER_F_H

data/ext/ice/cpp/src/Ice/Exception.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/Exception.h>
 #include <Ice/LocalException.h>
@@ -82,8 +77,8 @@ throwUOE(const string& expectedType, const ValuePtr& v)
 
     string type = v->ice_id();
     throw Ice::UnexpectedObjectException(__FILE__, __LINE__,
-                                         "expected element of type `" + expectedType + "' but received '" +
-                                         type, type, expectedType);
+                                         "expected element of type `" + expectedType + "' but received `" +
+                                         type + "'", type, expectedType);
 }
 
 void
@@ -712,7 +707,7 @@ void
 Ice::NoValueFactoryException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: no suitable object factory found for `" << type << "'";
+    out << ":\nprotocol error: no suitable value factory found for `" << type << "'";
     if(!reason.empty())
     {
         out << ":\n" << reason;
@@ -793,28 +788,28 @@ void
 Ice::NotRegisteredException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\n no " << kindOfObject << " with id `" << id << "' is registered";
+    out << ":\nno " << kindOfObject << " with id `" << id << "' is registered";
 }
 
 void
 Ice::TwowayOnlyException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\n operation `" << operation << "' can only be invoked as a twoway request";
+    out << ":\noperation `" << operation << "' can only be invoked as a twoway request";
 }
 
 void
 Ice::CloneNotImplementedException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\n ice_clone() must be implemented in classes derived from abstract base classes";
+    out << ":\nice_clone() must be implemented in classes derived from abstract base classes";
 }
 
 void
 Ice::FeatureNotSupportedException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nfeature `" << unsupportedFeature << "' is not supported.";
+    out << ":\nfeature `" << unsupportedFeature << "' is not supported";
 }
 
 void

data/ext/ice/cpp/src/Ice/FacetMap.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/FactoryTable.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/FactoryTable.h>
 #include <Ice/ValueFactory.h>

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

data/ext/ice/cpp/src/Ice/GCObject.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/GCObject.h>
 
@@ -118,7 +113,7 @@ public:
 }
 
 bool
-ClearMembers::visit(GCObject* obj)
+ClearMembers::visit(GCObject*)
 {
     return true;
 }

data/ext/ice/cpp/src/Ice/HashUtil.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_HASH_UTIL_H
 #define ICE_HASH_UTIL_H
@@ -16,7 +11,7 @@ namespace IceInternal
 inline void
 hashAdd(Ice::Int& hashCode, Ice::Int value)
 {
-    hashCode = ((hashCode << 5) + hashCode) ^ (2654435761u * value);
+    hashCode = ((hashCode << 5) + hashCode) ^ static_cast<Ice::Int>(2654435761u) * value;
 }
 
 inline void

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

data/ext/ice/cpp/src/Ice/HttpParser.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_HTTP_PARSER_H
 #define ICE_HTTP_PARSER_H

data/ext/ice/cpp/src/Ice/IPEndpointI.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/IPEndpointI.h>
 #include <Ice/ProtocolInstance.h>
@@ -61,25 +56,25 @@ IceInternal::IPEndpointInfoI::~IPEndpointInfoI()
 }
 
 Ice::Short
-IceInternal::IPEndpointInfoI::type() const
+IceInternal::IPEndpointInfoI::type() const ICE_NOEXCEPT
 {
     return _endpoint->type();
 }
 
 bool
-IceInternal::IPEndpointInfoI::datagram() const
+IceInternal::IPEndpointInfoI::datagram() const ICE_NOEXCEPT
 {
     return _endpoint->datagram();
 }
 
 bool
-IceInternal::IPEndpointInfoI::secure() const
+IceInternal::IPEndpointInfoI::secure() const ICE_NOEXCEPT
 {
     return _endpoint->secure();
 }
 
 Ice::EndpointInfoPtr
-IceInternal::IPEndpointI::getInfo() const
+IceInternal::IPEndpointI::getInfo() const ICE_NOEXCEPT
 {
     Ice::IPEndpointInfoPtr info = ICE_MAKE_SHARED(IPEndpointInfoI, ICE_SHARED_FROM_CONST_THIS(IPEndpointI));
     fillEndpointInfo(info.get());
@@ -260,7 +255,18 @@ IceInternal::IPEndpointI::options() const
 
     if(isAddressValid(_sourceAddr))
     {
-        s << " --sourceAddress " << inetAddrToString(_sourceAddr);
+        const string sourceAddr = inetAddrToString(_sourceAddr);
+        bool addQuote = sourceAddr.find(':') != string::npos;
+        s << " --sourceAddress ";
+        if(addQuote)
+        {
+            s << "\"";
+        }
+        s << sourceAddr;
+        if(addQuote)
+        {
+            s << "\"";
+        }
     }
 
     return s.str();
@@ -426,9 +432,8 @@ IceInternal::IPEndpointI::initWithOptions(vector<string>& args, bool oaEndpoint)
         }
         else
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "`-h *' not valid for proxy endpoint `" + toString() + "'";
-            throw ex;
+            throw Ice::EndpointParseException(__FILE__, __LINE__, "`-h *' not valid for proxy endpoint `" + toString() +
+                                              "'");
         }
     }
 
@@ -436,9 +441,9 @@ IceInternal::IPEndpointI::initWithOptions(vector<string>& args, bool oaEndpoint)
     {
         if(oaEndpoint)
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "`--sourceAddress' not valid for object adapter endpoint `" + toString() + "'";
-            throw ex;
+            throw Ice::EndpointParseException(__FILE__, __LINE__,
+                                              "`--sourceAddress' not valid for object adapter endpoint `" + toString() +
+                                              "'");
         }
     }
     else if(!oaEndpoint)
@@ -454,9 +459,8 @@ IceInternal::IPEndpointI::checkOption(const string& option, const string& argume
     {
         if(argument.empty())
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "no argument provided for -h option in endpoint " + endpoint;
-            throw ex;
+            throw Ice::EndpointParseException(__FILE__, __LINE__, "no argument provided for -h option in endpoint " +
+                                              endpoint);
         }
         const_cast<string&>(_host) = argument;
     }
@@ -464,39 +468,36 @@ IceInternal::IPEndpointI::checkOption(const string& option, const string& argume
     {
         if(argument.empty())
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "no argument provided for -p option in endpoint " + endpoint;
-            throw ex;
+            throw Ice::EndpointParseException(__FILE__, __LINE__, "no argument provided for -p option in endpoint " +
+                                              endpoint);
         }
         istringstream p(argument);
         if(!(p >> const_cast<Ice::Int&>(_port)) || !p.eof())
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "invalid port value `" + argument + "' in endpoint " + endpoint;
-            throw ex;
+            throw Ice::EndpointParseException(__FILE__, __LINE__, "invalid port value `" + argument + "' in endpoint " +
+                                              endpoint);
         }
         else if(_port < 0 || _port > 65535)
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "port value `" + argument + "' out of range in endpoint " + endpoint;
-            throw ex;
+            throw Ice::EndpointParseException(__FILE__, __LINE__, "port value `" + argument +
+                                              "' out of range in endpoint " + endpoint);
         }
     }
     else if(option == "--sourceAddress")
     {
         if(argument.empty())
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "no argument provided for --sourceAddress option in endpoint " + endpoint;
-            throw ex;
+            throw Ice::EndpointParseException(__FILE__, __LINE__,
+                                              "no argument provided for --sourceAddress option in endpoint " +
+                                              endpoint);
         }
 #ifndef ICE_OS_UWP
         const_cast<Address&>(_sourceAddr) = getNumericAddress(argument);
         if(!isAddressValid(_sourceAddr))
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "invalid IP address provided for --sourceAddress option in endpoint " + endpoint;
-            throw ex;
+            throw Ice::EndpointParseException(__FILE__, __LINE__,
+                                              "invalid IP address provided for --sourceAddress option in endpoint " +
+                                              endpoint);
         }
 #endif
     }
@@ -543,30 +544,7 @@ IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& insta
     _preferIPv6(instance->preferIPv6()),
     _destroyed(false)
 {
-    __setNoDelete(true);
-    try
-    {
-        updateObserver();
-        bool hasPriority = _instance->initializationData().properties->getProperty("Ice.ThreadPriority") != "";
-        int priority = _instance->initializationData().properties->getPropertyAsInt("Ice.ThreadPriority");
-        if(hasPriority)
-        {
-            start(0, priority);
-        }
-        else
-        {
-            start();
-        }
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        {
-            Ice::Error out(_instance->initializationData().logger);
-            out << "cannot create thread for enpoint host resolver:\n" << ex;
-        }
-        throw;
-    }
-    __setNoDelete(false);
+    updateObserver();
 }
 
 void