zeroc-ice 3.6.5 → 3.7.0

data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h

@@ -0,0 +1,98 @@
+// **********************************************************************
+//
+// 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 `ConnectionInfoF.ice'
+//
+// Warning: do not edit this file.
+//
+// </auto-generated>
+//
+
+#ifndef __IceSSL_ConnectionInfoF_h__
+#define __IceSSL_ConnectionInfoF_h__
+
+#include <IceUtil/PushDisableWarnings.h>
+#include <Ice/ProxyF.h>
+#include <Ice/ObjectF.h>
+#include <Ice/ValueF.h>
+#include <Ice/Exception.h>
+#include <Ice/LocalObject.h>
+#include <Ice/StreamHelpers.h>
+#include <Ice/Comparable.h>
+#include <IceUtil/ScopedArray.h>
+#include <Ice/Optional.h>
+#include <IceUtil/UndefSysMacros.h>
+
+#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
+
+#ifndef ICESSL_API
+#   if defined(ICE_STATIC_LIBS)
+#       define ICESSL_API /**/
+#   elif defined(ICESSL_API_EXPORTS)
+#       define ICESSL_API ICE_DECLSPEC_EXPORT
+#   else
+#       define ICESSL_API ICE_DECLSPEC_IMPORT
+#   endif
+#endif
+
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+namespace IceSSL
+{
+
+class ConnectionInfo;
+
+}
+
+namespace Ice
+{
+
+}
+
+namespace IceSSL
+{
+
+using ConnectionInfoPtr = ::std::shared_ptr<ConnectionInfo>;
+
+}
+
+#else // C++98 mapping
+
+namespace IceSSL
+{
+
+class ConnectionInfo;
+ICESSL_API ::Ice::LocalObject* upCast(::IceSSL::ConnectionInfo*);
+typedef ::IceInternal::Handle< ::IceSSL::ConnectionInfo> ConnectionInfoPtr;
+
+}
+
+namespace Ice
+{
+
+}
+
+#endif
+
+#include <IceUtil/PopDisableWarnings.h>
+#endif

data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h

@@ -0,0 +1,156 @@
+// **********************************************************************
+//
+// 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 `EndpointInfo.ice'
+//
+// Warning: do not edit this file.
+//
+// </auto-generated>
+//
+
+#ifndef __IceSSL_EndpointInfo_h__
+#define __IceSSL_EndpointInfo_h__
+
+#include <IceUtil/PushDisableWarnings.h>
+#include <Ice/ProxyF.h>
+#include <Ice/ObjectF.h>
+#include <Ice/ValueF.h>
+#include <Ice/Exception.h>
+#include <Ice/LocalObject.h>
+#include <Ice/StreamHelpers.h>
+#include <Ice/Comparable.h>
+#include <IceUtil/ScopedArray.h>
+#include <Ice/Optional.h>
+#include <Ice/Endpoint.h>
+#include <IceUtil/UndefSysMacros.h>
+
+#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
+
+#ifndef ICESSL_API
+#   if defined(ICE_STATIC_LIBS)
+#       define ICESSL_API /**/
+#   elif defined(ICESSL_API_EXPORTS)
+#       define ICESSL_API ICE_DECLSPEC_EXPORT
+#   else
+#       define ICESSL_API ICE_DECLSPEC_IMPORT
+#   endif
+#endif
+
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+namespace IceSSL
+{
+
+class EndpointInfo;
+
+}
+
+namespace IceSSL
+{
+
+class ICE_CLASS(ICESSL_API) EndpointInfo : public ::Ice::EndpointInfo
+{
+public:
+
+    ICE_MEMBER(ICESSL_API) virtual ~EndpointInfo();
+
+    EndpointInfo() = default;
+
+    EndpointInfo(const EndpointInfo&) = default;
+    EndpointInfo(EndpointInfo&&) = default;
+    EndpointInfo& operator=(const EndpointInfo&) = default;
+    EndpointInfo& operator=(EndpointInfo&&) = default;
+
+    EndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& iceP_underlying, int iceP_timeout, bool iceP_compress) :
+        ::Ice::EndpointInfo(::std::move(iceP_underlying), iceP_timeout, iceP_compress)
+    {
+    }
+};
+
+}
+
+namespace Ice
+{
+
+}
+
+namespace IceSSL
+{
+
+using EndpointInfoPtr = ::std::shared_ptr<EndpointInfo>;
+
+}
+
+#else // C++98 mapping
+
+namespace IceSSL
+{
+
+class EndpointInfo;
+ICESSL_API ::Ice::LocalObject* upCast(::IceSSL::EndpointInfo*);
+typedef ::IceInternal::Handle< ::IceSSL::EndpointInfo> EndpointInfoPtr;
+
+}
+
+namespace IceSSL
+{
+
+class ICESSL_API EndpointInfo : public ::Ice::EndpointInfo
+{
+public:
+
+    typedef EndpointInfoPtr PointerType;
+
+    virtual ~EndpointInfo();
+
+    EndpointInfo()
+    {
+    }
+
+    EndpointInfo(const ::Ice::EndpointInfoPtr& iceP_underlying, ::Ice::Int iceP_timeout, bool iceP_compress) :
+        ::Ice::EndpointInfo(iceP_underlying, iceP_timeout, iceP_compress)
+    {
+    }
+};
+
+inline bool operator==(const EndpointInfo& lhs, const EndpointInfo& rhs)
+{
+    return static_cast<const ::Ice::LocalObject&>(lhs) == static_cast<const ::Ice::LocalObject&>(rhs);
+}
+
+inline bool operator<(const EndpointInfo& lhs, const EndpointInfo& rhs)
+{
+    return static_cast<const ::Ice::LocalObject&>(lhs) < static_cast<const ::Ice::LocalObject&>(rhs);
+}
+
+}
+
+namespace Ice
+{
+
+}
+
+#endif
+
+#include <IceUtil/PopDisableWarnings.h>
+#endif

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

@@ -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.
@@ -18,13 +18,15 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(ACMMonitor* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(FactoryACMMonitor* p) { return p; }
+#endif
 
 IceInternal::ACMConfig::ACMConfig(bool server) :
     timeout(IceUtil::Time::seconds(60)),
-    heartbeat(Ice::HeartbeatOnInvocation),
-    close(server ? Ice::CloseOnInvocation : Ice::CloseOnInvocationAndIdle)
+    heartbeat(ICE_ENUM(ACMHeartbeat, HeartbeatOnDispatch)),
+    close(server ? ICE_ENUM(ACMClose, CloseOnInvocation) : ICE_ENUM(ACMClose, CloseOnInvocationAndIdle))
 {
 }
 
@@ -45,8 +47,9 @@ IceInternal::ACMConfig::ACMConfig(const Ice::PropertiesPtr& p,
 
     this->timeout = IceUtil::Time::seconds(p->getPropertyAsIntWithDefault(timeoutProperty,
                                                                           static_cast<int>(dflt.timeout.toSeconds())));
-    int hb = p->getPropertyAsIntWithDefault(prefix + ".Heartbeat", dflt.heartbeat);
-    if(hb >= Ice::HeartbeatOff && hb <= Ice::HeartbeatAlways)
+    int hb = p->getPropertyAsIntWithDefault(prefix + ".Heartbeat", static_cast<int>(dflt.heartbeat));
+    if(hb >= static_cast<int>(ICE_ENUM(ACMHeartbeat, HeartbeatOff)) &&
+       hb <= static_cast<int>(ICE_ENUM(ACMHeartbeat, HeartbeatAlways)))
     {
         this->heartbeat = static_cast<Ice::ACMHeartbeat>(hb);
     }
@@ -56,8 +59,9 @@ IceInternal::ACMConfig::ACMConfig(const Ice::PropertiesPtr& p,
         this->heartbeat = dflt.heartbeat;
     }
 
-    int cl = p->getPropertyAsIntWithDefault(prefix + ".Close", dflt.close);
-    if(cl >= Ice::CloseOff && cl <= Ice::CloseOnIdleForceful)
+    int cl = p->getPropertyAsIntWithDefault(prefix + ".Close", static_cast<int>(dflt.close));
+    if(cl >= static_cast<int>(ICE_ENUM(ACMClose, CloseOff)) &&
+       cl <= static_cast<int>(ICE_ENUM(ACMClose, CloseOnIdleForceful)))
     {
         this->close = static_cast<Ice::ACMClose>(cl);
     }
@@ -104,8 +108,8 @@ IceInternal::FactoryACMMonitor::destroy()
     //
     if(!_connections.empty())
     {
-        _instance->timer()->cancel(this);
-        _instance->timer()->schedule(this, IceUtil::Time());
+        _instance->timer()->cancel(ICE_SHARED_FROM_THIS);
+        _instance->timer()->schedule(ICE_SHARED_FROM_THIS, IceUtil::Time());
     }
 
     _instance = 0;
@@ -132,7 +136,7 @@ IceInternal::FactoryACMMonitor::add(const ConnectionIPtr& connection)
     if(_connections.empty())
     {
         _connections.insert(connection);
-        _instance->timer()->scheduleRepeated(this, _config.timeout / 2);
+        _instance->timer()->scheduleRepeated(ICE_SHARED_FROM_THIS, _config.timeout / 2);
     }
     else
     {
@@ -181,7 +185,7 @@ IceInternal::FactoryACMMonitor::acm(const IceUtil::Optional<int>& timeout,
     {
         config.heartbeat = *heartbeat;
     }
-    return new ConnectionACMMonitor(this, _instance->timer(), config);
+    return ICE_MAKE_SHARED(ConnectionACMMonitor, ICE_SHARED_FROM_THIS, _instance->timer(), config);
 }
 
 Ice::ACM
@@ -228,7 +232,7 @@ IceInternal::FactoryACMMonitor::runTimerTask()
 
         if(_connections.empty())
         {
-            _instance->timer()->cancel(this);
+            _instance->timer()->cancel(ICE_SHARED_FROM_THIS);
             return;
         }
     }
@@ -301,7 +305,7 @@ IceInternal::ConnectionACMMonitor::add(const ConnectionIPtr& connection)
     _connection = connection;
     if(_config.timeout != IceUtil::Time())
     {
-        _timer->scheduleRepeated(this, _config.timeout / 2);
+        _timer->scheduleRepeated(ICE_SHARED_FROM_THIS, _config.timeout / 2);
     }
 }
 
@@ -312,7 +316,7 @@ IceInternal::ConnectionACMMonitor::remove(const ConnectionIPtr& connection)
     assert(_connection == connection);
     if(_config.timeout != IceUtil::Time())
     {
-        _timer->cancel(this);
+        _timer->cancel(ICE_SHARED_FROM_THIS);
     }
     _connection = 0;
 }

data/ext/ice/cpp/src/Ice/ACM.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.
@@ -51,6 +51,9 @@ public:
 };
 
 class FactoryACMMonitor : public ACMMonitor, public IceUtil::Monitor<IceUtil::Mutex>
+#ifdef ICE_CPP11_MAPPING
+                        , public std::enable_shared_from_this<FactoryACMMonitor>
+#endif
 {
 public:
 
@@ -85,7 +88,11 @@ private:
     std::vector<Ice::ConnectionIPtr> _reapedConnections;
 };
 
-class ConnectionACMMonitor : public ACMMonitor, public ::IceUtil::Mutex
+class ConnectionACMMonitor : public ACMMonitor,
+                             public IceUtil::Mutex
+#ifdef ICE_CPP11_MAPPING
+                           , public std::enable_shared_from_this<ConnectionACMMonitor>
+#endif
 {
 public:
 

data/ext/ice/cpp/{include → src}/Ice/ACMF.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.
@@ -11,19 +11,24 @@
 #define ICE_ACM_F_H
 
 #include <IceUtil/Shared.h>
-
 #include <Ice/Handle.h>
 
 namespace IceInternal
 {
 
 class ACMMonitor;
-ICE_API IceUtil::Shared* upCast(ACMMonitor*);
+class FactoryACMMonitor;
+
+#ifdef ICE_CPP11_MAPPING
+using ACMMonitorPtr = ::std::shared_ptr<ACMMonitor>;
+using FactoryACMMonitorPtr = ::std::shared_ptr<FactoryACMMonitor>;
+#else
+IceUtil::Shared* upCast(ACMMonitor*);
 typedef IceInternal::Handle<ACMMonitor> ACMMonitorPtr;
 
-class FactoryACMMonitor;
-ICE_API IceUtil::Shared* upCast(FactoryACMMonitor*);
+IceUtil::Shared* upCast(FactoryACMMonitor*);
 typedef IceInternal::Handle<FactoryACMMonitor> FactoryACMMonitorPtr;
+#endif
 
 }
 

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

@@ -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.
@@ -13,4 +13,9 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+Acceptor::~Acceptor()
+{
+    // Out of line to avoid weak vtable
+}
+
 IceUtil::Shared* IceInternal::upCast(Acceptor* p) { return p; }

data/ext/ice/cpp/src/Ice/Acceptor.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.
@@ -19,14 +19,15 @@
 namespace IceInternal
 {
 
-class ICE_API Acceptor : virtual public ::IceUtil::Shared
+class ICE_API Acceptor : public virtual ::IceUtil::Shared
 {
 public:
+    virtual ~Acceptor();
 
     virtual NativeInfoPtr getNativeInfo() = 0;
     virtual void close() = 0;
     virtual EndpointIPtr listen() = 0;
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
     virtual void startAccept() = 0;
     virtual void finishAccept() = 0;
 #endif