zeroc-ice 3.6.5 → 3.7.0

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -16,7 +16,7 @@
 #include <Ice/Transceiver.h>
 #include <Ice/Network.h>
 
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
 #   include <deque>
 #endif
 
@@ -38,23 +38,21 @@ class UdpTransceiver : public Transceiver, public NativeInfo
 public:
 
     virtual NativeInfoPtr getNativeInfo();
-#if defined(ICE_USE_IOCP)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
     virtual AsyncInfo* getAsyncInfo(SocketOperation);
-#elif defined(ICE_OS_WINRT)
-    virtual void setCompletedHandler(SocketOperationCompletedHandler^);
 #endif
 
-    virtual SocketOperation initialize(Buffer&, Buffer&, bool&);
+    virtual SocketOperation initialize(Buffer&, Buffer&);
     virtual SocketOperation closing(bool, const Ice::LocalException&);
     virtual void close();
     virtual EndpointIPtr bind();
     virtual SocketOperation write(Buffer&);
-    virtual SocketOperation read(Buffer&, bool&);
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
+    virtual SocketOperation read(Buffer&);
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
     virtual bool startWrite(Buffer&);
     virtual void finishWrite(Buffer&);
     virtual void startRead(Buffer&);
-    virtual void finishRead(Buffer&, bool&);
+    virtual void finishRead(Buffer&);
 #endif
     virtual std::string protocol() const;
     virtual std::string toString() const;
@@ -75,10 +73,15 @@ private:
 
     void setBufSize(int, int);
 
-#ifdef ICE_OS_WINRT
-    bool checkIfErrorOrCompleted(SocketOperation, Windows::Foundation::IAsyncInfo^);
+#ifdef ICE_OS_UWP
     void appendMessage(Windows::Networking::Sockets::DatagramSocketMessageReceivedEventArgs^);
     Windows::Networking::Sockets::DatagramSocketMessageReceivedEventArgs^ readMessage();
+
+    void connectCompleted(Windows::Foundation::IAsyncAction^, Windows::Foundation::AsyncStatus);
+    void getOutputStreamMcastCompleted(
+        Windows::Foundation::IAsyncOperation<Windows::Storage::Streams::IOutputStream^>^,
+        Windows::Foundation::AsyncStatus);
+    void getOutputStreamCompleted(concurrency::task<Windows::Storage::Streams::IOutputStream^>, Buffer&);
 #endif
 
     friend class UdpEndpointI;
@@ -106,14 +109,9 @@ private:
     AsyncInfo _write;
     Address _readAddr;
     socklen_t _readAddrLen;
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
     AsyncInfo _write;
-
     Windows::Storage::Streams::DataWriter^ _writer;
-
-    SocketOperationCompletedHandler^ _completedHandler;
-    Windows::Foundation::AsyncOperationCompletedHandler<unsigned int>^ _writeOperationCompletedHandler;
-
     IceUtil::Mutex _mutex;
     bool _readPending;
     std::deque<Windows::Networking::Sockets::DatagramSocketMessageReceivedEventArgs^> _received;

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

@@ -0,0 +1,81 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2017 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/Value.h>
+#include <Ice/LocalException.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
+
+#ifdef ICE_CPP11_MAPPING
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+void
+Ice::Value::ice_preMarshal()
+{
+}
+
+void
+Ice::Value::ice_postUnmarshal()
+{
+}
+
+void
+Ice::Value::_iceWrite(Ice::OutputStream* os) const
+{
+    os->startValue(0);
+    _iceWriteImpl(os);
+    os->endValue();
+}
+
+void
+Ice::Value::_iceRead(Ice::InputStream* is)
+{
+   is->startValue();
+   _iceReadImpl(is);
+   is->endValue(false);
+}
+
+namespace
+{
+
+const string object_ids[] =
+{
+    "::Ice::Object"
+};
+
+}
+
+string
+Ice::Value::ice_id() const
+{
+    return object_ids[0];
+}
+
+const string&
+Ice::Value::ice_staticId()
+{
+    return object_ids[0];
+}
+
+shared_ptr<Value>
+Ice::Value::ice_clone() const
+{
+    return _iceCloneImpl();
+}
+
+shared_ptr<SlicedData>
+Ice::Value::ice_getSlicedData() const
+{
+    return nullptr;
+}
+
+#endif

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

@@ -0,0 +1,84 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2017 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
+//
+// <auto-generated>
+//
+// Generated from file `ValueFactory.ice'
+//
+// Warning: do not edit this file.
+//
+// </auto-generated>
+//
+
+#ifndef ICE_API_EXPORTS
+#   define ICE_API_EXPORTS
+#endif
+#include <Ice/ValueFactory.h>
+#include <IceUtil/PushDisableWarnings.h>
+#include <Ice/InputStream.h>
+#include <Ice/OutputStream.h>
+#include <IceUtil/PopDisableWarnings.h>
+
+#if defined(_MSC_VER)
+#   pragma warning(disable:4458) // declaration of ... hides class member
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
+#ifndef ICE_IGNORE_VERSION
+#   if ICE_INT_VERSION / 100 != 307
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
+#   endif
+#endif
+
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+namespace
+{
+
+}
+
+Ice::ValueFactoryManager::~ValueFactoryManager()
+{
+}
+
+#else // C++98 mapping
+
+namespace
+{
+
+}
+
+Ice::ValueFactory::~ValueFactory()
+{
+}
+
+ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::ValueFactory* p) { return p; }
+
+Ice::ValueFactoryManager::~ValueFactoryManager()
+{
+}
+
+ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::ValueFactoryManager* p) { return p; }
+
+namespace Ice
+{
+}
+
+#endif

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

@@ -0,0 +1,70 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2017 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/ValueFactoryManagerI.h>
+#include <Ice/LocalException.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+void
+IceInternal::ValueFactoryManagerI::add(ICE_IN(ICE_DELEGATE(ValueFactory)) factory, const string& id)
+{
+    IceUtil::Mutex::Lock sync(*this);
+
+    if((_factoryMapHint != _factoryMap.end() && _factoryMapHint->first == id)
+       || _factoryMap.find(id) != _factoryMap.end())
+    {
+        AlreadyRegisteredException ex(__FILE__, __LINE__);
+        ex.kindOfObject = "value factory";
+        ex.id = id;
+        throw ex;
+    }
+
+    _factoryMapHint = _factoryMap.insert(_factoryMapHint, pair<const string, ICE_DELEGATE(ValueFactory)>(id, factory));
+}
+
+ICE_DELEGATE(ValueFactory)
+IceInternal::ValueFactoryManagerI::find(const string& id) const
+{
+    IceUtil::Mutex::Lock sync(*this);
+
+    FactoryMap& factoryMap = const_cast<FactoryMap&>(_factoryMap);
+
+    FactoryMap::iterator p = factoryMap.end();
+    if(_factoryMapHint != factoryMap.end())
+    {
+        if(_factoryMapHint->first == id)
+        {
+            p = _factoryMapHint;
+        }
+    }
+
+    if(p == factoryMap.end())
+    {
+        p = factoryMap.find(id);
+    }
+
+    if(p != factoryMap.end())
+    {
+        _factoryMapHint = p;
+        return p->second;
+    }
+    else
+    {
+        return ICE_NULLPTR;
+    }
+}
+
+IceInternal::ValueFactoryManagerI::ValueFactoryManagerI() :
+    _factoryMapHint(_factoryMap.end())
+{
+}

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

@@ -0,0 +1,42 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2017 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_VALUE_FACTORY_MANAGER_I_H
+#define ICE_VALUE_FACTORY_MANAGER_I_H
+
+#include <Ice/ValueFactory.h>
+#include <IceUtil/Mutex.h>
+
+namespace IceInternal
+{
+
+class ValueFactoryManagerI;
+ICE_DEFINE_PTR(ValueFactoryManagerIPtr, ValueFactoryManagerI);
+
+class ValueFactoryManagerI : public Ice::ValueFactoryManager,
+                             public IceUtil::Mutex
+{
+public:
+
+    ValueFactoryManagerI();
+
+    virtual void add(ICE_IN(ICE_DELEGATE(::Ice::ValueFactory)), const std::string&);
+    virtual ICE_DELEGATE(::Ice::ValueFactory) find(const std::string&) const;
+
+private:
+
+    typedef std::map<std::string, ICE_DELEGATE(::Ice::ValueFactory)> FactoryMap;
+
+    FactoryMap _factoryMap;
+    mutable FactoryMap::iterator _factoryMapHint;
+};
+
+}
+
+#endif

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.6.5
+// Ice version 3.7.0
 //
 // <auto-generated>
 //
@@ -23,30 +23,40 @@
 #endif
 #include <Ice/Version.h>
 #include <IceUtil/PushDisableWarnings.h>
-#include <Ice/BasicStream.h>
-#include <IceUtil/Iterator.h>
+#include <Ice/InputStream.h>
+#include <Ice/OutputStream.h>
 #include <IceUtil/PopDisableWarnings.h>
 
+#if defined(_MSC_VER)
+#   pragma warning(disable:4458) // declaration of ... hides class member
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 306
+#   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 5
+#   if ICE_INT_VERSION % 100 < 0
 #       error Ice patch level mismatch!
 #   endif
 #endif
 
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+namespace Ice
+{
+}
+
+#else // C++98 mapping
+
 namespace Ice
 {
-#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_STATIC_LIBS)
-template struct ICE_API StreamWriter< ::Ice::ProtocolVersion, ::IceInternal::BasicStream>;
-template struct ICE_API StreamReader< ::Ice::ProtocolVersion, ::IceInternal::BasicStream>;
-#endif
-#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_STATIC_LIBS)
-template struct ICE_API StreamWriter< ::Ice::EncodingVersion, ::IceInternal::BasicStream>;
-template struct ICE_API StreamReader< ::Ice::EncodingVersion, ::IceInternal::BasicStream>;
-#endif
 }
+
+#endif

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

@@ -0,0 +1,43 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2017 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_VIRTUAL_SHARED_H
+#define ICE_VIRTUAL_SHARED_H
+
+#ifdef ICE_CPP11_MAPPING
+
+namespace IceInternal
+{
+
+class VirtualEnableSharedFromThisBase : public std::enable_shared_from_this<VirtualEnableSharedFromThisBase>
+{
+public:
+
+    virtual ~VirtualEnableSharedFromThisBase() = default;
+};
+
+template<typename T>
+class EnableSharedFromThis : public virtual VirtualEnableSharedFromThisBase
+{
+public:
+
+    std::shared_ptr<T> shared_from_this()
+    {
+        return std::dynamic_pointer_cast<T>(VirtualEnableSharedFromThisBase::shared_from_this());
+    }
+
+    std::shared_ptr<T const> shared_from_this() const
+    {
+        return std::dynamic_pointer_cast<T const>(VirtualEnableSharedFromThisBase::shared_from_this());
+    }
+};
+
+}
+#endif
+#endif