zeroc-ice 3.7.9 → 3.7.10

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

@@ -350,7 +350,7 @@ Ice::ConnectionI::OutgoingMessage::sent()
 
     if(outAsync)
     {
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
         invokeSent = outAsync->sent();
         return invokeSent || receivedReply;
 #else
@@ -1474,7 +1474,7 @@ Ice::ConnectionI::setAdapterAndServantManager(const ObjectAdapterPtr& adapter,
     _servantManager = servantManager;
 }
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
 bool
 Ice::ConnectionI::startAsync(SocketOperation operation)
 {
@@ -1891,7 +1891,7 @@ ConnectionI::dispatch(const StartCallbackPtr& startCB, const vector<OutgoingMess
     {
         for(vector<OutgoingMessage>::const_iterator p = sentCBs.begin(); p != sentCBs.end(); ++p)
         {
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
             if(p->invokeSent)
             {
                 p->outAsync->invokeSent();
@@ -2095,7 +2095,7 @@ Ice::ConnectionI::finish(bool close)
             OutgoingMessage* message = &_sendStreams.front();
             _writeStream.swap(*message->stream);
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
             //
             // The current message might be sent but not yet removed from _sendStreams. If
             // the response has been received in the meantime, we remove the message from
@@ -3387,7 +3387,7 @@ Ice::ConnectionI::parseMessage(InputStream& stream, Int& invokeNum, Int& request
 
                     stream.swap(*outAsync->getIs());
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
                     //
                     // If we just received the reply of a request which isn't acknowledge as
                     // sent yet, we queue the reply instead of processing it right away. It

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

@@ -38,10 +38,8 @@
 
 #include <deque>
 
-#if !defined(ICE_OS_UWP)
-#    ifndef ICE_HAS_BZIP2
-#        define ICE_HAS_BZIP2
-#    endif
+#ifndef ICE_HAS_BZIP2
+#   define ICE_HAS_BZIP2
 #endif
 
 namespace Ice
@@ -89,7 +87,7 @@ public:
     {
         OutgoingMessage(Ice::OutputStream* str, bool comp) :
             stream(str), compress(comp), requestId(0), adopted(false)
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
             , isSent(false), invokeSent(false), receivedReply(false)
 #endif
         {
@@ -98,7 +96,7 @@ public:
         OutgoingMessage(const IceInternal::OutgoingAsyncBasePtr& o, Ice::OutputStream* str,
                         bool comp, int rid) :
             stream(str), outAsync(o), compress(comp), requestId(rid), adopted(false)
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
             , isSent(false), invokeSent(false), receivedReply(false)
 #endif
         {
@@ -114,7 +112,7 @@ public:
         bool compress;
         int requestId;
         bool adopted;
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
         bool isSent;
         bool invokeSent;
         bool receivedReply;
@@ -226,7 +224,7 @@ public:
     //
     // Operations from EventHandler
     //
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     bool startAsync(IceInternal::SocketOperation);
     bool finishAsync(IceInternal::SocketOperation);
 #endif

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

@@ -14,11 +14,7 @@ IceUtilInternal::CountDownLatch::CountDownLatch(int count) :
     }
 
 #ifdef _WIN32
-#   ifndef ICE_OS_UWP
     _event = CreateEvent(0, TRUE, FALSE, 0);
-#   else
-    _event = CreateEventExW(0, 0,  CREATE_EVENT_MANUAL_RESET, SEMAPHORE_ALL_ACCESS);
-#   endif
     if(_event == 0)
     {
         throw  IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
@@ -61,11 +57,7 @@ IceUtilInternal::CountDownLatch::await() const
 #ifdef _WIN32
     while(InterlockedExchangeAdd(&_count, 0) > 0)
     {
-#   ifndef ICE_OS_UWP
         DWORD rc = WaitForSingleObject(_event, INFINITE);
-#   else
-        DWORD rc = WaitForSingleObjectEx(_event, INFINITE, false);
-#   endif
         assert(rc == WAIT_OBJECT_0 || rc == WAIT_FAILED);
 
         if(rc == WAIT_FAILED)

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

@@ -31,7 +31,6 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro
 
     string value;
 
-#ifndef ICE_OS_UWP
     value = properties->getProperty("Ice.Default.SourceAddress");
     if(!value.empty())
     {
@@ -42,7 +41,6 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro
                                           value + "'");
         }
     }
-#endif
 
     value = properties->getProperty("Ice.Override.Timeout");
     if(!value.empty())

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

@@ -128,9 +128,6 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
 #ifdef _WIN32
     lib += libName;
     lib += version;
-#  ifdef ICE_OS_UWP
-    lib += "uwp";
-#  endif
 
 #  ifdef ICE_CPP11_MAPPING
     lib += "++11";
@@ -212,9 +209,7 @@ IceInternal::DynamicLibrary::load(const string& lib)
     // Don't need to use a wide string converter as the wide string is passed
     // to Windows API.
     //
-#if defined(ICE_OS_UWP)
-    _hnd = LoadPackagedLibrary(stringToWstring(lib, getProcessStringConverter()).c_str(), 0);
-#elif defined(_WIN32)
+#if defined(_WIN32)
     _hnd = LoadLibraryW(stringToWstring(lib, getProcessStringConverter()).c_str());
 #else
     int flags = RTLD_NOW | RTLD_GLOBAL;
@@ -229,9 +224,7 @@ IceInternal::DynamicLibrary::load(const string& lib)
         //
         // Remember the most recent error in _err.
         //
-#if defined(ICE_OS_UWP)
-        _err = "LoadPackagedLibrary on `" + lib + "' failed with `" + IceUtilInternal::lastErrorToString() + "'";
-#elif defined(_WIN32)
+#if defined(_WIN32)
         _err = "LoadLibraryW on `" + lib + "' failed with `" + IceUtilInternal::lastErrorToString() + "'";
 #else
         const char* err = dlerror();

data/ext/ice/cpp/src/Ice/Endpoint.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/Ice/EndpointF.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/Ice/EndpointTypes.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/Ice/EventHandler.cpp

@@ -14,7 +14,7 @@ IceUtil::Shared* IceInternal::upCast(EventHandler* p) { return p; }
 #endif
 
 IceInternal::EventHandler::EventHandler() :
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     _pending(SocketOperationNone),
     _started(SocketOperationNone),
     _completed(SocketOperationNone),

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

@@ -24,7 +24,7 @@ class ICE_API EventHandler :
 {
 public:
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     //
     // Called to start a new asynchronous read or write operation.
     //
@@ -57,7 +57,7 @@ protected:
     EventHandler();
     virtual ~EventHandler();
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     SocketOperation _pending;
     SocketOperation _started;
     SocketOperation _completed;

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

@@ -11,9 +11,6 @@
 #include <Ice/InputStream.h>
 #include <Ice/Initialize.h>
 #include <IceUtil/StringUtil.h>
-#ifdef ICE_OS_UWP
-#    include <Ice/StringConverter.h>
-#endif
 #include <iomanip>
 
 using namespace std;
@@ -30,27 +27,7 @@ socketErrorToString(int error)
     {
         return "unknown error";
     }
-#ifdef ICE_OS_UWP
-    if(error == E_ACCESSDENIED)
-    {
-        ostringstream os;
-        os << "access to a resource or feature is denied, ensure that you have requested the appropriate\n";
-        os << "capability and made the required declarations in the package manifest of your app.";
-        return os.str();
-    }
-    else
-    {
-        //
-        // Don't need to use a wide string converter as the wide string come
-        // from Windows API.
-        //
-        return wstringToString(
-            static_cast<Windows::Networking::Sockets::SocketErrorStatus>(error).ToString()->Data(),
-            getProcessStringConverter());
-    }
-#else
     return IceUtilInternal::errorToString(error);
-#endif
 }
 
 };
@@ -461,11 +438,7 @@ Ice::DNSException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
     out << ":\nDNS error: ";
-#ifdef ICE_OS_UWP
-    out << socketErrorToString(error);
-#else
     out << errorToStringDNS(error);
-#endif
     out << "\nhost: " << host;
 }
 

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

@@ -491,7 +491,6 @@ IceInternal::IPEndpointI::checkOption(const string& option, const string& argume
                                               "no argument provided for --sourceAddress option in endpoint " +
                                               endpoint);
         }
-#ifndef ICE_OS_UWP
         const_cast<Address&>(_sourceAddr) = getNumericAddress(argument);
         if(!isAddressValid(_sourceAddr))
         {
@@ -499,7 +498,6 @@ IceInternal::IPEndpointI::checkOption(const string& option, const string& argume
                                               "invalid IP address provided for --sourceAddress option in endpoint " +
                                               endpoint);
         }
-#endif
     }
     else
     {
@@ -535,8 +533,6 @@ IceInternal::IPEndpointI::IPEndpointI(const ProtocolInstancePtr& instance, Input
     s->read(const_cast<Ice::Int&>(_port));
 }
 
-#ifndef ICE_OS_UWP
-
 IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& instance) :
     IceUtil::Thread("Ice.HostResolver"),
     _instance(instance),
@@ -712,45 +708,3 @@ IceInternal::EndpointHostResolver::updateObserver()
                                                  _observer.get()));
     }
 }
-
-#else
-
-IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& instance) :
-    _instance(instance)
-{
-}
-
-void
-IceInternal::EndpointHostResolver::resolve(const string& host,
-                                           int port,
-                                           Ice::EndpointSelectionType selType,
-                                           const IPEndpointIPtr& endpoint,
-                                           const EndpointI_connectorsPtr& callback)
-{
-    //
-    // No DNS lookup support with UWP.
-    //
-    callback->connectors(endpoint->connectors(getAddresses(host, port,
-                                                           _instance->protocolSupport(),
-                                                           selType,
-                                                           _instance->preferIPv6(),
-                                                           false),
-                                              _instance->networkProxy()));
-}
-
-void
-IceInternal::EndpointHostResolver::destroy()
-{
-}
-
-void
-IceInternal::EndpointHostResolver::run()
-{
-}
-
-void
-IceInternal::EndpointHostResolver::updateObserver()
-{
-}
-
-#endif

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

@@ -15,9 +15,7 @@
 #include <Ice/ProtocolInstanceF.h>
 #include <Ice/ObserverHelper.h>
 
-#ifndef ICE_OS_UWP
-#   include <deque>
-#endif
+#include <deque>
 
 namespace IceInternal
 {
@@ -104,11 +102,7 @@ private:
     mutable Ice::Int _hashValue;
 };
 
-#ifndef ICE_OS_UWP
 class ICE_API EndpointHostResolver : public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mutex>
-#else
-class ICE_API EndpointHostResolver : public IceUtil::Shared
-#endif
 {
 public:
 
@@ -123,7 +117,6 @@ public:
 
 private:
 
-#ifndef ICE_OS_UWP
     struct ResolveEntry
     {
         std::string host;
@@ -140,9 +133,6 @@ private:
     bool _destroyed;
     std::deque<ResolveEntry> _queue;
     ObserverHelperT<Ice::Instrumentation::ThreadObserver> _observer;
-#else
-    const InstancePtr _instance;
-#endif
 };
 
 #ifndef ICE_CPP11_MAPPING

data/ext/ice/cpp/src/Ice/Identity.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/Ice/ImplicitContext.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/Ice/ImplicitContextF.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/Ice/Instance.cpp

@@ -1054,7 +1054,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
 
             if(instanceCount() == 1)
             {
-#if defined(_WIN32) && !defined(ICE_OS_UWP)
+#if defined(_WIN32)
                 WORD version = MAKEWORD(1, 1);
                 WSADATA data;
                 if(WSAStartup(version, &data) != 0)
@@ -1325,7 +1325,7 @@ IceInternal::Instance::~Instance()
     }
     if(instanceCount() == 0)
     {
-#if defined(_WIN32) && !defined(ICE_OS_UWP)
+#if defined(_WIN32)
         WSACleanup();
 #endif
 
@@ -1479,7 +1479,6 @@ IceInternal::Instance::finishSetup(int& argc, const char* argv[], const Ice::Com
     try
     {
         _endpointHostResolver = new EndpointHostResolver(this);
-#ifndef ICE_OS_UWP
         bool hasPriority = _initData.properties->getProperty("Ice.ThreadPriority") != "";
         int priority = _initData.properties->getPropertyAsInt("Ice.ThreadPriority");
         if(hasPriority)
@@ -1490,7 +1489,6 @@ IceInternal::Instance::finishSetup(int& argc, const char* argv[], const Ice::Com
         {
             _endpointHostResolver->start();
         }
-#endif
     }
     catch(const IceUtil::Exception& ex)
     {
@@ -1683,12 +1681,10 @@ IceInternal::Instance::destroy()
     {
         _serverThreadPool->joinWithAllThreads();
     }
-#ifndef ICE_OS_UWP
     if(_endpointHostResolver)
     {
         _endpointHostResolver->getThreadControl().join();
     }
-#endif
 
 #ifdef ICE_CPP11_COMPILER
     for(const auto& p : _objectFactoryMap)

data/ext/ice/cpp/src/Ice/Instrumentation.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/Ice/InstrumentationF.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/Ice/LocalException.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/Ice/Locator.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -41,7 +41,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/Ice/LocatorF.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/Ice/Logger.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/Ice/LoggerF.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