zeroc-ice 3.7.2 → 3.7.3

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

@@ -355,14 +355,8 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx,
     // In C++, LoggerAdminI does not keep a "logger" data member to avoid a hard-to-break circular
     // reference, so we retrieve the logger from Current
     //
-
     LoggerAdminLoggerIPtr logger = ICE_DYNAMIC_CAST(LoggerAdminLoggerI, current.adapter->getCommunicator()->getLogger());
-    if(!logger)
-    {
-        // Our logger is not installed - must be a bug
-        assert(0);
-        return;
-    }
+    assert(logger);
 
     RemoteLoggerPrxPtr remoteLogger = prx->ice_twoway();
 

data/ext/ice/cpp/src/Ice/LoggerF.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

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

@@ -11,6 +11,12 @@
 #include <Ice/LocalException.h>
 #include <IceUtil/FileUtil.h>
 
+#ifdef __IBMCPP__
+// Work-around for xlC visibility bug
+// See "ifstream::tellg visibility error" thread on IBM xlC forum
+extern template class std::fpos<char*>;
+#endif
+
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;

data/ext/ice/cpp/src/Ice/Metrics.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
@@ -495,7 +495,7 @@ IceMX::MetricsAdminPrx::_iceI_getMetricsView(const ::std::shared_ptr<::IceIntern
 
 /// \cond INTERNAL
 void
-IceMX::MetricsAdminPrx::_iceI_getMapMetricsFailures(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<MetricsFailuresSeq>>& outAsync, const ::std::string& iceP_view, const ::std::string& iceP_map, const ::Ice::Context& context)
+IceMX::MetricsAdminPrx::_iceI_getMapMetricsFailures(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::IceMX::MetricsFailuresSeq>>& outAsync, const ::std::string& iceP_view, const ::std::string& iceP_map, const ::Ice::Context& context)
 {
     _checkTwowayOnly(iceC_IceMX_MetricsAdmin_getMapMetricsFailures_name);
     outAsync->invoke(iceC_IceMX_MetricsAdmin_getMapMetricsFailures_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::SlicedFormat, context,
@@ -522,7 +522,7 @@ IceMX::MetricsAdminPrx::_iceI_getMapMetricsFailures(const ::std::shared_ptr<::Ic
 
 /// \cond INTERNAL
 void
-IceMX::MetricsAdminPrx::_iceI_getMetricsFailures(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<MetricsFailures>>& outAsync, const ::std::string& iceP_view, const ::std::string& iceP_map, const ::std::string& iceP_id, const ::Ice::Context& context)
+IceMX::MetricsAdminPrx::_iceI_getMetricsFailures(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::IceMX::MetricsFailures>>& outAsync, const ::std::string& iceP_view, const ::std::string& iceP_map, const ::std::string& iceP_id, const ::Ice::Context& context)
 {
     _checkTwowayOnly(iceC_IceMX_MetricsAdmin_getMetricsFailures_name);
     outAsync->invoke(iceC_IceMX_MetricsAdmin_getMetricsFailures_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::SlicedFormat, context,

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

@@ -46,7 +46,7 @@
 #   include <sys/ioctl.h>
 #endif
 
-#if defined(__linux) || defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
 #  include <ifaddrs.h>
 #elif defined(__sun)
 #  include <sys/sockio.h>
@@ -346,7 +346,7 @@ getLocalAddresses(ProtocolSupport protocol, bool includeLoopback, bool singleAdd
 
         free(adapter_addresses);
     }
-#elif defined(__linux) || defined(__APPLE__) || defined(__FreeBSD__)
+#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
     struct ifaddrs* ifap;
     if(::getifaddrs(&ifap) == SOCKET_ERROR)
     {
@@ -448,40 +448,40 @@ getLocalAddresses(ProtocolSupport protocol, bool includeLoopback, bool singleAdd
         numaddrs = ifc.ifc_len / static_cast<int>(sizeof(struct ifreq));
         struct ifreq* ifr = ifc.ifc_req;
         set<string> interfaces;
-        for(int i = 0; i < numaddrs; ++i)
+        for(int j = 0; j < numaddrs; ++j)
         {
-            if(!(ifr[i].ifr_flags & IFF_LOOPBACK)) // Don't include loopback interface addresses
+            if(!(ifr[j].ifr_flags & IFF_LOOPBACK)) // Don't include loopback interface addresses
             {
                 //
                 // On Solaris the above Loopback check does not always work so we double
                 // check the address below. Solaris also returns duplicate entries that need
                 // to be filtered out.
                 //
-                if(ifr[i].ifr_addr.sa_family == AF_INET && protocol != EnableIPv6)
+                if(ifr[j].ifr_addr.sa_family == AF_INET && protocol != EnableIPv6)
                 {
                     Address addr;
-                    memcpy(&addr.saStorage, &ifr[i].ifr_addr, sizeof(sockaddr_in));
+                    memcpy(&addr.saStorage, &ifr[j].ifr_addr, sizeof(sockaddr_in));
                     if(addr.saIn.sin_addr.s_addr != 0 &&
                        (includeLoopback || addr.saIn.sin_addr.s_addr != htonl(INADDR_LOOPBACK)))
                     {
-                        if(!singleAddressPerInterface || interfaces.find(ifr[i].ifr_name) == interfaces.end())
+                        if(!singleAddressPerInterface || interfaces.find(ifr[j].ifr_name) == interfaces.end())
                         {
                             result.push_back(addr);
-                            interfaces.insert(ifr[i].ifr_name);
+                            interfaces.insert(ifr[j].ifr_name);
                         }
                     }
                 }
-                else if(ifr[i].ifr_addr.sa_family == AF_INET6 && protocol != EnableIPv4)
+                else if(ifr[j].ifr_addr.sa_family == AF_INET6 && protocol != EnableIPv4)
                 {
                     Address addr;
-                    memcpy(&addr.saStorage, &ifr[i].ifr_addr, sizeof(sockaddr_in6));
+                    memcpy(&addr.saStorage, &ifr[j].ifr_addr, sizeof(sockaddr_in6));
                     if(!IN6_IS_ADDR_UNSPECIFIED(&addr.saIn6.sin6_addr) &&
                        (includeLoopback || !IN6_IS_ADDR_LOOPBACK(&addr.saIn6.sin6_addr)))
                     {
-                        if(!singleAddressPerInterface || interfaces.find(ifr[i].ifr_name) == interfaces.end())
+                        if(!singleAddressPerInterface || interfaces.find(ifr[j].ifr_name) == interfaces.end())
                         {
                             result.push_back(addr);
-                            interfaces.insert(ifr[i].ifr_name);
+                            interfaces.insert(ifr[j].ifr_name);
                         }
                     }
                 }
@@ -648,7 +648,7 @@ getInterfaceIndex(const string& intf)
     //
     if(isAddr)
     {
-#  if defined(__linux) || defined(__APPLE__) || defined(__FreeBSD__)
+#  if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
         struct ifaddrs* ifap;
         if(::getifaddrs(&ifap) != SOCKET_ERROR)
         {
@@ -660,7 +660,7 @@ getInterfaceIndex(const string& intf)
                     struct sockaddr_in6* ipv6Addr = reinterpret_cast<struct sockaddr_in6*>(curr->ifa_addr);
                     if(memcmp(&addr, &ipv6Addr->sin6_addr, sizeof(in6_addr)) == 0)
                     {
-                        index = if_nametoindex(curr->ifa_name);
+                        index = static_cast<int>(if_nametoindex(curr->ifa_name));
                         break;
                     }
                 }
@@ -725,7 +725,7 @@ getInterfaceIndex(const string& intf)
                     struct sockaddr_in6* ipv6Addr = reinterpret_cast<struct sockaddr_in6*>(&ifr[i].ifr_addr);
                     if(memcmp(&addr, &ipv6Addr->sin6_addr, sizeof(in6_addr)) == 0)
                     {
-                        index = if_nametoindex(ifr[i].ifr_name);
+                        index = static_cast<int>(if_nametoindex(ifr[i].ifr_name));
                         break;
                     }
                 }
@@ -736,7 +736,7 @@ getInterfaceIndex(const string& intf)
     }
     else // Look for an interface with the given name.
     {
-        index = if_nametoindex(name.c_str());
+        index = static_cast<int>(if_nametoindex(name.c_str()));
     }
     if(index <= 0)
     {
@@ -1821,7 +1821,8 @@ IceInternal::inetAddrToString(const Address& ss)
 
     char namebuf[1024];
     namebuf[0] = '\0';
-    getnameinfo(&ss.sa, size, namebuf, static_cast<socklen_t>(sizeof(namebuf)), 0, 0, NI_NUMERICHOST);
+    getnameinfo(&ss.sa, static_cast<socklen_t>(size), namebuf, static_cast<socklen_t>(sizeof(namebuf)), 0, 0,
+                NI_NUMERICHOST);
     return string(namebuf);
 #else
     if(ss.host == nullptr)
@@ -2161,7 +2162,7 @@ IceInternal::setMcastGroup(SOCKET fd, const Address& group, const string& intf)
                 indexes.insert(index);
                 struct ipv6_mreq mreq;
                 mreq.ipv6mr_multiaddr = group.saIn6.sin6_addr;
-                mreq.ipv6mr_interface = index;
+                mreq.ipv6mr_interface = static_cast<unsigned int>(index);
                 rc = setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, reinterpret_cast<char*>(&mreq), int(sizeof(mreq)));
             }
         }
@@ -2404,7 +2405,7 @@ IceInternal::doBind(SOCKET fd, const Address& addr, const string&)
     int size = getAddressStorageSize(addr);
     assert(size != 0);
 
-    if(::bind(fd, &addr.sa, size) == SOCKET_ERROR)
+    if(::bind(fd, &addr.sa, static_cast<socklen_t>(size)) == SOCKET_ERROR)
     {
         closeSocketNoThrow(fd);
         throw SocketException(__FILE__, __LINE__, getSocketErrno());
@@ -2626,7 +2627,7 @@ repeatConnect:
     int size = getAddressStorageSize(addr);
     assert(size != 0);
 
-    if(::connect(fd, &addr.sa, size) == SOCKET_ERROR)
+    if(::connect(fd, &addr.sa, static_cast<socklen_t>(size)) == SOCKET_ERROR)
     {
         if(interrupted())
         {
@@ -2653,7 +2654,7 @@ repeatConnect:
         }
     }
 
-#if defined(__linux)
+#if defined(__linux__)
     //
     // Prevent self connect (self connect happens on Linux when a client tries to connect to
     // a server which was just deactivated if the client socket re-uses the same ephemeral
@@ -2722,7 +2723,7 @@ IceInternal::doFinishConnect(SOCKET fd)
         }
     }
 
-#if defined(__linux)
+#if defined(__linux__)
     //
     // Prevent self connect (self connect happens on Linux when a client tries to connect to
     // a server which was just deactivated if the client socket re-uses the same ephemeral

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

@@ -38,7 +38,7 @@ typedef int ssize_t;
 #   include <netdb.h>
 #endif
 
-#if defined(__linux) && !defined(ICE_NO_EPOLL)
+#if defined(__linux__) && !defined(ICE_NO_EPOLL)
 #   define ICE_USE_EPOLL 1
 #elif (defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && TARGET_OS_IPHONE == 0 && !defined(ICE_NO_KQUEUE)
 #   define ICE_USE_KQUEUE 1

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

@@ -0,0 +1,57 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#ifdef ICE_SWIFT
+
+#include <Ice/OSLogLoggerI.h>
+#include <os/log.h>
+
+using namespace std;
+using namespace Ice;
+
+Ice::OSLogLoggerI::OSLogLoggerI(const std::string& prefix) : _prefix(prefix)
+{
+    const string subsystem = prefix.empty() ? "com.zeroc.ice" : "com.zeroc.ice." + prefix;
+    _log.reset(os_log_create(subsystem.c_str(), ""));
+}
+
+void
+Ice::OSLogLoggerI::print(const std::string& message)
+{
+    os_log_with_type(_log.get(), OS_LOG_TYPE_DEFAULT, "%{public}s.", message.c_str());
+}
+
+void
+Ice::OSLogLoggerI::trace(const std::string& category, const std::string& message)
+{
+    const string subsystem = _prefix.empty() ? "com.zeroc.ice" : "com.zeroc.ice." + _prefix;
+    IceInternal::UniqueRef<os_log_t> log(os_log_create(subsystem.c_str(), category.c_str()));
+    os_log_with_type(log.get(), OS_LOG_TYPE_INFO, "%{public}s.", message.c_str());
+}
+
+void
+Ice::OSLogLoggerI::warning(const std::string& message)
+{
+    os_log_with_type(_log.get(), OS_LOG_TYPE_ERROR, "%{public}s.", message.c_str());
+}
+
+void
+Ice::OSLogLoggerI::error(const std::string& message)
+{
+    os_log_with_type(_log.get(), OS_LOG_TYPE_FAULT, "%{public}s.", message.c_str());
+}
+
+std::string
+Ice::OSLogLoggerI::getPrefix()
+{
+    return _prefix;
+}
+
+LoggerPtr
+Ice::OSLogLoggerI::cloneWithPrefix(const std::string& prefix)
+{
+    return ICE_MAKE_SHARED(OSLogLoggerI, prefix);
+}
+
+#endif

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

@@ -0,0 +1,40 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#ifndef ICE_OSLOG_LOGGER_I_H
+#define ICE_OSLOG_LOGGER_I_H
+
+#ifdef ICE_SWIFT
+
+#include <Ice/Logger.h>
+#include <Ice/UniqueRef.h>
+#include <os/log.h>
+
+namespace Ice
+{
+
+class OSLogLoggerI : public Logger
+{
+public:
+
+    OSLogLoggerI(const std::string&);
+
+    virtual void print(const std::string&);
+    virtual void trace(const std::string&, const std::string&);
+    virtual void warning(const std::string&);
+    virtual void error(const std::string&);
+    virtual std::string getPrefix();
+    virtual LoggerPtr cloneWithPrefix(const std::string&);
+
+private:
+
+    const std::string _prefix;
+    IceInternal::UniqueRef<os_log_t> _log;
+};
+
+}
+
+#endif
+
+#endif

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

@@ -155,7 +155,14 @@ Ice::Object::_iceD_ice_ids(Incoming& inS, const Current& current)
     inS.readEmptyParams();
     vector<string> ret = ice_ids(current);
     OutputStream* ostr = inS.startWriteParams();
-    ostr->write(&ret[0], &ret[0] + ret.size(), false);
+    if(ret.empty())
+    {
+        ostr->write(ret);
+    }
+    else
+    {
+        ostr->write(&ret[0], &ret[0] + ret.size(), false);
+    }
     inS.endWriteParams();
     return true;
 }
@@ -319,17 +326,12 @@ Ice::Object::_iceCheckMode(OperationMode expected, OperationMode received)
 {
     if(expected != received)
     {
+        assert(expected != ICE_ENUM(OperationMode, Nonmutating)); // We never expect Nonmutating
         if(expected == ICE_ENUM(OperationMode, Idempotent) && received == ICE_ENUM(OperationMode, Nonmutating))
         {
             //
             // Fine: typically an old client still using the deprecated nonmutating keyword
             //
-
-            //
-            // Note that expected == Nonmutating and received == Idempotent is not ok:
-            // the server may still use the deprecated nonmutating keyword to detect updates
-            // and the client should not break this (deprecated) feature.
-            //
         }
         else
         {

data/ext/ice/cpp/src/Ice/ObjectAdapter.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/ObjectAdapterF.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

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

@@ -735,6 +735,18 @@ Ice::ObjectAdapterI::setPublishedEndpoints(const EndpointSeq& newEndpoints)
     }
 }
 
+#ifdef ICE_SWIFT
+dispatch_queue_t
+Ice::ObjectAdapterI::getDispatchQueue() const
+{
+    IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+
+    checkForDeactivation();
+
+    return getThreadPool()->getDispatchQueue();
+}
+#endif
+
 bool
 Ice::ObjectAdapterI::isLocal(const ObjectPrxPtr& proxy) const
 {
@@ -921,7 +933,7 @@ Ice::ObjectAdapterI::setAdapterOnConnection(const Ice::ConnectionIPtr& connectio
 //
 // COMPILERFIX: The ObjectAdapterI setup is broken out into a separate initialize
 // function because when it was part of the constructor C++Builder 2010 apps would
-// crash if an execption was thrown from any calls within the constructor.
+// crash if an exception was thrown from any calls within the constructor.
 //
 Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const CommunicatorPtr& communicator,
                                     const ObjectAdapterFactoryPtr& objectAdapterFactory, const string& name,