zeroc-ice 3.7.9.1 → 3.7.10

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

@@ -21,13 +21,13 @@ class WSAcceptor : public Acceptor, public NativeInfo
 public:
 
     virtual NativeInfoPtr getNativeInfo();
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     virtual AsyncInfo* getAsyncInfo(SocketOperation);
 #endif
 
     virtual void close();
     virtual EndpointIPtr listen();
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     virtual void startAccept();
     virtual void finishAccept();
 #endif

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

@@ -128,49 +128,6 @@ Long ice_nlltoh(const Byte* src)
     return v;
 }
 
-#if defined(ICE_OS_UWP)
-Short htons(Short v)
-{
-    Short result;
-    Byte* dest = reinterpret_cast<Byte*>(&result);
-
-    //
-    // Transfer a short in network (big-endian) order.
-    //
-#ifdef ICE_BIG_ENDIAN
-    const Byte* src = reinterpret_cast<const Byte*>(&v);
-    *dest++ = *src++;
-    *dest = *src;
-#else
-    const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Short) - 1;
-    *dest++ = *src--;
-    *dest = *src;
-#endif
-    return result;
-}
-
-Short ntohs(Short value)
-{
-    const Byte* src = reinterpret_cast<Byte*>(&value);
-    Short v;
-
-    //
-    // Extract a 64-bit integer in network (big-endian) order.
-    //
-#ifdef ICE_BIG_ENDIAN
-    Byte* dest = reinterpret_cast<Byte*>(&v);
-    *dest++ = *src++;
-    *dest = *src;
-#else
-    Byte* dest = reinterpret_cast<Byte*>(&v) + sizeof(Short) - 1;
-    *dest-- = *src++;
-    *dest = *src;
-#endif
-
-    return v;
-}
-#endif
-
 }
 
 NativeInfoPtr
@@ -179,7 +136,7 @@ IceInternal::WSTransceiver::getNativeInfo()
     return _delegate->getNativeInfo();
 }
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
 AsyncInfo*
 IceInternal::WSTransceiver::getAsyncInfo(SocketOperation status)
 {
@@ -641,7 +598,7 @@ IceInternal::WSTransceiver::read(Buffer& buf)
     return s;
 }
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
 bool
 IceInternal::WSTransceiver::startWrite(Buffer& buf)
 {

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

@@ -24,7 +24,7 @@ class WSTransceiver : public Transceiver
 public:
 
     virtual NativeInfoPtr getNativeInfo();
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     virtual AsyncInfo* getAsyncInfo(SocketOperation);
 #endif
 
@@ -33,7 +33,7 @@ public:
     virtual void close();
     virtual SocketOperation write(Buffer&);
     virtual SocketOperation read(Buffer&);
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     virtual bool startWrite(Buffer&);
     virtual void finishWrite(Buffer&);
     virtual void startRead(Buffer&);

data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -37,7 +37,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -42,7 +42,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -38,7 +38,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -44,7 +44,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp

@@ -23,7 +23,7 @@ IceSSL::AcceptorI::getNativeInfo()
     return _delegate->getNativeInfo();
 }
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
 IceInternal::AsyncInfo*
 IceSSL::AcceptorI::getAsyncInfo(IceInternal::SocketOperation status)
 {
@@ -44,7 +44,7 @@ IceSSL::AcceptorI::listen()
     return _endpoint;
 }
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
 void
 IceSSL::AcceptorI::startAccept()
 {

data/ext/ice/cpp/src/IceSSL/AcceptorI.h

@@ -20,13 +20,13 @@ class AcceptorI : public IceInternal::Acceptor, public IceInternal::NativeInfo
 public:
 
     virtual IceInternal::NativeInfoPtr getNativeInfo();
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     virtual IceInternal::AsyncInfo* getAsyncInfo(IceInternal::SocketOperation);
 #endif
 
     virtual void close();
     virtual IceInternal::EndpointIPtr listen();
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     virtual void startAccept();
     virtual void finishAccept();
 #endif

data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -37,7 +37,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -35,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -37,7 +37,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/IceSSL/Util.cpp

@@ -3,7 +3,7 @@
 //
 
 #include <IceUtil/Config.h>
-#if defined(_WIN32) && !defined(ICE_OS_UWP)
+#if defined(_WIN32)
 #   include <winsock2.h>
 #endif
 

data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp

@@ -9,7 +9,7 @@
 using namespace IceUtilInternal;
 using namespace std;
 
-#if defined(_WIN32) && !defined(ICE_OS_UWP)
+#if defined(_WIN32)
 namespace
 {
 

data/ext/ice/cpp/src/IceUtil/FileUtil.cpp

@@ -12,9 +12,7 @@
 #ifdef _WIN32
 #  include <process.h>
 #  include <io.h>
-#  ifndef ICE_OS_UWP
-#    include <Shlwapi.h>
-#  endif
+#  include <Shlwapi.h>
 #else
 #  include <unistd.h>
 #  include <dirent.h>
@@ -91,13 +89,12 @@ IceUtilInternal::directoryExists(const string& path)
 //
 // Determine if a directory exists and is empty.
 //
-#ifndef ICE_OS_UWP
 bool
 IceUtilInternal::isEmptyDirectory(const string& path)
 {
-#   ifdef _WIN32
+#ifdef _WIN32
     return PathIsDirectoryEmptyW(stringToWstring(path, IceUtil::getProcessStringConverter()).c_str());
-#   else
+#else
     struct dirent* d;
     DIR* dir = opendir(path.c_str());
     if(dir)
@@ -119,9 +116,8 @@ IceUtilInternal::isEmptyDirectory(const string& path)
     {
         return false;
     }
-#   endif
-}
 #endif
+}
 
 //
 // Determine if a regular file exists.
@@ -240,7 +236,6 @@ IceUtilInternal::open(const string& path, int flags)
     }
 }
 
-#ifndef ICE_OS_UWP
 int
 IceUtilInternal::getcwd(string& cwd)
 {
@@ -256,7 +251,6 @@ IceUtilInternal::getcwd(string& cwd)
     cwd = wstringToString(cwdbuf, IceUtil::getProcessStringConverter());
     return 0;
 }
-#endif
 
 int
 IceUtilInternal::unlink(const string& path)
@@ -286,15 +280,8 @@ IceUtilInternal::FileLock::FileLock(const std::string& path) :
     // Don't need to use a wide string converter, the wide string is directly passed
     // to Windows API.
     //
-#ifndef ICE_OS_UWP
     _fd = ::CreateFileW(stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(),
                         GENERIC_WRITE, 0, ICE_NULLPTR, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, ICE_NULLPTR);
-#else
-    CREATEFILE2_EXTENDED_PARAMETERS params;
-    params.dwFileAttributes = FILE_ATTRIBUTE_NORMAL;
-    _fd = ::CreateFile2(stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(),
-                        GENERIC_WRITE, 0, OPEN_ALWAYS, &params);
-#endif
     _path = path;
 
     if(_fd == INVALID_HANDLE_VALUE)

data/ext/ice/cpp/src/IceUtil/RecMutex.cpp

@@ -28,11 +28,7 @@ IceUtil::RecMutex::RecMutex(const IceUtil::MutexProtocol protocol) :
 void
 IceUtil::RecMutex::init(const MutexProtocol)
 {
-#   ifdef ICE_OS_UWP
-    InitializeCriticalSectionEx(&_mutex, 0, 0);
-#   else
     InitializeCriticalSection(&_mutex);
-#   endif
 }
 
 IceUtil::RecMutex::~RecMutex()

data/ext/ice/cpp/src/IceUtil/StringUtil.cpp

@@ -812,48 +812,6 @@ IceUtilInternal::errorToString(int error, LPCVOID source)
 {
     if(error < WSABASEERR)
     {
-#ifdef ICE_OS_UWP
-
-        wstring lpMsgBuf(256, wchar_t());
-        DWORD stored = 0;
-
-        while(stored == 0)
-        {
-            stored = FormatMessageW(
-                FORMAT_MESSAGE_FROM_SYSTEM |
-                FORMAT_MESSAGE_IGNORE_INSERTS |
-                (source != ICE_NULLPTR ? FORMAT_MESSAGE_FROM_HMODULE : 0),
-                source,
-                error,
-                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
-                const_cast<wchar_t*>(lpMsgBuf.data()),
-                static_cast<int>(lpMsgBuf.size()),
-                ICE_NULLPTR);
-
-            if(stored == 0)
-            {
-                DWORD err = GetLastError();
-                if(err == ERROR_INSUFFICIENT_BUFFER)
-                {
-                    if(lpMsgBuf.size() >= 65536)
-                    {
-                        break; // already at the max size
-                    }
-                    else
-                    {
-                        lpMsgBuf.resize(min<size_t>(lpMsgBuf.size() * 4, 65536));
-                    }
-                }
-                else
-                {
-                    break;
-                }
-            }
-        }
-
-        LPWSTR msg = const_cast<wchar_t*>(lpMsgBuf.data());
-
-#else
         LPWSTR msg = 0;
 
         DWORD stored = FormatMessageW(
@@ -867,7 +825,6 @@ IceUtilInternal::errorToString(int error, LPCVOID source)
             reinterpret_cast<LPWSTR>(&msg),
             0,
             ICE_NULLPTR);
-#endif
 
         if(stored > 0)
         {
@@ -877,12 +834,10 @@ IceUtilInternal::errorToString(int error, LPCVOID source)
             {
                 result = result.substr(0, result.length() - 2);
             }
-#ifndef ICE_OS_UWP
             if(msg)
             {
                 LocalFree(msg);
             }
-#endif
             return wstringToString(result, getProcessStringConverter(), getProcessWstringConverter());
         }
         else

data/ext/ice/cpp/src/IceUtil/UUID.cpp

@@ -20,7 +20,7 @@
 
 using namespace std;
 
-#if defined(ICE_OS_UWP) || !defined(_WIN32)
+#ifndef _WIN32
 
 namespace
 {
@@ -41,11 +41,7 @@ public:
 
     PidInitializer()
     {
-#ifndef _WIN32
         pid_t p = getpid();
-#else
-        int p = GetCurrentProcessId();
-#endif
         myPid[0] = (p >> 8) & 0x7F;
         myPid[1] = static_cast<char>(p & 0xFF);
     }
@@ -87,7 +83,7 @@ inline void bytesToHex(unsigned char* bytes, size_t len, char*& hexBuffer)
 string
 IceUtil::generateUUID()
 {
-#if defined(_WIN32) && !defined(ICE_OS_UWP)
+#if defined(_WIN32)
 
     UUID uuid;
     RPC_STATUS ret = UuidCreate(&uuid);

data/ext/ice/cpp/src/IceUtil/UtilException.cpp

@@ -54,7 +54,7 @@
 //
 // The Slice compilers don't retrieve the exception stack traces so we don't need the DbgHelp calls.
 //
-#if defined(_WIN32) && !defined(ICE_OS_UWP) && !defined(__MINGW32__) && !defined(ICE_BUILDING_SLICE_COMPILERS)
+#if defined(_WIN32) && !defined(__MINGW32__) && !defined(ICE_BUILDING_SLICE_COMPILERS)
 #   define ICE_DBGHELP
 #   if defined(_MSC_VER) && (_MSC_VER >= 1700)
 #       define DBGHELP_TRANSLATE_TCHAR

data/ext/ice/cpp/src/Slice/JavaUtil.cpp

@@ -669,6 +669,28 @@ Slice::computeSerialVersionUUID(const ExceptionPtr& p)
     return hashCode;
 }
 
+bool
+Slice::isValidMethodParameterList(const DataMemberList& members, int additionalUnits)
+{
+    // The maximum length of a method parameter list is 255 units, including the implicit 'this' parameter.
+    // Each parameter is 1 unit, except for long and double parameters, which are 2 units.
+    // Start the length at 1 to account for the implicit 'this' parameter (plus any additional units).
+    int length = 1 + additionalUnits;
+    for(DataMemberList::const_iterator p = members.begin(); p != members.end(); ++p)
+    {
+        BuiltinPtr builtin = BuiltinPtr::dynamicCast((*p)->type());
+        if(builtin && (builtin->kind() == Builtin::KindLong || builtin->kind() == Builtin::KindDouble))
+        {
+            length += 2;
+        }
+        else
+        {
+            length++;
+        }
+    }
+    return length <= 255;
+}
+
 Slice::JavaOutput::JavaOutput()
 {
 }

data/ext/ice/cpp/src/Slice/JavaUtil.h

@@ -29,6 +29,15 @@ computeSerialVersionUUID(const ExceptionPtr&);
 long
 computeSerialVersionUUID(const StructPtr&);
 
+//
+// Returns true if we can generate a method from the given data member list. A Java method
+// can have a maximum of 255 parameters (including the implicit 'this') where each parameter
+// is counted as 1 unit, except for long and double which are counted as 2 units.
+// See https://docs.oracle.com/javase/specs/jvms/se20/html/jvms-4.html#jvms-4.3.3
+//
+bool
+isValidMethodParameterList(const DataMemberList&, int additionalUnits = 0);
+
 class JavaOutput : public ::IceUtilInternal::Output
 {
 public:

data/ext/ice/mcpp/system.c

@@ -37,10 +37,6 @@
  *      2. append the system-dependent routines in this file.
  */
 
-#ifndef _MSC_VER
-#  include <unistd.h> // For readlink()
-#endif
-
 #include    "system.H"
 #include    "internal.H"
 

data/ice.gemspec

@@ -4,7 +4,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'zeroc-ice'
-  s.version     = '3.7.9.1'
+  s.version     = '3.7.10'
   s.summary     = "ZeroC Ice for Ruby"
   s.description = <<-eos
 The Internet Communications Engine (Ice) provides a robust, proven

data/lib/Glacier2/Metrics.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.9
+# Ice version 3.7.10
 #
 # <auto-generated>
 #

data/lib/Glacier2/PermissionsVerifier.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.9
+# Ice version 3.7.10
 #
 # <auto-generated>
 #

data/lib/Glacier2/PermissionsVerifierF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.9
+# Ice version 3.7.10
 #
 # <auto-generated>
 #

data/lib/Glacier2/Router.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.9
+# Ice version 3.7.10
 #
 # <auto-generated>
 #

data/lib/Glacier2/RouterF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.9
+# Ice version 3.7.10
 #
 # <auto-generated>
 #

data/lib/Glacier2/SSLInfo.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.9
+# Ice version 3.7.10
 #
 # <auto-generated>
 #

data/lib/Glacier2/Session.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.9
+# Ice version 3.7.10
 #
 # <auto-generated>
 #

data/lib/Ice/BuiltinSequences.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.9
+# Ice version 3.7.10
 #
 # <auto-generated>
 #

data/lib/Ice/Communicator.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.9
+# Ice version 3.7.10
 #
 # <auto-generated>
 #

data/lib/Ice/CommunicatorF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.9
+# Ice version 3.7.10
 #
 # <auto-generated>
 #

data/lib/Ice/Connection.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.9
+# Ice version 3.7.10
 #
 # <auto-generated>
 #

data/lib/Ice/ConnectionF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.9
+# Ice version 3.7.10
 #
 # <auto-generated>
 #

data/lib/Ice/Current.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.9
+# Ice version 3.7.10
 #
 # <auto-generated>
 #