zeroc-ice 3.6.5 → 3.7.0

data/ext/ice/cpp/src/Ice/ObjectAdapterI.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.
@@ -36,9 +36,14 @@ namespace Ice
 {
 
 class ObjectAdapterI;
-typedef IceUtil::Handle<ObjectAdapterI> ObjectAdapterIPtr;
+ICE_DEFINE_PTR(ObjectAdapterIPtr, ObjectAdapterI);
+
+class ObjectAdapterI : public ObjectAdapter,
+                       public IceUtil::Monitor<IceUtil::RecMutex>
+#ifdef ICE_CPP11_MAPPING
+                     , public std::enable_shared_from_this<ObjectAdapterI>
+#endif
 
-class ObjectAdapterI : public ObjectAdapter, public IceUtil::Monitor<IceUtil::RecMutex>
 {
 public:
 
@@ -52,12 +57,12 @@ public:
     virtual void deactivate();
     virtual void waitForDeactivate();
     virtual bool isDeactivated() const;
-    virtual void destroy();
+    virtual void destroy() ICE_NOEXCEPT;
 
-    virtual ObjectPrx add(const ObjectPtr&, const Identity&);
-    virtual ObjectPrx addFacet(const ObjectPtr&, const Identity&, const std::string&);
-    virtual ObjectPrx addWithUUID(const ObjectPtr&);
-    virtual ObjectPrx addFacetWithUUID(const ObjectPtr&, const std::string&);
+    virtual ObjectPrxPtr add(const ObjectPtr&, const Identity&);
+    virtual ObjectPrxPtr addFacet(const ObjectPtr&, const Identity&, const std::string&);
+    virtual ObjectPrxPtr addWithUUID(const ObjectPtr&);
+    virtual ObjectPrxPtr addFacetWithUUID(const ObjectPtr&, const std::string&);
     virtual void addDefaultServant(const ObjectPtr&, const std::string&);
     virtual ObjectPtr remove(const Identity&);
     virtual ObjectPtr removeFacet(const Identity&, const std::string&);
@@ -66,28 +71,28 @@ public:
     virtual ObjectPtr find(const Identity&) const;
     virtual ObjectPtr findFacet(const Identity&, const std::string&) const;
     virtual FacetMap findAllFacets(const Identity&) const;
-    virtual ObjectPtr findByProxy(const ObjectPrx&) const;
+    virtual ObjectPtr findByProxy(const ObjectPrxPtr&) const;
     virtual ObjectPtr findDefaultServant(const std::string&) const;
 
-
     virtual void addServantLocator(const ServantLocatorPtr&, const std::string&);
     virtual ServantLocatorPtr removeServantLocator(const std::string&);
     virtual ServantLocatorPtr findServantLocator(const std::string&) const;
 
-    virtual ObjectPrx createProxy(const Identity&) const;
-    virtual ObjectPrx createDirectProxy(const Identity&) const;
-    virtual ObjectPrx createIndirectProxy(const Identity&) const;
-
-    virtual void setLocator(const LocatorPrx&);
-    virtual Ice::LocatorPrx getLocator() const;
-    virtual void refreshPublishedEndpoints();
+    virtual ObjectPrxPtr createProxy(const Identity&) const;
+    virtual ObjectPrxPtr createDirectProxy(const Identity&) const;
+    virtual ObjectPrxPtr createIndirectProxy(const Identity&) const;
 
+    virtual void setLocator(const LocatorPrxPtr&);
+    virtual Ice::LocatorPrxPtr getLocator() const;
     virtual EndpointSeq getEndpoints() const;
+
+    virtual void refreshPublishedEndpoints();
     virtual EndpointSeq getPublishedEndpoints() const;
+    virtual void setPublishedEndpoints(const EndpointSeq&);
 
-    bool isLocal(const ObjectPrx&) const;
+    bool isLocal(const ObjectPrxPtr&) const;
 
-    void flushAsyncBatchRequests(const IceInternal::CommunicatorFlushBatchAsyncPtr&);
+    void flushAsyncBatchRequests(const IceInternal::CommunicatorFlushBatchAsyncPtr&, CompressBatch);
 
     void updateConnectionObservers();
     void updateThreadObservers();
@@ -100,21 +105,22 @@ public:
     IceInternal::ACMConfig getACM() const;
     size_t messageSizeMax() const { return _messageSizeMax; }
 
-private:
-
     ObjectAdapterI(const IceInternal::InstancePtr&, const CommunicatorPtr&,
                    const IceInternal::ObjectAdapterFactoryPtr&, const std::string&, bool);
     virtual ~ObjectAdapterI();
-    void initialize(const RouterPrx&);
+
+private:
+
+    void initialize(const RouterPrxPtr&);
     friend class IceInternal::ObjectAdapterFactory;
 
-    ObjectPrx newProxy(const Identity&, const std::string&) const;
-    ObjectPrx newDirectProxy(const Identity&, const std::string&) const;
-    ObjectPrx newIndirectProxy(const Identity&, const std::string&, const std::string&) const;
+    ObjectPrxPtr newProxy(const Identity&, const std::string&) const;
+    ObjectPrxPtr newDirectProxy(const Identity&, const std::string&) const;
+    ObjectPrxPtr newIndirectProxy(const Identity&, const std::string&, const std::string&) const;
     void checkForDeactivation() const;
     std::vector<IceInternal::EndpointIPtr> parseEndpoints(const std::string&, bool) const;
     std::vector<IceInternal::EndpointIPtr> parsePublishedEndpoints();
-    void updateLocatorRegistry(const IceInternal::LocatorInfoPtr&, const Ice::ObjectPrx&);
+    void updateLocatorRegistry(const IceInternal::LocatorInfoPtr&, const Ice::ObjectPrxPtr&);
     bool filterProperties(Ice::StringSeq&);
 
     enum State

data/ext/ice/cpp/src/Ice/ObjectFactory.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,25 +23,56 @@
 #endif
 #include <Ice/ObjectFactory.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::ObjectFactory::~ObjectFactory()
+{
+}
+
+#else // C++98 mapping
+
 namespace
 {
 
 }
 
+Ice::ObjectFactory::~ObjectFactory()
+{
+}
+
 ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::ObjectFactory* p) { return p; }
+
+namespace Ice
+{
+}
+
+#endif

data/ext/ice/cpp/src/Ice/ObserverHelper.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.
@@ -16,29 +16,14 @@ using namespace std;
 using namespace Ice;
 using namespace Ice::Instrumentation;
 
-namespace
+IceInternal::InvocationObserver::InvocationObserver(const Ice::ObjectPrxPtr& proxy, const string& op, const Context& ctx)
 {
-
-Ice::Context emptyCtx;
-
-}
-
-IceInternal::InvocationObserver::InvocationObserver(IceProxy::Ice::Object* proxy, const string& op, const Context* ctx)
-{
-    const CommunicatorObserverPtr& obsv = proxy->__reference()->getInstance()->initializationData().observer;
+    const CommunicatorObserverPtr& obsv = proxy->_getReference()->getInstance()->initializationData().observer;
     if(!obsv)
     {
         return;
     }
-
-    if(ctx)
-    {
-        attach(obsv->getInvocationObserver(proxy, op, *ctx));
-    }
-    else
-    {
-        attach(obsv->getInvocationObserver(proxy, op, emptyCtx));
-    }
+    attach(obsv->getInvocationObserver(proxy, op, ctx));
 }
 
 IceInternal::InvocationObserver::InvocationObserver(IceInternal::Instance* instance, const string& op)
@@ -49,26 +34,18 @@ IceInternal::InvocationObserver::InvocationObserver(IceInternal::Instance* insta
         return;
     }
 
-    attach(obsv->getInvocationObserver(0, op, emptyCtx));
+    attach(obsv->getInvocationObserver(0, op, noExplicitContext));
 }
 
 void
-IceInternal::InvocationObserver::attach(IceProxy::Ice::Object* proxy, const string& op, const Context* ctx)
+IceInternal::InvocationObserver::attach(const Ice::ObjectPrxPtr& proxy, const string& op, const Context& ctx)
 {
-    const CommunicatorObserverPtr& obsv = proxy->__reference()->getInstance()->initializationData().observer;
+    const CommunicatorObserverPtr& obsv = proxy->_getReference()->getInstance()->initializationData().observer;
     if(!obsv)
     {
         return;
     }
-
-    if(ctx)
-    {
-        attach(obsv->getInvocationObserver(proxy, op, *ctx));
-    }
-    else
-    {
-        attach(obsv->getInvocationObserver(proxy, op, emptyCtx));
-    }
+    attach(obsv->getInvocationObserver(proxy, op, ctx));
 }
 
 void
@@ -80,5 +57,5 @@ IceInternal::InvocationObserver::attach(IceInternal::Instance* instance, const s
         return;
     }
 
-    attach(obsv->getInvocationObserver(0, op, emptyCtx));
+    attach(obsv->getInvocationObserver(0, op, Ice::noExplicitContext));
 }

data/ext/ice/cpp/src/Ice/OpaqueEndpointI.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.
@@ -8,7 +8,8 @@
 // **********************************************************************
 
 #include <Ice/OpaqueEndpointI.h>
-#include <Ice/BasicStream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
 #include <Ice/Exception.h>
 #include <Ice/DefaultsAndOverrides.h>
 #include <Ice/Base64.h>
@@ -46,10 +47,10 @@ IceInternal::OpaqueEndpointI::OpaqueEndpointI(vector<string>& args) :
     }
 }
 
-IceInternal::OpaqueEndpointI::OpaqueEndpointI(Short type, BasicStream* s) : _type(type)
+IceInternal::OpaqueEndpointI::OpaqueEndpointI(Short type, InputStream* s) : _type(type)
 {
-    _rawEncoding = s->getReadEncoding();
-    Int sz = s->getReadEncapsSize();
+    _rawEncoding = s->getEncoding();
+    Int sz = s->getEncapsulationSize();
     s->readBlob(const_cast<vector<Byte>&>(_rawBytes), sz);
 }
 
@@ -91,23 +92,23 @@ private:
 //
 OpaqueEndpointInfoI::OpaqueEndpointInfoI(Ice::Short type, const Ice::EncodingVersion& rawEncoding,
                                          const Ice::ByteSeq& rawBytes) :
-    Ice::OpaqueEndpointInfo(-1, false, rawEncoding, rawBytes),
+    Ice::OpaqueEndpointInfo(ICE_NULLPTR, -1, false, rawEncoding, rawBytes),
     _type(type)
 {
 }
 
 void
-IceInternal::OpaqueEndpointI::streamWrite(BasicStream* s) const
+IceInternal::OpaqueEndpointI::streamWrite(OutputStream* s) const
 {
-    s->startWriteEncaps(_rawEncoding, DefaultFormat);
+    s->startEncapsulation(_rawEncoding, ICE_ENUM(FormatType, DefaultFormat));
     s->writeBlob(_rawBytes);
-    s->endWriteEncaps();
+    s->endEncapsulation();
 }
 
 Ice::EndpointInfoPtr
 IceInternal::OpaqueEndpointI::getInfo() const
 {
-    return new OpaqueEndpointInfoI(_type, _rawEncoding, _rawBytes);
+    return ICE_MAKE_SHARED(OpaqueEndpointInfoI, _type, _rawEncoding, _rawBytes);
 }
 
 Short
@@ -131,7 +132,7 @@ IceInternal::OpaqueEndpointI::timeout() const
 EndpointIPtr
 IceInternal::OpaqueEndpointI::timeout(Int) const
 {
-    return const_cast<OpaqueEndpointI*>(this);
+    return ICE_SHARED_FROM_CONST_THIS(OpaqueEndpointI);
 }
 
 const string&
@@ -143,7 +144,7 @@ IceInternal::OpaqueEndpointI::connectionId() const
 EndpointIPtr
 IceInternal::OpaqueEndpointI::connectionId(const string&) const
 {
-    return const_cast<OpaqueEndpointI*>(this);
+    return ICE_SHARED_FROM_CONST_THIS(OpaqueEndpointI);
 }
 
 bool
@@ -155,7 +156,7 @@ IceInternal::OpaqueEndpointI::compress() const
 EndpointIPtr
 IceInternal::OpaqueEndpointI::compress(bool) const
 {
-    return const_cast<OpaqueEndpointI*>(this);
+    return ICE_SHARED_FROM_CONST_THIS(OpaqueEndpointI);
 }
 
 bool
@@ -173,7 +174,7 @@ IceInternal::OpaqueEndpointI::secure() const
 TransceiverPtr
 IceInternal::OpaqueEndpointI::transceiver() const
 {
-    return 0;
+    return ICE_NULLPTR;
 }
 
 void
@@ -185,14 +186,22 @@ IceInternal::OpaqueEndpointI::connectors_async(Ice::EndpointSelectionType, const
 AcceptorPtr
 IceInternal::OpaqueEndpointI::acceptor(const string&) const
 {
-    return 0;
+    return ICE_NULLPTR;
 }
 
 vector<EndpointIPtr>
-IceInternal::OpaqueEndpointI::expand() const
+IceInternal::OpaqueEndpointI::expandIfWildcard() const
 {
     vector<EndpointIPtr> endps;
-    endps.push_back(const_cast<OpaqueEndpointI*>(this));
+    endps.push_back(ICE_SHARED_FROM_CONST_THIS(OpaqueEndpointI));
+    return endps;
+}
+
+vector<EndpointIPtr>
+IceInternal::OpaqueEndpointI::expandHost(EndpointIPtr&) const
+{
+    vector<EndpointIPtr> endps;
+    endps.push_back(ICE_SHARED_FROM_CONST_THIS(OpaqueEndpointI));
     return endps;
 }
 
@@ -202,7 +211,6 @@ IceInternal::OpaqueEndpointI::equivalent(const EndpointIPtr&) const
     return false;
 }
 
-
 Int
 IceInternal::OpaqueEndpointI::hash() const
 {
@@ -231,7 +239,11 @@ IceInternal::OpaqueEndpointI::options() const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::OpaqueEndpointI::operator==(const Endpoint& r) const
+#else
 IceInternal::OpaqueEndpointI::operator==(const LocalObject& r) const
+#endif
 {
     const OpaqueEndpointI* p = dynamic_cast<const OpaqueEndpointI*>(&r);
     if(!p)
@@ -263,7 +275,11 @@ IceInternal::OpaqueEndpointI::operator==(const LocalObject& r) const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::OpaqueEndpointI::operator<(const Endpoint& r) const
+#else
 IceInternal::OpaqueEndpointI::operator<(const LocalObject& r) const
+#endif
 {
     const OpaqueEndpointI* p = dynamic_cast<const OpaqueEndpointI*>(&r);
     if(!p)
@@ -311,6 +327,12 @@ IceInternal::OpaqueEndpointI::operator<(const LocalObject& r) const
     return false;
 }
 
+void
+IceInternal::OpaqueEndpointI::streamWriteImpl(Ice::OutputStream*) const
+{
+    assert(false);
+}
+
 bool
 IceInternal::OpaqueEndpointI::checkOption(const string& option, const string& argument, const string& endpoint)
 {

data/ext/ice/cpp/src/Ice/OpaqueEndpointI.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.
@@ -17,13 +17,16 @@ namespace IceInternal
 {
 
 class OpaqueEndpointI : public EndpointI
+#ifdef ICE_CPP11_MAPPING
+                      , public std::enable_shared_from_this<OpaqueEndpointI>
+#endif
 {
 public:
 
     OpaqueEndpointI(std::vector<std::string>&);
-    OpaqueEndpointI(Ice::Short, BasicStream*);
+    OpaqueEndpointI(Ice::Short, Ice::InputStream*);
 
-    virtual void streamWrite(BasicStream*) const;
+    virtual void streamWrite(Ice::OutputStream*) const;
     virtual Ice::EndpointInfoPtr getInfo() const;
     virtual Ice::Short type() const;
     virtual const std::string& protocol() const;
@@ -40,19 +43,25 @@ public:
     virtual TransceiverPtr transceiver() const;
     virtual void connectors_async(Ice::EndpointSelectionType, const EndpointI_connectorsPtr&) const;
     virtual AcceptorPtr acceptor(const std::string&) const;
-    virtual std::vector<EndpointIPtr> expand() const;
+    virtual std::vector<EndpointIPtr> expandIfWildcard() const;
+    virtual std::vector<EndpointIPtr> expandHost(EndpointIPtr&) const;
     virtual bool equivalent(const EndpointIPtr&) const;
     virtual Ice::Int hash() const;
     virtual std::string options() const;
 
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const Ice::Endpoint&) const;
+    virtual bool operator<(const Ice::Endpoint&) const;
+#else
     virtual bool operator==(const Ice::LocalObject&) const;
     virtual bool operator<(const Ice::LocalObject&) const;
-
+#endif
 
     using EndpointI::connectionId;
 
 protected:
 
+    virtual void streamWriteImpl(Ice::OutputStream*) const;
     virtual bool checkOption(const std::string&, const std::string&, const std::string&);
 
 private: