zeroc-ice 3.6.5 → 3.7.0

data/ext/ice/cpp/src/Ice/WSEndpoint.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.
@@ -20,29 +20,22 @@
 namespace IceInternal
 {
 
-//
-// Delegate interface implemented by TcpEndpoint or IceSSL::Endpoint or any endpoint that WS can
-// delegate to.
-//
-class ICE_API WSEndpointDelegate : virtual public IceUtil::Shared
-{
-public:
-
-    virtual Ice::EndpointInfoPtr getWSInfo(const std::string&) const = 0;
-};
-
 class WSEndpoint : public EndpointI
+#ifdef ICE_CPP11_MAPPING
+                 , public std::enable_shared_from_this<WSEndpoint>
+#endif
 {
 public:
 
     WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, const std::string&);
     WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, std::vector<std::string>&);
-    WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, BasicStream*);
+    WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, Ice::InputStream*);
+
+    virtual void streamWriteImpl(Ice::OutputStream*) const;
 
     virtual Ice::EndpointInfoPtr getInfo() const;
     virtual Ice::Short type() const;
     virtual const std::string& protocol() const;
-    virtual void streamWrite(BasicStream*) const;
 
     virtual Ice::Int timeout() const;
     virtual EndpointIPtr timeout(Ice::Int) const;
@@ -56,17 +49,21 @@ 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;
 
-    EndpointIPtr delegate() const;
     WSEndpointPtr endpoint(const EndpointIPtr&) 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
 
 protected:
 
@@ -78,29 +75,22 @@ private:
     // All members are const, because endpoints are immutable.
     //
     const ProtocolInstancePtr _instance;
-    const IPEndpointIPtr _delegate;
+    const EndpointIPtr _delegate;
     const std::string _resource;
 };
 
-class ICE_API WSEndpointFactory : public EndpointFactory
+class ICE_API WSEndpointFactory : public EndpointFactoryWithUnderlying
 {
 public:
 
-    WSEndpointFactory(const ProtocolInstancePtr&, const EndpointFactoryPtr&);
-    virtual ~WSEndpointFactory();
+    WSEndpointFactory(const ProtocolInstancePtr&, Ice::Short);
 
-    virtual Ice::Short type() const;
-    virtual std::string protocol() const;
-    virtual EndpointIPtr create(std::vector<std::string>&, bool) const;
-    virtual EndpointIPtr read(BasicStream*) const;
-    virtual void destroy();
+    virtual EndpointFactoryPtr cloneWithUnderlying(const ProtocolInstancePtr&, Ice::Short) const;
 
-    virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const;
-
-private:
+protected:
 
-    ProtocolInstancePtr _instance;
-    const EndpointFactoryPtr _delegate;
+    virtual EndpointIPtr createWithUnderlying(const EndpointIPtr&, std::vector<std::string>&, bool) const;
+    virtual EndpointIPtr readWithUnderlying(const EndpointIPtr&, Ice::InputStream*) const;
 };
 
 }

data/ext/ice/cpp/src/Ice/WSTransceiver.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,7 +18,7 @@
 #include <Ice/LocalException.h>
 #include <Ice/Base64.h>
 #include <IceUtil/Random.h>
-#include <IceUtil/SHA1.h>
+#include <Ice/SHA1.h>
 #include <IceUtil/StringUtil.h>
 
 // Python 2.7 under Windows.
@@ -133,7 +133,7 @@ Long ice_nlltoh(const Byte* src)
     return v;
 }
 
-#if defined(ICE_OS_WINRT)
+#if defined(ICE_OS_UWP)
 Short htons(Short v)
 {
     Short result;
@@ -184,29 +184,23 @@ IceInternal::WSTransceiver::getNativeInfo()
     return _delegate->getNativeInfo();
 }
 
-#if defined(ICE_USE_IOCP)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
 AsyncInfo*
 IceInternal::WSTransceiver::getAsyncInfo(SocketOperation status)
 {
     return _delegate->getNativeInfo()->getAsyncInfo(status);
 }
-#elif defined(ICE_OS_WINRT)
-void
-IceInternal::WSTransceiver::setCompletedHandler(IceInternal::SocketOperationCompletedHandler^ handler)
-{
-    _delegate->getNativeInfo()->setCompletedHandler(handler);
-}
 #endif
 
 SocketOperation
-IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer, bool& hasMoreData)
+IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer)
 {
     //
     // Delegate logs exceptions that occur during initialize(), so there's no need to trap them here.
     //
     if(_state == StateInitializeDelegate)
     {
-        SocketOperation op = _delegate->initialize(readBuffer, writeBuffer, hasMoreData);
+        SocketOperation op = _delegate->initialize(readBuffer, writeBuffer);
         if(op != SocketOperationNone)
         {
             return op;
@@ -236,7 +230,7 @@ IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer,
                 //
                 ostringstream out;
                 out << "GET " << _resource << " HTTP/1.1\r\n"
-                    << "Host: " << _host << ":" << _port << "\r\n"
+                    << "Host: " << _host << "\r\n"
                     << "Upgrade: websocket\r\n"
                     << "Connection: Upgrade\r\n"
                     << "Sec-WebSocket-Protocol: " << _iceProtocol << "\r\n"
@@ -280,7 +274,7 @@ IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer,
         {
             if(_readBuffer.i < _readBuffer.b.end())
             {
-                SocketOperation s = _delegate->read(_readBuffer, hasMoreData);
+                SocketOperation s = _delegate->read(_readBuffer);
                 if(s == SocketOperationWrite || _readBuffer.i == _readBuffer.b.begin())
                 {
                     return s;
@@ -384,7 +378,10 @@ IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer,
         _state = StateOpened;
         _nextState = StateOpened;
 
-        hasMoreData |= _readI < _readBuffer.i;
+        if(_readI < _readBuffer.i)
+        {
+            _delegate->getNativeInfo()->ready(SocketOperationRead, true);
+        }
     }
     catch(const Ice::LocalException& ex)
     {
@@ -443,6 +440,7 @@ IceInternal::WSTransceiver::closing(bool initiator, const Ice::LocalException& r
     }
 
     _closingInitiator = initiator;
+
     if(dynamic_cast<const Ice::CloseConnectionException*>(&reason))
     {
         _closingReason = CLOSURE_NORMAL;
@@ -544,7 +542,7 @@ IceInternal::WSTransceiver::write(Buffer& buf)
 }
 
 SocketOperation
-IceInternal::WSTransceiver::read(Buffer& buf, bool& hasMoreData)
+IceInternal::WSTransceiver::read(Buffer& buf)
 {
     if(_readPending)
     {
@@ -555,11 +553,11 @@ IceInternal::WSTransceiver::read(Buffer& buf, bool& hasMoreData)
     {
         if(_state < StateConnected)
         {
-            return _delegate->read(buf, hasMoreData);
+            return _delegate->read(buf);
         }
         else
         {
-            if(_delegate->read(_readBuffer, hasMoreData) == SocketOperationWrite)
+            if(_delegate->read(_readBuffer) == SocketOperationWrite)
             {
                 return SocketOperationWrite;
             }
@@ -576,7 +574,10 @@ IceInternal::WSTransceiver::read(Buffer& buf, bool& hasMoreData)
     //
     if(buf.i == buf.b.end())
     {
-        hasMoreData |= _readI < _readBuffer.i;
+        if(_readI < _readBuffer.i)
+        {
+            _delegate->getNativeInfo()->ready(SocketOperationRead, true);
+        }
         return SocketOperationNone;
     }
 
@@ -597,17 +598,17 @@ IceInternal::WSTransceiver::read(Buffer& buf, bool& hasMoreData)
                 {
                     size_t size = buf.b.size();
                     buf.b.resize(buf.i - buf.b.begin() + readSz);
-                    s = _delegate->read(buf, hasMoreData);
+                    s = _delegate->read(buf);
                     buf.b.resize(size);
                 }
                 else
                 {
-                    s = _delegate->read(buf, hasMoreData);
+                    s = _delegate->read(buf);
                 }
             }
             else
             {
-                s = _delegate->read(_readBuffer, hasMoreData);
+                s = _delegate->read(_readBuffer);
             }
 
             if(s == SocketOperationWrite)
@@ -621,12 +622,15 @@ IceInternal::WSTransceiver::read(Buffer& buf, bool& hasMoreData)
 
     if(buf.i == buf.b.end())
     {
-        hasMoreData |= _readI < _readBuffer.i;
+        if(_readI < _readBuffer.i)
+        {
+            _delegate->getNativeInfo()->ready(SocketOperationRead, true);
+        }
         s = SocketOperationNone;
     }
     else
     {
-        hasMoreData = false;
+        _delegate->getNativeInfo()->ready(SocketOperationRead, false);
         s = SocketOperationRead;
     }
 
@@ -642,7 +646,7 @@ IceInternal::WSTransceiver::read(Buffer& buf, bool& hasMoreData)
     return s;
 }
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
 bool
 IceInternal::WSTransceiver::startWrite(Buffer& buf)
 {
@@ -767,18 +771,18 @@ IceInternal::WSTransceiver::startRead(Buffer& buf)
 }
 
 void
-IceInternal::WSTransceiver::finishRead(Buffer& buf, bool& hasMoreData)
+IceInternal::WSTransceiver::finishRead(Buffer& buf)
 {
     _readPending = false;
     if(_state < StateOpened)
     {
         if(_state < StateConnected)
         {
-            _delegate->finishRead(buf, hasMoreData);
+            _delegate->finishRead(buf);
         }
         else
         {
-            _delegate->finishRead(_readBuffer, hasMoreData);
+            _delegate->finishRead(_readBuffer);
         }
         return;
     }
@@ -789,11 +793,11 @@ IceInternal::WSTransceiver::finishRead(Buffer& buf, bool& hasMoreData)
     }
     else if(_readState == ReadStatePayload)
     {
-        _delegate->finishRead(buf, hasMoreData);
+        _delegate->finishRead(buf);
     }
     else
     {
-        _delegate->finishRead(_readBuffer, hasMoreData);
+        _delegate->finishRead(_readBuffer);
     }
 
     if(_state == StateClosed)
@@ -827,8 +831,10 @@ IceInternal::WSTransceiver::toDetailedString() const
 Ice::ConnectionInfoPtr
 IceInternal::WSTransceiver::getInfo() const
 {
-    assert(dynamic_cast<WSTransceiverDelegate*>(_delegate.get()));
-    return dynamic_cast<WSTransceiverDelegate*>(_delegate.get())->getWSInfo(_parser->getHeaders());
+    WSConnectionInfoPtr info = ICE_MAKE_SHARED(WSConnectionInfo);
+    info->underlying = _delegate->getInfo();
+    info->headers = _parser->getHeaders();
+    return info;
 }
 
 void
@@ -844,11 +850,10 @@ IceInternal::WSTransceiver::setBufferSize(int rcvSize, int sndSize)
 }
 
 IceInternal::WSTransceiver::WSTransceiver(const ProtocolInstancePtr& instance, const TransceiverPtr& del,
-                                          const string& host, int port, const string& resource) :
+                                          const string& host, const string& resource) :
     _instance(instance),
     _delegate(del),
     _host(host),
-    _port(port),
     _resource(resource),
     _incoming(false),
     _state(StateInitializeDelegate),
@@ -878,7 +883,6 @@ IceInternal::WSTransceiver::WSTransceiver(const ProtocolInstancePtr& instance, c
 IceInternal::WSTransceiver::WSTransceiver(const ProtocolInstancePtr& instance, const TransceiverPtr& del) :
     _instance(instance),
     _delegate(del),
-    _port(-1),
     _incoming(true),
     _state(StateInitializeDelegate),
     _parser(new HttpParser),
@@ -1024,7 +1028,7 @@ IceInternal::WSTransceiver::handleRequest(Buffer& responseBuffer)
     out << "Sec-WebSocket-Accept: ";
     string input = key + _wsUUID;
     vector<unsigned char> hash;
-    IceUtilInternal::sha1(reinterpret_cast<const unsigned char*>(&input[0]), input.size(), hash);
+    sha1(reinterpret_cast<const unsigned char*>(&input[0]), input.size(), hash);
     out << IceInternal::Base64::encode(hash) << "\r\n" << "\r\n"; // EOM
 
     string str = out.str();
@@ -1122,7 +1126,7 @@ IceInternal::WSTransceiver::handleResponse()
     }
     string input = _key + _wsUUID;
     vector<unsigned char> hash;
-    IceUtilInternal::sha1(reinterpret_cast<const unsigned char*>(&input[0]), input.size(), hash);
+    sha1(reinterpret_cast<const unsigned char*>(&input[0]), input.size(), hash);
     if(val != IceInternal::Base64::encode(hash))
     {
         throw WebSocketException("invalid value `" + val + "' for Sec-WebSocket-Accept");

data/ext/ice/cpp/src/Ice/WSTransceiver.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.
@@ -24,38 +24,25 @@ namespace IceInternal
 class ConnectorI;
 class AcceptorI;
 
-//
-// Delegate interface implemented by TcpTransceiver or IceSSL::Transceiver or any transport that WS can
-// delegate to.
-//
-class ICE_API WSTransceiverDelegate : virtual public IceUtil::Shared
-{
-public:
-
-    virtual Ice::ConnectionInfoPtr getWSInfo(const Ice::HeaderDict&) const = 0;
-};
-
 class WSTransceiver : public Transceiver
 {
 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 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;
@@ -66,7 +53,7 @@ public:
 
 private:
 
-    WSTransceiver(const ProtocolInstancePtr&, const TransceiverPtr&, const std::string&, int, const std::string&);
+    WSTransceiver(const ProtocolInstancePtr&, const TransceiverPtr&, const std::string&, const std::string&);
     WSTransceiver(const ProtocolInstancePtr&, const TransceiverPtr&);
     virtual ~WSTransceiver();
 
@@ -88,7 +75,6 @@ private:
     const ProtocolInstancePtr _instance;
     const TransceiverPtr _delegate;
     const std::string _host;
-    const int _port;
     const std::string _resource;
     const bool _incoming;
 

data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.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>
 //
@@ -21,264 +21,508 @@
 #include <IceDiscovery/IceDiscovery.h>
 #include <IceUtil/PushDisableWarnings.h>
 #include <Ice/LocalException.h>
-#include <Ice/ObjectFactory.h>
-#include <Ice/Outgoing.h>
+#include <Ice/ValueFactory.h>
 #include <Ice/OutgoingAsync.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
 {
 
-const ::std::string __IceDiscovery__LookupReply__foundObjectById_name = "foundObjectById";
+const ::std::string iceC_IceDiscovery_LookupReply_ids[2] =
+{
+    "::Ice::Object",
+    "::IceDiscovery::LookupReply"
+};
+const ::std::string iceC_IceDiscovery_LookupReply_ops[] =
+{
+    "foundAdapterById",
+    "foundObjectById",
+    "ice_id",
+    "ice_ids",
+    "ice_isA",
+    "ice_ping"
+};
+const ::std::string iceC_IceDiscovery_LookupReply_foundObjectById_name = "foundObjectById";
+const ::std::string iceC_IceDiscovery_LookupReply_foundAdapterById_name = "foundAdapterById";
 
-const ::std::string __IceDiscovery__LookupReply__foundAdapterById_name = "foundAdapterById";
+const ::std::string iceC_IceDiscovery_Lookup_ids[2] =
+{
+    "::Ice::Object",
+    "::IceDiscovery::Lookup"
+};
+const ::std::string iceC_IceDiscovery_Lookup_ops[] =
+{
+    "findAdapterById",
+    "findObjectById",
+    "ice_id",
+    "ice_ids",
+    "ice_isA",
+    "ice_ping"
+};
+const ::std::string iceC_IceDiscovery_Lookup_findObjectById_name = "findObjectById";
+const ::std::string iceC_IceDiscovery_Lookup_findAdapterById_name = "findAdapterById";
 
-const ::std::string __IceDiscovery__Lookup__findObjectById_name = "findObjectById";
+}
 
-const ::std::string __IceDiscovery__Lookup__findAdapterById_name = "findAdapterById";
+bool
+IceDiscovery::LookupReply::ice_isA(::std::string s, const ::Ice::Current&) const
+{
+    return ::std::binary_search(iceC_IceDiscovery_LookupReply_ids, iceC_IceDiscovery_LookupReply_ids + 2, s);
+}
 
+::std::vector<::std::string>
+IceDiscovery::LookupReply::ice_ids(const ::Ice::Current&) const
+{
+    return ::std::vector<::std::string>(&iceC_IceDiscovery_LookupReply_ids[0], &iceC_IceDiscovery_LookupReply_ids[2]);
 }
-::IceProxy::Ice::Object* ::IceProxy::IceDiscovery::upCast(::IceProxy::IceDiscovery::LookupReply* p) { return p; }
 
-void
-::IceProxy::IceDiscovery::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::IceDiscovery::LookupReply>& v)
+::std::string
+IceDiscovery::LookupReply::ice_id(const ::Ice::Current&) const
 {
-    ::Ice::ObjectPrx proxy;
-    __is->read(proxy);
-    if(!proxy)
-    {
-        v = 0;
-    }
-    else
-    {
-        v = new ::IceProxy::IceDiscovery::LookupReply;
-        v->__copyFrom(proxy);
-    }
+    return ice_staticId();
 }
 
-void
-IceProxy::IceDiscovery::LookupReply::foundObjectById(const ::Ice::Identity& __p_id, const ::Ice::ObjectPrx& __p_prx, const ::Ice::Context* __ctx)
+const ::std::string&
+IceDiscovery::LookupReply::ice_staticId()
 {
-    ::IceInternal::Outgoing __og(this, __IceDiscovery__LookupReply__foundObjectById_name, ::Ice::Normal, __ctx);
-    try
+    static const ::std::string typeId = "::IceDiscovery::LookupReply";
+    return typeId;
+}
+
+bool
+IceDiscovery::LookupReply::_iceD_foundObjectById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+{
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    auto istr = inS.startReadParams();
+    ::Ice::Identity iceP_id;
+    ::std::shared_ptr<::Ice::ObjectPrx> iceP_prx;
+    istr->readAll(iceP_id, iceP_prx);
+    inS.endReadParams();
+    this->foundObjectById(::std::move(iceP_id), ::std::move(iceP_prx), current);
+    inS.writeEmptyParams();
+    return true;
+}
+
+bool
+IceDiscovery::LookupReply::_iceD_foundAdapterById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+{
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    auto istr = inS.startReadParams();
+    ::std::string iceP_id;
+    ::std::shared_ptr<::Ice::ObjectPrx> iceP_prx;
+    bool iceP_isReplicaGroup;
+    istr->readAll(iceP_id, iceP_prx, iceP_isReplicaGroup);
+    inS.endReadParams();
+    this->foundAdapterById(::std::move(iceP_id), ::std::move(iceP_prx), iceP_isReplicaGroup, current);
+    inS.writeEmptyParams();
+    return true;
+}
+
+bool
+IceDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+{
+    ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_IceDiscovery_LookupReply_ops, iceC_IceDiscovery_LookupReply_ops + 6, current.operation);
+    if(r.first == r.second)
     {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_id);
-        __os->write(__p_prx);
-        __og.endWriteParams();
+        throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
-    catch(const ::Ice::LocalException& __ex)
+
+    switch(r.first - iceC_IceDiscovery_LookupReply_ops)
     {
-        __og.abort(__ex);
+        case 0:
+        {
+            return _iceD_foundAdapterById(in, current);
+        }
+        case 1:
+        {
+            return _iceD_foundObjectById(in, current);
+        }
+        case 2:
+        {
+            return _iceD_ice_id(in, current);
+        }
+        case 3:
+        {
+            return _iceD_ice_ids(in, current);
+        }
+        case 4:
+        {
+            return _iceD_ice_isA(in, current);
+        }
+        case 5:
+        {
+            return _iceD_ice_ping(in, current);
+        }
+        default:
+        {
+            assert(false);
+            throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        }
     }
-    __invoke(__og);
 }
 
-::Ice::AsyncResultPtr
-IceProxy::IceDiscovery::LookupReply::begin_foundObjectById(const ::Ice::Identity& __p_id, const ::Ice::ObjectPrx& __p_prx, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+bool
+IceDiscovery::Lookup::ice_isA(::std::string s, const ::Ice::Current&) const
 {
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __IceDiscovery__LookupReply__foundObjectById_name, __del, __cookie);
-    try
+    return ::std::binary_search(iceC_IceDiscovery_Lookup_ids, iceC_IceDiscovery_Lookup_ids + 2, s);
+}
+
+::std::vector<::std::string>
+IceDiscovery::Lookup::ice_ids(const ::Ice::Current&) const
+{
+    return ::std::vector<::std::string>(&iceC_IceDiscovery_Lookup_ids[0], &iceC_IceDiscovery_Lookup_ids[2]);
+}
+
+::std::string
+IceDiscovery::Lookup::ice_id(const ::Ice::Current&) const
+{
+    return ice_staticId();
+}
+
+const ::std::string&
+IceDiscovery::Lookup::ice_staticId()
+{
+    static const ::std::string typeId = "::IceDiscovery::Lookup";
+    return typeId;
+}
+
+bool
+IceDiscovery::Lookup::_iceD_findObjectById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+{
+    _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
+    auto istr = inS.startReadParams();
+    ::std::string iceP_domainId;
+    ::Ice::Identity iceP_id;
+    ::std::shared_ptr<::IceDiscovery::LookupReplyPrx> iceP_reply;
+    istr->readAll(iceP_domainId, iceP_id, iceP_reply);
+    inS.endReadParams();
+    this->findObjectById(::std::move(iceP_domainId), ::std::move(iceP_id), ::std::move(iceP_reply), current);
+    inS.writeEmptyParams();
+    return true;
+}
+
+bool
+IceDiscovery::Lookup::_iceD_findAdapterById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+{
+    _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
+    auto istr = inS.startReadParams();
+    ::std::string iceP_domainId;
+    ::std::string iceP_id;
+    ::std::shared_ptr<::IceDiscovery::LookupReplyPrx> iceP_reply;
+    istr->readAll(iceP_domainId, iceP_id, iceP_reply);
+    inS.endReadParams();
+    this->findAdapterById(::std::move(iceP_domainId), ::std::move(iceP_id), ::std::move(iceP_reply), current);
+    inS.writeEmptyParams();
+    return true;
+}
+
+bool
+IceDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+{
+    ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_IceDiscovery_Lookup_ops, iceC_IceDiscovery_Lookup_ops + 6, current.operation);
+    if(r.first == r.second)
     {
-        __result->prepare(__IceDiscovery__LookupReply__foundObjectById_name, ::Ice::Normal, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_id);
-        __os->write(__p_prx);
-        __result->endWriteParams();
-        __result->invoke();
+        throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
-    catch(const ::Ice::Exception& __ex)
+
+    switch(r.first - iceC_IceDiscovery_Lookup_ops)
     {
-        __result->abort(__ex);
+        case 0:
+        {
+            return _iceD_findAdapterById(in, current);
+        }
+        case 1:
+        {
+            return _iceD_findObjectById(in, current);
+        }
+        case 2:
+        {
+            return _iceD_ice_id(in, current);
+        }
+        case 3:
+        {
+            return _iceD_ice_ids(in, current);
+        }
+        case 4:
+        {
+            return _iceD_ice_isA(in, current);
+        }
+        case 5:
+        {
+            return _iceD_ice_ping(in, current);
+        }
+        default:
+        {
+            assert(false);
+            throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        }
     }
-    return __result;
 }
 
 void
-IceProxy::IceDiscovery::LookupReply::end_foundObjectById(const ::Ice::AsyncResultPtr& __result)
+IceDiscovery::LookupReplyPrx::_iceI_foundObjectById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::Ice::Identity& iceP_id, const ::std::shared_ptr<::Ice::ObjectPrx>& iceP_prx, const ::Ice::Context& context)
 {
-    __end(__result, __IceDiscovery__LookupReply__foundObjectById_name);
+    outAsync->invoke(iceC_IceDiscovery_LookupReply_foundObjectById_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        [&](::Ice::OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_id, iceP_prx);
+        },
+        nullptr);
 }
 
 void
-IceProxy::IceDiscovery::LookupReply::foundAdapterById(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_prx, bool __p_isReplicaGroup, const ::Ice::Context* __ctx)
+IceDiscovery::LookupReplyPrx::_iceI_foundAdapterById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_id, const ::std::shared_ptr<::Ice::ObjectPrx>& iceP_prx, bool iceP_isReplicaGroup, const ::Ice::Context& context)
 {
-    ::IceInternal::Outgoing __og(this, __IceDiscovery__LookupReply__foundAdapterById_name, ::Ice::Normal, __ctx);
-    try
-    {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_id);
-        __os->write(__p_prx);
-        __os->write(__p_isReplicaGroup);
-        __og.endWriteParams();
-    }
-    catch(const ::Ice::LocalException& __ex)
-    {
-        __og.abort(__ex);
-    }
-    __invoke(__og);
+    outAsync->invoke(iceC_IceDiscovery_LookupReply_foundAdapterById_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        [&](::Ice::OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_id, iceP_prx, iceP_isReplicaGroup);
+        },
+        nullptr);
 }
 
-::Ice::AsyncResultPtr
-IceProxy::IceDiscovery::LookupReply::begin_foundAdapterById(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_prx, bool __p_isReplicaGroup, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+::std::shared_ptr<::Ice::ObjectPrx>
+IceDiscovery::LookupReplyPrx::_newInstance() const
 {
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __IceDiscovery__LookupReply__foundAdapterById_name, __del, __cookie);
-    try
-    {
-        __result->prepare(__IceDiscovery__LookupReply__foundAdapterById_name, ::Ice::Normal, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_id);
-        __os->write(__p_prx);
-        __os->write(__p_isReplicaGroup);
-        __result->endWriteParams();
-        __result->invoke();
-    }
-    catch(const ::Ice::Exception& __ex)
-    {
-        __result->abort(__ex);
-    }
-    return __result;
+    return ::IceInternal::createProxy<LookupReplyPrx>();
+}
+
+const ::std::string&
+IceDiscovery::LookupReplyPrx::ice_staticId()
+{
+    return IceDiscovery::LookupReply::ice_staticId();
 }
 
 void
-IceProxy::IceDiscovery::LookupReply::end_foundAdapterById(const ::Ice::AsyncResultPtr& __result)
+IceDiscovery::LookupPrx::_iceI_findObjectById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_domainId, const ::Ice::Identity& iceP_id, const ::std::shared_ptr<::IceDiscovery::LookupReplyPrx>& iceP_reply, const ::Ice::Context& context)
 {
-    __end(__result, __IceDiscovery__LookupReply__foundAdapterById_name);
+    outAsync->invoke(iceC_IceDiscovery_Lookup_findObjectById_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
+        [&](::Ice::OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_domainId, iceP_id, iceP_reply);
+        },
+        nullptr);
+}
+
+void
+IceDiscovery::LookupPrx::_iceI_findAdapterById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_domainId, const ::std::string& iceP_id, const ::std::shared_ptr<::IceDiscovery::LookupReplyPrx>& iceP_reply, const ::Ice::Context& context)
+{
+    outAsync->invoke(iceC_IceDiscovery_Lookup_findAdapterById_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
+        [&](::Ice::OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_domainId, iceP_id, iceP_reply);
+        },
+        nullptr);
+}
+
+::std::shared_ptr<::Ice::ObjectPrx>
+IceDiscovery::LookupPrx::_newInstance() const
+{
+    return ::IceInternal::createProxy<LookupPrx>();
 }
 
 const ::std::string&
-IceProxy::IceDiscovery::LookupReply::ice_staticId()
+IceDiscovery::LookupPrx::ice_staticId()
 {
-    return ::IceDiscovery::LookupReply::ice_staticId();
+    return IceDiscovery::Lookup::ice_staticId();
 }
 
-::IceProxy::Ice::Object*
-IceProxy::IceDiscovery::LookupReply::__newInstance() const
+#else // C++98 mapping
+
+namespace
 {
-    return new LookupReply;
+
+const ::std::string iceC_IceDiscovery_LookupReply_foundObjectById_name = "foundObjectById";
+
+const ::std::string iceC_IceDiscovery_LookupReply_foundAdapterById_name = "foundAdapterById";
+
+const ::std::string iceC_IceDiscovery_Lookup_findObjectById_name = "findObjectById";
+
+const ::std::string iceC_IceDiscovery_Lookup_findAdapterById_name = "findAdapterById";
+
 }
-::IceProxy::Ice::Object* ::IceProxy::IceDiscovery::upCast(::IceProxy::IceDiscovery::Lookup* p) { return p; }
+::IceProxy::Ice::Object* ::IceProxy::IceDiscovery::upCast(::IceProxy::IceDiscovery::LookupReply* p) { return p; }
 
 void
-::IceProxy::IceDiscovery::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::IceDiscovery::Lookup>& v)
+::IceProxy::IceDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceDiscovery::LookupReply>& v)
 {
     ::Ice::ObjectPrx proxy;
-    __is->read(proxy);
+    istr->read(proxy);
     if(!proxy)
     {
         v = 0;
     }
     else
     {
-        v = new ::IceProxy::IceDiscovery::Lookup;
-        v->__copyFrom(proxy);
+        v = new ::IceProxy::IceDiscovery::LookupReply;
+        v->_copyFrom(proxy);
     }
 }
 
-void
-IceProxy::IceDiscovery::Lookup::findObjectById(const ::std::string& __p_domainId, const ::Ice::Identity& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context* __ctx)
+::Ice::AsyncResultPtr
+IceProxy::IceDiscovery::LookupReply::_iceI_begin_foundObjectById(const ::Ice::Identity& iceP_id, const ::Ice::ObjectPrx& iceP_prx, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
-    ::IceInternal::Outgoing __og(this, __IceDiscovery__Lookup__findObjectById_name, ::Ice::Idempotent, __ctx);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_IceDiscovery_LookupReply_foundObjectById_name, del, cookie, sync);
     try
     {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_domainId);
-        __os->write(__p_id);
-        __os->write(__p_reply);
-        __og.endWriteParams();
+        result->prepare(iceC_IceDiscovery_LookupReply_foundObjectById_name, ::Ice::Normal, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_id);
+        ostr->write(iceP_prx);
+        result->endWriteParams();
+        result->invoke(iceC_IceDiscovery_LookupReply_foundObjectById_name);
     }
-    catch(const ::Ice::LocalException& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __og.abort(__ex);
+        result->abort(ex);
     }
-    __invoke(__og);
+    return result;
+}
+
+void
+IceProxy::IceDiscovery::LookupReply::end_foundObjectById(const ::Ice::AsyncResultPtr& result)
+{
+    _end(result, iceC_IceDiscovery_LookupReply_foundObjectById_name);
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::IceDiscovery::Lookup::begin_findObjectById(const ::std::string& __p_domainId, const ::Ice::Identity& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::IceDiscovery::LookupReply::_iceI_begin_foundAdapterById(const ::std::string& iceP_id, const ::Ice::ObjectPrx& iceP_prx, bool iceP_isReplicaGroup, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __IceDiscovery__Lookup__findObjectById_name, __del, __cookie);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_IceDiscovery_LookupReply_foundAdapterById_name, del, cookie, sync);
     try
     {
-        __result->prepare(__IceDiscovery__Lookup__findObjectById_name, ::Ice::Idempotent, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_domainId);
-        __os->write(__p_id);
-        __os->write(__p_reply);
-        __result->endWriteParams();
-        __result->invoke();
+        result->prepare(iceC_IceDiscovery_LookupReply_foundAdapterById_name, ::Ice::Normal, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_id);
+        ostr->write(iceP_prx);
+        ostr->write(iceP_isReplicaGroup);
+        result->endWriteParams();
+        result->invoke(iceC_IceDiscovery_LookupReply_foundAdapterById_name);
     }
-    catch(const ::Ice::Exception& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __result->abort(__ex);
+        result->abort(ex);
     }
-    return __result;
+    return result;
 }
 
 void
-IceProxy::IceDiscovery::Lookup::end_findObjectById(const ::Ice::AsyncResultPtr& __result)
+IceProxy::IceDiscovery::LookupReply::end_foundAdapterById(const ::Ice::AsyncResultPtr& result)
+{
+    _end(result, iceC_IceDiscovery_LookupReply_foundAdapterById_name);
+}
+
+::IceProxy::Ice::Object*
+IceProxy::IceDiscovery::LookupReply::_newInstance() const
+{
+    return new LookupReply;
+}
+
+const ::std::string&
+IceProxy::IceDiscovery::LookupReply::ice_staticId()
 {
-    __end(__result, __IceDiscovery__Lookup__findObjectById_name);
+    return ::IceDiscovery::LookupReply::ice_staticId();
 }
+::IceProxy::Ice::Object* ::IceProxy::IceDiscovery::upCast(::IceProxy::IceDiscovery::Lookup* p) { return p; }
 
 void
-IceProxy::IceDiscovery::Lookup::findAdapterById(const ::std::string& __p_domainId, const ::std::string& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context* __ctx)
+::IceProxy::IceDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceDiscovery::Lookup>& v)
 {
-    ::IceInternal::Outgoing __og(this, __IceDiscovery__Lookup__findAdapterById_name, ::Ice::Idempotent, __ctx);
+    ::Ice::ObjectPrx proxy;
+    istr->read(proxy);
+    if(!proxy)
+    {
+        v = 0;
+    }
+    else
+    {
+        v = new ::IceProxy::IceDiscovery::Lookup;
+        v->_copyFrom(proxy);
+    }
+}
+
+::Ice::AsyncResultPtr
+IceProxy::IceDiscovery::Lookup::_iceI_begin_findObjectById(const ::std::string& iceP_domainId, const ::Ice::Identity& iceP_id, const ::IceDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
+{
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_IceDiscovery_Lookup_findObjectById_name, del, cookie, sync);
     try
     {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_domainId);
-        __os->write(__p_id);
-        __os->write(__p_reply);
-        __og.endWriteParams();
+        result->prepare(iceC_IceDiscovery_Lookup_findObjectById_name, ::Ice::Idempotent, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_domainId);
+        ostr->write(iceP_id);
+        ostr->write(iceP_reply);
+        result->endWriteParams();
+        result->invoke(iceC_IceDiscovery_Lookup_findObjectById_name);
     }
-    catch(const ::Ice::LocalException& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __og.abort(__ex);
+        result->abort(ex);
     }
-    __invoke(__og);
+    return result;
+}
+
+void
+IceProxy::IceDiscovery::Lookup::end_findObjectById(const ::Ice::AsyncResultPtr& result)
+{
+    _end(result, iceC_IceDiscovery_Lookup_findObjectById_name);
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::IceDiscovery::Lookup::begin_findAdapterById(const ::std::string& __p_domainId, const ::std::string& __p_id, const ::IceDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::IceDiscovery::Lookup::_iceI_begin_findAdapterById(const ::std::string& iceP_domainId, const ::std::string& iceP_id, const ::IceDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __IceDiscovery__Lookup__findAdapterById_name, __del, __cookie);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_IceDiscovery_Lookup_findAdapterById_name, del, cookie, sync);
     try
     {
-        __result->prepare(__IceDiscovery__Lookup__findAdapterById_name, ::Ice::Idempotent, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_domainId);
-        __os->write(__p_id);
-        __os->write(__p_reply);
-        __result->endWriteParams();
-        __result->invoke();
+        result->prepare(iceC_IceDiscovery_Lookup_findAdapterById_name, ::Ice::Idempotent, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_domainId);
+        ostr->write(iceP_id);
+        ostr->write(iceP_reply);
+        result->endWriteParams();
+        result->invoke(iceC_IceDiscovery_Lookup_findAdapterById_name);
     }
-    catch(const ::Ice::Exception& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __result->abort(__ex);
+        result->abort(ex);
     }
-    return __result;
+    return result;
 }
 
 void
-IceProxy::IceDiscovery::Lookup::end_findAdapterById(const ::Ice::AsyncResultPtr& __result)
+IceProxy::IceDiscovery::Lookup::end_findAdapterById(const ::Ice::AsyncResultPtr& result)
+{
+    _end(result, iceC_IceDiscovery_Lookup_findAdapterById_name);
+}
+
+::IceProxy::Ice::Object*
+IceProxy::IceDiscovery::Lookup::_newInstance() const
 {
-    __end(__result, __IceDiscovery__Lookup__findAdapterById_name);
+    return new Lookup;
 }
 
 const ::std::string&
@@ -287,17 +531,16 @@ IceProxy::IceDiscovery::Lookup::ice_staticId()
     return ::IceDiscovery::Lookup::ice_staticId();
 }
 
-::IceProxy::Ice::Object*
-IceProxy::IceDiscovery::Lookup::__newInstance() const
+IceDiscovery::LookupReply::~LookupReply()
 {
-    return new Lookup;
 }
 
 ::Ice::Object* IceDiscovery::upCast(::IceDiscovery::LookupReply* p) { return p; }
 
+
 namespace
 {
-const ::std::string __IceDiscovery__LookupReply_ids[2] =
+const ::std::string iceC_IceDiscovery_LookupReply_ids[2] =
 {
     "::Ice::Object",
     "::IceDiscovery::LookupReply"
@@ -306,21 +549,21 @@ const ::std::string __IceDiscovery__LookupReply_ids[2] =
 }
 
 bool
-IceDiscovery::LookupReply::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
+IceDiscovery::LookupReply::ice_isA(const ::std::string& s, const ::Ice::Current&) const
 {
-    return ::std::binary_search(__IceDiscovery__LookupReply_ids, __IceDiscovery__LookupReply_ids + 2, _s);
+    return ::std::binary_search(iceC_IceDiscovery_LookupReply_ids, iceC_IceDiscovery_LookupReply_ids + 2, s);
 }
 
 ::std::vector< ::std::string>
 IceDiscovery::LookupReply::ice_ids(const ::Ice::Current&) const
 {
-    return ::std::vector< ::std::string>(&__IceDiscovery__LookupReply_ids[0], &__IceDiscovery__LookupReply_ids[2]);
+    return ::std::vector< ::std::string>(&iceC_IceDiscovery_LookupReply_ids[0], &iceC_IceDiscovery_LookupReply_ids[2]);
 }
 
 const ::std::string&
 IceDiscovery::LookupReply::ice_id(const ::Ice::Current&) const
 {
-    return __IceDiscovery__LookupReply_ids[1];
+    return ice_staticId();
 }
 
 const ::std::string&
@@ -330,45 +573,45 @@ IceDiscovery::LookupReply::ice_staticId()
     static const ::std::string typeId = "::IceDiscovery::LookupReply";
     return typeId;
 #else
-    return __IceDiscovery__LookupReply_ids[1];
+    return iceC_IceDiscovery_LookupReply_ids[1];
 #endif
 }
 
-::Ice::DispatchStatus
-IceDiscovery::LookupReply::___foundObjectById(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
+bool
+IceDiscovery::LookupReply::_iceD_foundObjectById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
-    __checkMode(::Ice::Normal, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::Ice::Identity __p_id;
-    ::Ice::ObjectPrx __p_prx;
-    __is->read(__p_id);
-    __is->read(__p_prx);
-    __inS.endReadParams();
-    foundObjectById(__p_id, __p_prx, __current);
-    __inS.__writeEmptyParams();
-    return ::Ice::DispatchOK;
+    _iceCheckMode(::Ice::Normal, current.mode);
+    ::Ice::InputStream* istr = inS.startReadParams();
+    ::Ice::Identity iceP_id;
+    ::Ice::ObjectPrx iceP_prx;
+    istr->read(iceP_id);
+    istr->read(iceP_prx);
+    inS.endReadParams();
+    this->foundObjectById(iceP_id, iceP_prx, current);
+    inS.writeEmptyParams();
+    return true;
 }
 
-::Ice::DispatchStatus
-IceDiscovery::LookupReply::___foundAdapterById(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
-    __checkMode(::Ice::Normal, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string __p_id;
-    ::Ice::ObjectPrx __p_prx;
-    bool __p_isReplicaGroup;
-    __is->read(__p_id);
-    __is->read(__p_prx);
-    __is->read(__p_isReplicaGroup);
-    __inS.endReadParams();
-    foundAdapterById(__p_id, __p_prx, __p_isReplicaGroup, __current);
-    __inS.__writeEmptyParams();
-    return ::Ice::DispatchOK;
+bool
+IceDiscovery::LookupReply::_iceD_foundAdapterById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+{
+    _iceCheckMode(::Ice::Normal, current.mode);
+    ::Ice::InputStream* istr = inS.startReadParams();
+    ::std::string iceP_id;
+    ::Ice::ObjectPrx iceP_prx;
+    bool iceP_isReplicaGroup;
+    istr->read(iceP_id);
+    istr->read(iceP_prx);
+    istr->read(iceP_isReplicaGroup);
+    inS.endReadParams();
+    this->foundAdapterById(iceP_id, iceP_prx, iceP_isReplicaGroup, current);
+    inS.writeEmptyParams();
+    return true;
 }
 
 namespace
 {
-const ::std::string __IceDiscovery__LookupReply_all[] =
+const ::std::string iceC_IceDiscovery_LookupReply_all[] =
 {
     "foundAdapterById",
     "foundObjectById",
@@ -380,63 +623,67 @@ const ::std::string __IceDiscovery__LookupReply_all[] =
 
 }
 
-::Ice::DispatchStatus
-IceDiscovery::LookupReply::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+bool
+IceDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
 {
-    ::std::pair< const ::std::string*, const ::std::string*> r = ::std::equal_range(__IceDiscovery__LookupReply_all, __IceDiscovery__LookupReply_all + 6, current.operation);
+    ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_IceDiscovery_LookupReply_all, iceC_IceDiscovery_LookupReply_all + 6, current.operation);
     if(r.first == r.second)
     {
         throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
 
-    switch(r.first - __IceDiscovery__LookupReply_all)
+    switch(r.first - iceC_IceDiscovery_LookupReply_all)
     {
         case 0:
         {
-            return ___foundAdapterById(in, current);
+            return _iceD_foundAdapterById(in, current);
         }
         case 1:
         {
-            return ___foundObjectById(in, current);
+            return _iceD_foundObjectById(in, current);
         }
         case 2:
         {
-            return ___ice_id(in, current);
+            return _iceD_ice_id(in, current);
         }
         case 3:
         {
-            return ___ice_ids(in, current);
+            return _iceD_ice_ids(in, current);
         }
         case 4:
         {
-            return ___ice_isA(in, current);
+            return _iceD_ice_isA(in, current);
         }
         case 5:
         {
-            return ___ice_ping(in, current);
+            return _iceD_ice_ping(in, current);
+        }
+        default:
+        {
+            assert(false);
+            throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
         }
     }
-
-    assert(false);
-    throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
 }
 
 void
-IceDiscovery::LookupReply::__writeImpl(::IceInternal::BasicStream* __os) const
+IceDiscovery::LookupReply::_iceWriteImpl(::Ice::OutputStream* ostr) const
 {
-    __os->startWriteSlice(ice_staticId(), -1, true);
-    __os->endWriteSlice();
+    ostr->startSlice(ice_staticId(), -1, true);
+    Ice::StreamWriter< ::IceDiscovery::LookupReply, ::Ice::OutputStream>::write(ostr, *this);
+    ostr->endSlice();
 }
 
 void
-IceDiscovery::LookupReply::__readImpl(::IceInternal::BasicStream* __is)
+IceDiscovery::LookupReply::_iceReadImpl(::Ice::InputStream* istr)
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    istr->startSlice();
+    Ice::StreamReader< ::IceDiscovery::LookupReply, ::Ice::InputStream>::read(istr, *this);
+    istr->endSlice();
 }
 
-void 
-IceDiscovery::__patch(LookupReplyPtr& handle, const ::Ice::ObjectPtr& v)
+void
+IceDiscovery::_icePatchObjectPtr(LookupReplyPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::IceDiscovery::LookupReplyPtr::dynamicCast(v);
     if(v && !handle)
@@ -445,11 +692,16 @@ IceDiscovery::__patch(LookupReplyPtr& handle, const ::Ice::ObjectPtr& v)
     }
 }
 
+IceDiscovery::Lookup::~Lookup()
+{
+}
+
 ::Ice::Object* IceDiscovery::upCast(::IceDiscovery::Lookup* p) { return p; }
 
+
 namespace
 {
-const ::std::string __IceDiscovery__Lookup_ids[2] =
+const ::std::string iceC_IceDiscovery_Lookup_ids[2] =
 {
     "::Ice::Object",
     "::IceDiscovery::Lookup"
@@ -458,21 +710,21 @@ const ::std::string __IceDiscovery__Lookup_ids[2] =
 }
 
 bool
-IceDiscovery::Lookup::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
+IceDiscovery::Lookup::ice_isA(const ::std::string& s, const ::Ice::Current&) const
 {
-    return ::std::binary_search(__IceDiscovery__Lookup_ids, __IceDiscovery__Lookup_ids + 2, _s);
+    return ::std::binary_search(iceC_IceDiscovery_Lookup_ids, iceC_IceDiscovery_Lookup_ids + 2, s);
 }
 
 ::std::vector< ::std::string>
 IceDiscovery::Lookup::ice_ids(const ::Ice::Current&) const
 {
-    return ::std::vector< ::std::string>(&__IceDiscovery__Lookup_ids[0], &__IceDiscovery__Lookup_ids[2]);
+    return ::std::vector< ::std::string>(&iceC_IceDiscovery_Lookup_ids[0], &iceC_IceDiscovery_Lookup_ids[2]);
 }
 
 const ::std::string&
 IceDiscovery::Lookup::ice_id(const ::Ice::Current&) const
 {
-    return __IceDiscovery__Lookup_ids[1];
+    return ice_staticId();
 }
 
 const ::std::string&
@@ -482,47 +734,47 @@ IceDiscovery::Lookup::ice_staticId()
     static const ::std::string typeId = "::IceDiscovery::Lookup";
     return typeId;
 #else
-    return __IceDiscovery__Lookup_ids[1];
+    return iceC_IceDiscovery_Lookup_ids[1];
 #endif
 }
 
-::Ice::DispatchStatus
-IceDiscovery::Lookup::___findObjectById(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
-    __checkMode(::Ice::Idempotent, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string __p_domainId;
-    ::Ice::Identity __p_id;
-    ::IceDiscovery::LookupReplyPrx __p_reply;
-    __is->read(__p_domainId);
-    __is->read(__p_id);
-    __is->read(__p_reply);
-    __inS.endReadParams();
-    findObjectById(__p_domainId, __p_id, __p_reply, __current);
-    __inS.__writeEmptyParams();
-    return ::Ice::DispatchOK;
-}
-
-::Ice::DispatchStatus
-IceDiscovery::Lookup::___findAdapterById(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
-    __checkMode(::Ice::Idempotent, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string __p_domainId;
-    ::std::string __p_id;
-    ::IceDiscovery::LookupReplyPrx __p_reply;
-    __is->read(__p_domainId);
-    __is->read(__p_id);
-    __is->read(__p_reply);
-    __inS.endReadParams();
-    findAdapterById(__p_domainId, __p_id, __p_reply, __current);
-    __inS.__writeEmptyParams();
-    return ::Ice::DispatchOK;
+bool
+IceDiscovery::Lookup::_iceD_findObjectById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+{
+    _iceCheckMode(::Ice::Idempotent, current.mode);
+    ::Ice::InputStream* istr = inS.startReadParams();
+    ::std::string iceP_domainId;
+    ::Ice::Identity iceP_id;
+    ::IceDiscovery::LookupReplyPrx iceP_reply;
+    istr->read(iceP_domainId);
+    istr->read(iceP_id);
+    istr->read(iceP_reply);
+    inS.endReadParams();
+    this->findObjectById(iceP_domainId, iceP_id, iceP_reply, current);
+    inS.writeEmptyParams();
+    return true;
+}
+
+bool
+IceDiscovery::Lookup::_iceD_findAdapterById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+{
+    _iceCheckMode(::Ice::Idempotent, current.mode);
+    ::Ice::InputStream* istr = inS.startReadParams();
+    ::std::string iceP_domainId;
+    ::std::string iceP_id;
+    ::IceDiscovery::LookupReplyPrx iceP_reply;
+    istr->read(iceP_domainId);
+    istr->read(iceP_id);
+    istr->read(iceP_reply);
+    inS.endReadParams();
+    this->findAdapterById(iceP_domainId, iceP_id, iceP_reply, current);
+    inS.writeEmptyParams();
+    return true;
 }
 
 namespace
 {
-const ::std::string __IceDiscovery__Lookup_all[] =
+const ::std::string iceC_IceDiscovery_Lookup_all[] =
 {
     "findAdapterById",
     "findObjectById",
@@ -534,63 +786,67 @@ const ::std::string __IceDiscovery__Lookup_all[] =
 
 }
 
-::Ice::DispatchStatus
-IceDiscovery::Lookup::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+bool
+IceDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
 {
-    ::std::pair< const ::std::string*, const ::std::string*> r = ::std::equal_range(__IceDiscovery__Lookup_all, __IceDiscovery__Lookup_all + 6, current.operation);
+    ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_IceDiscovery_Lookup_all, iceC_IceDiscovery_Lookup_all + 6, current.operation);
     if(r.first == r.second)
     {
         throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
 
-    switch(r.first - __IceDiscovery__Lookup_all)
+    switch(r.first - iceC_IceDiscovery_Lookup_all)
     {
         case 0:
         {
-            return ___findAdapterById(in, current);
+            return _iceD_findAdapterById(in, current);
         }
         case 1:
         {
-            return ___findObjectById(in, current);
+            return _iceD_findObjectById(in, current);
         }
         case 2:
         {
-            return ___ice_id(in, current);
+            return _iceD_ice_id(in, current);
         }
         case 3:
         {
-            return ___ice_ids(in, current);
+            return _iceD_ice_ids(in, current);
         }
         case 4:
         {
-            return ___ice_isA(in, current);
+            return _iceD_ice_isA(in, current);
         }
         case 5:
         {
-            return ___ice_ping(in, current);
+            return _iceD_ice_ping(in, current);
+        }
+        default:
+        {
+            assert(false);
+            throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
         }
     }
-
-    assert(false);
-    throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
 }
 
 void
-IceDiscovery::Lookup::__writeImpl(::IceInternal::BasicStream* __os) const
+IceDiscovery::Lookup::_iceWriteImpl(::Ice::OutputStream* ostr) const
 {
-    __os->startWriteSlice(ice_staticId(), -1, true);
-    __os->endWriteSlice();
+    ostr->startSlice(ice_staticId(), -1, true);
+    Ice::StreamWriter< ::IceDiscovery::Lookup, ::Ice::OutputStream>::write(ostr, *this);
+    ostr->endSlice();
 }
 
 void
-IceDiscovery::Lookup::__readImpl(::IceInternal::BasicStream* __is)
+IceDiscovery::Lookup::_iceReadImpl(::Ice::InputStream* istr)
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    istr->startSlice();
+    Ice::StreamReader< ::IceDiscovery::Lookup, ::Ice::InputStream>::read(istr, *this);
+    istr->endSlice();
 }
 
-void 
-IceDiscovery::__patch(LookupPtr& handle, const ::Ice::ObjectPtr& v)
+void
+IceDiscovery::_icePatchObjectPtr(LookupPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::IceDiscovery::LookupPtr::dynamicCast(v);
     if(v && !handle)
@@ -598,3 +854,9 @@ IceDiscovery::__patch(LookupPtr& handle, const ::Ice::ObjectPtr& v)
         IceInternal::Ex::throwUOE(::IceDiscovery::Lookup::ice_staticId(), v);
     }
 }
+
+namespace Ice
+{
+}
+
+#endif