zeroc-ice 3.6.5 → 3.7.0

data/ext/ice/cpp/src/IceDiscovery/LookupI.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.
@@ -15,6 +15,9 @@
 
 #include <IceUtil/Timer.h>
 #include <Ice/Properties.h>
+#include <Ice/Comparable.h>
+
+#include <set>
 
 namespace IceDiscovery
 {
@@ -28,21 +31,29 @@ public:
     Request(const LookupIPtr&, int);
 
     virtual bool retry();
+    void invoke(const std::string&, const std::vector<std::pair<LookupPrxPtr, LookupReplyPrxPtr> >&);
+    bool exception();
+    std::string getRequestId() const;
 
-    const std::string& getRequestId() const;
+    virtual void finished(const Ice::ObjectPrxPtr&) = 0;
 
 protected:
 
+    virtual void invokeWithLookup(const std::string&, const LookupPrxPtr&, const LookupReplyPrxPtr&) = 0;
+
     LookupIPtr _lookup;
-    int _nRetry;
     const std::string _requestId;
+    int _retryCount;
+    size_t _lookupCount;
+    size_t _failureCount;
 };
+ICE_DEFINE_PTR(RequestPtr, Request);
 
 template<class T, class CB> class RequestT : public Request
 {
 public:
 
-    RequestT(LookupI* lookup, T id, int retryCount) : Request(lookup, retryCount), _id(id)
+    RequestT(const LookupIPtr& lookup, T id, int retryCount) : Request(lookup, retryCount), _id(id)
     {
     }
 
@@ -51,17 +62,21 @@ public:
         return _id;
     }
 
-    bool addCallback(CB cb)
+    bool addCallback(const CB& cb)
     {
         _callbacks.push_back(cb);
         return _callbacks.size() == 1;
     }
 
-    virtual void finished(const Ice::ObjectPrx& proxy)
+    virtual void finished(const Ice::ObjectPrxPtr& proxy)
     {
         for(typename std::vector<CB>::const_iterator p = _callbacks.begin(); p != _callbacks.end(); ++p)
         {
+#ifdef ICE_CPP11_MAPPING
+            p->first(proxy);
+#else
             (*p)->ice_response(proxy);
+#endif
         }
         _callbacks.clear();
     }
@@ -72,71 +87,97 @@ protected:
     std::vector<CB> _callbacks;
 };
 
-class ObjectRequest : public RequestT<Ice::Identity, Ice::AMD_Locator_findObjectByIdPtr>
+#ifdef ICE_CPP11_MAPPING
+typedef std::pair<std::function<void(const std::shared_ptr<::Ice::ObjectPrx>&)>,
+                  std::function<void(std::exception_ptr)>> ObjectCB;
+typedef std::pair<std::function<void(const std::shared_ptr<::Ice::ObjectPrx>&)>,
+                  std::function<void(std::exception_ptr)>> AdapterCB;
+#else
+typedef Ice::AMD_Locator_findObjectByIdPtr ObjectCB;
+typedef Ice::AMD_Locator_findAdapterByIdPtr AdapterCB;
+#endif
+
+class ObjectRequest : public RequestT<Ice::Identity, ObjectCB>
+#ifdef ICE_CPP11_MAPPING
+                      , public std::enable_shared_from_this<ObjectRequest>
+#endif
 {
 public:
 
-    ObjectRequest(LookupI* lookup, const Ice::Identity& id, int retryCount) :
-        RequestT<Ice::Identity, Ice::AMD_Locator_findObjectByIdPtr>(lookup, id, retryCount)
-    {
-    }
+    ObjectRequest(const LookupIPtr&, const Ice::Identity&, int);
 
-    void response(const Ice::ObjectPrx&);
+    void response(const Ice::ObjectPrxPtr&);
 
 private:
 
+    virtual void invokeWithLookup(const std::string&, const LookupPrxPtr&, const LookupReplyPrxPtr&);
     virtual void runTimerTask();
 };
-typedef IceUtil::Handle<ObjectRequest> ObjectRequestPtr;
+ICE_DEFINE_PTR(ObjectRequestPtr, ObjectRequest);
 
-class AdapterRequest : public RequestT<std::string, Ice::AMD_Locator_findAdapterByIdPtr>
+class AdapterRequest : public RequestT<std::string, AdapterCB>
+#ifdef ICE_CPP11_MAPPING
+                      , public std::enable_shared_from_this<AdapterRequest>
+#endif
 {
 public:
 
-    AdapterRequest(LookupI* lookup, const std::string& adapterId, int retryCount) :
-        RequestT<std::string, Ice::AMD_Locator_findAdapterByIdPtr>(lookup, adapterId, retryCount),
-        _start(IceUtil::Time::now())
-    {
-    }
+    AdapterRequest(const LookupIPtr&, const std::string&, int);
 
-    bool response(const Ice::ObjectPrx&, bool);
+    bool response(const Ice::ObjectPrxPtr&, bool);
 
     virtual bool retry();
-    virtual void finished(const Ice::ObjectPrx&);
+    virtual void finished(const Ice::ObjectPrxPtr&);
 
 private:
 
+    virtual void invokeWithLookup(const std::string&, const LookupPrxPtr&, const LookupReplyPrxPtr&);
     virtual void runTimerTask();
-    std::vector<Ice::ObjectPrx> _proxies;
+
+    //
+    // We use a set because the same IceDiscovery plugin might return multiple times
+    // the same proxy if it's accessible through multiple network interfaces and if we
+    // also sent the request to multiple interfaces.
+    //
+#ifdef ICE_CPP11_MAPPING
+    std::set<std::shared_ptr<Ice::ObjectPrx>, Ice::TargetCompare<std::shared_ptr<Ice::ObjectPrx>, std::less>> _proxies;
+#else
+    std::set<Ice::ObjectPrx> _proxies;
+#endif
     IceUtil::Time _start;
     IceUtil::Time _latency;
 };
-typedef IceUtil::Handle<AdapterRequest> AdapterRequestPtr;
+ICE_DEFINE_PTR(AdapterRequestPtr, AdapterRequest);
 
-class LookupI : public Lookup, private IceUtil::Mutex
+class LookupI : public Lookup,
+                private IceUtil::Mutex
+#ifdef ICE_CPP11_MAPPING
+              , public std::enable_shared_from_this<LookupI>
+#endif
 {
 public:
 
-    LookupI(const LocatorRegistryIPtr&, const LookupPrx&, const Ice::PropertiesPtr&);
+    LookupI(const LocatorRegistryIPtr&, const LookupPrxPtr&, const Ice::PropertiesPtr&);
     virtual ~LookupI();
 
     void destroy();
 
-    void setLookupReply(const LookupReplyPrx&);
+    void setLookupReply(const LookupReplyPrxPtr&);
 
-    virtual void findObjectById(const std::string&, const Ice::Identity&, const IceDiscovery::LookupReplyPrx&,
+    virtual void findObjectById(ICE_IN(std::string), ICE_IN(Ice::Identity), ICE_IN(IceDiscovery::LookupReplyPrxPtr),
                                 const Ice::Current&);
-    virtual void findAdapterById(const std::string&, const std::string&, const IceDiscovery::LookupReplyPrx&,
+    virtual void findAdapterById(ICE_IN(std::string), ICE_IN(std::string), ICE_IN(IceDiscovery::LookupReplyPrxPtr),
                                  const Ice::Current&);
+    void findObject(const ObjectCB&, const Ice::Identity&);
+    void findAdapter(const AdapterCB&, const std::string&);
 
-    void findObject(const Ice::AMD_Locator_findObjectByIdPtr&, const Ice::Identity&);
-    void findAdapter(const Ice::AMD_Locator_findAdapterByIdPtr&, const std::string&);
-
-    void foundObject(const Ice::Identity&, const std::string&, const Ice::ObjectPrx&);
-    void foundAdapter(const std::string&, const std::string&, const Ice::ObjectPrx&, bool);
+    void foundObject(const Ice::Identity&, const std::string&, const Ice::ObjectPrxPtr&);
+    void foundAdapter(const std::string&, const std::string&, const Ice::ObjectPrxPtr&, bool);
 
     void adapterRequestTimedOut(const AdapterRequestPtr&);
+    void adapterRequestException(const AdapterRequestPtr&, const Ice::LocalException&);
     void objectRequestTimedOut(const ObjectRequestPtr&);
+    void objectRequestException(const ObjectRequestPtr&, const Ice::LocalException&);
 
     const IceUtil::TimerPtr&
     timer()
@@ -153,15 +194,16 @@ public:
 private:
 
     LocatorRegistryIPtr _registry;
-    const LookupPrx _lookup;
-    LookupReplyPrx _lookupReply;
+    LookupPrxPtr _lookup;
+    std::vector<std::pair<LookupPrxPtr, LookupReplyPrxPtr> > _lookups;
     const IceUtil::Time _timeout;
     const int _retryCount;
     const int _latencyMultiplier;
     const std::string _domainId;
 
     IceUtil::TimerPtr _timer;
-    Ice::ObjectPrx _wellKnownProxy;
+    Ice::ObjectPrxPtr _wellKnownProxy;
+    bool _warnOnce;
 
     std::map<Ice::Identity, ObjectRequestPtr> _objectRequests;
     std::map<std::string, AdapterRequestPtr> _adapterRequests;
@@ -173,8 +215,13 @@ public:
 
     LookupReplyI(const LookupIPtr&);
 
+#ifdef ICE_CPP11_MAPPING
+    virtual void foundObjectById(Ice::Identity, std::shared_ptr<Ice::ObjectPrx>, const Ice::Current&);
+    virtual void foundAdapterById(std::string, std::shared_ptr<Ice::ObjectPrx>, bool, const Ice::Current&);
+#else
     virtual void foundObjectById(const Ice::Identity&, const Ice::ObjectPrx&, const Ice::Current&);
     virtual void foundAdapterById(const std::string&, const Ice::ObjectPrx&, bool, const Ice::Current&);
+#endif
 
 private:
 

data/ext/ice/cpp/src/IceDiscovery/PluginI.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.
@@ -9,6 +9,7 @@
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
+#include <Ice/Network.h> // For getInterfacesForMulticast
 
 #include <IceDiscovery/PluginI.h>
 #include <IceDiscovery/LocatorI.h>
@@ -28,17 +29,12 @@ using namespace IceDiscovery;
 //
 // Plugin factory function.
 //
-extern "C"
-{
-
-ICE_DISCOVERY_API Ice::Plugin*
+extern "C" ICE_DISCOVERY_API Ice::Plugin*
 createIceDiscovery(const Ice::CommunicatorPtr& communicator, const string&, const Ice::StringSeq&)
 {
     return new PluginI(communicator);
 }
 
-}
-
 namespace Ice
 {
 
@@ -46,8 +42,24 @@ ICE_DISCOVERY_API void
 registerIceDiscovery(bool loadOnInitialize)
 {
     Ice::registerPluginFactory("IceDiscovery", createIceDiscovery, loadOnInitialize);
+
+#ifdef ICE_STATIC_LIBS
+    //
+    // Also register the UDP plugin with static builds to ensure the UDP transport is loaded.
+    //
+    registerIceUDP(true);
+#endif
+}
+
 }
 
+//
+// Objective-C function to allow Objective-C programs to register plugin.
+//
+extern "C" ICE_DISCOVERY_API void
+ICEregisterIceDiscovery(bool loadOnInitialize)
+{
+    Ice::registerIceDiscovery(loadOnInitialize);
 }
 
 PluginI::PluginI(const Ice::CommunicatorPtr& communicator) : _communicator(communicator)
@@ -71,31 +83,48 @@ PluginI::initialize()
         address = properties->getPropertyWithDefault("IceDiscovery.Address", "ff15::1");
     }
     int port = properties->getPropertyAsIntWithDefault("IceDiscovery.Port", 4061);
-    string interface = properties->getProperty("IceDiscovery.Interface");
+    string intf = properties->getProperty("IceDiscovery.Interface");
 
     if(properties->getProperty("IceDiscovery.Multicast.Endpoints").empty())
     {
         ostringstream os;
         os << "udp -h \"" << address << "\" -p " << port;
-        if(!interface.empty())
+        if(!intf.empty())
         {
-            os << " --interface \"" << interface << "\"";
+            os << " --interface \"" << intf << "\"";
         }
         properties->setProperty("IceDiscovery.Multicast.Endpoints", os.str());
     }
-    if(properties->getProperty("IceDiscovery.Reply.Endpoints").empty())
+
+    string lookupEndpoints = properties->getProperty("IceDiscovery.Lookup");
+    if(lookupEndpoints.empty())
     {
-        ostringstream os;
-        os << "udp";
-        if(!interface.empty())
+        //
+        // If no lookup endpoints are specified, we get all the network interfaces and create
+        // an endpoint for each of them. We'll send UDP multicast packages on each interface.
+        //
+        IceInternal::ProtocolSupport protocol = ipv4 && !preferIPv6 ? IceInternal::EnableIPv4 : IceInternal::EnableIPv6;
+        vector<string> interfaces = IceInternal::getInterfacesForMulticast(intf, protocol);
+        ostringstream lookup;
+        for(vector<string>::const_iterator p = interfaces.begin(); p != interfaces.end(); ++p)
         {
-            os << " -h \"" << interface << "\"";
+            if(p != interfaces.begin())
+            {
+                lookup << ":";
+            }
+            lookup << "udp -h \"" << address << "\" -p " << port << " --interface \"" << *p << "\"";
         }
-        properties->setProperty("IceDiscovery.Reply.Endpoints", os.str());
+        lookupEndpoints = lookup.str();
+    }
+
+    if(properties->getProperty("IceDiscovery.Reply.Endpoints").empty())
+    {
+        properties->setProperty("IceDiscovery.Reply.Endpoints", "udp -h " + (intf.empty() ? "*" : "\"" + intf + "\""));
     }
+
     if(properties->getProperty("IceDiscovery.Locator.Endpoints").empty())
     {
-        properties->setProperty("IceDiscovery.Locator.AdapterId", IceUtil::generateUUID());
+        properties->setProperty("IceDiscovery.Locator.AdapterId", Ice::generateUUID());
     }
 
     _multicastAdapter = _communicator->createObjectAdapter("IceDiscovery.Multicast");
@@ -105,62 +134,31 @@ PluginI::initialize()
     //
     // Setup locatory registry.
     //
-    LocatorRegistryIPtr locatorRegistry = new LocatorRegistryI(_communicator);
-    Ice::LocatorRegistryPrx locatorRegistryPrx =
-        Ice::LocatorRegistryPrx::uncheckedCast(_locatorAdapter->addWithUUID(locatorRegistry));
-
-    string lookupEndpoints = properties->getProperty("IceDiscovery.Lookup");
-    if(lookupEndpoints.empty())
-    {
-        ostringstream os;
-        os << "udp -h \"" << address << "\" -p " << port;
-        if(!interface.empty())
-        {
-            os << " --interface \"" << interface << "\"";
-        }
-        lookupEndpoints = os.str();
-    }
+    LocatorRegistryIPtr locatorRegistry = ICE_MAKE_SHARED(LocatorRegistryI, _communicator);
+    Ice::LocatorRegistryPrxPtr locatorRegistryPrx =
+        ICE_UNCHECKED_CAST(Ice::LocatorRegistryPrx, _locatorAdapter->addWithUUID(locatorRegistry));
 
-    Ice::ObjectPrx lookupPrx = _communicator->stringToProxy("IceDiscovery/Lookup -d:" + lookupEndpoints);
+    Ice::ObjectPrxPtr lookupPrx = _communicator->stringToProxy("IceDiscovery/Lookup -d:" + lookupEndpoints);
     // No collocation optimization for the multicast proxy!
-    lookupPrx = lookupPrx->ice_collocationOptimized(false)->ice_router(0);
-    try
-    {
-        // Ensure we can establish a connection to the multicast proxy
-        // but don't block.
-        Ice::AsyncResultPtr result = lookupPrx->begin_ice_getConnection();
-        if(result->sentSynchronously())
-        {
-            lookupPrx->end_ice_getConnection(result);
-        }
-    }
-    catch(const Ice::LocalException& ex)
-    {
-        ostringstream os;
-        os << "IceDiscovery is unable to establish a multicast connection:\n";
-        os << "proxy = " << lookupPrx << '\n';
-        os << ex;
-        throw Ice::PluginInitializationException(__FILE__, __LINE__, os.str());
-    }
+    lookupPrx = lookupPrx->ice_collocationOptimized(false)->ice_router(ICE_NULLPTR);
 
     //
     // Add lookup and lookup reply Ice objects
     //
-    _lookup = new LookupI(locatorRegistry, LookupPrx::uncheckedCast(lookupPrx), properties);
-    _multicastAdapter->add(_lookup, _communicator->stringToIdentity("IceDiscovery/Lookup"));
+    _lookup = ICE_MAKE_SHARED(LookupI, locatorRegistry, ICE_UNCHECKED_CAST(LookupPrx, lookupPrx), properties);
+    _multicastAdapter->add(_lookup, Ice::stringToIdentity("IceDiscovery/Lookup"));
 
-    _replyAdapter->addDefaultServant(new LookupReplyI(_lookup), "");
+    _replyAdapter->addDefaultServant(ICE_MAKE_SHARED(LookupReplyI, _lookup), "");
     Ice::Identity id;
     id.name = "dummy";
-    _lookup->setLookupReply(LookupReplyPrx::uncheckedCast(_replyAdapter->createProxy(id)->ice_datagram()));
-
+    _lookup->setLookupReply(ICE_UNCHECKED_CAST(LookupReplyPrx, _replyAdapter->createProxy(id)->ice_datagram()));
 
     //
     // Setup locator on the communicator.
     //
-    Ice::ObjectPrx loc = _locatorAdapter->addWithUUID(new LocatorI(_lookup, locatorRegistryPrx));
+    Ice::ObjectPrxPtr loc = _locatorAdapter->addWithUUID(ICE_MAKE_SHARED(LocatorI, _lookup, locatorRegistryPrx));
     _defaultLocator = _communicator->getDefaultLocator();
-    _locator = Ice::LocatorPrx::uncheckedCast(loc);
+    _locator = ICE_UNCHECKED_CAST(Ice::LocatorPrx, loc);
     _communicator->setDefaultLocator(_locator);
 
     _multicastAdapter->activate();

data/ext/ice/cpp/src/IceDiscovery/PluginI.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.
@@ -32,8 +32,8 @@ private:
     Ice::ObjectAdapterPtr _replyAdapter;
     Ice::ObjectAdapterPtr _locatorAdapter;
     LookupIPtr _lookup;
-    Ice::LocatorPrx _locator;
-    Ice::LocatorPrx _defaultLocator;
+    Ice::LocatorPrxPtr _locator;
+    Ice::LocatorPrxPtr _defaultLocator;
 };
 
 };

data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.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,111 +21,342 @@
 #include <IceLocatorDiscovery/IceLocatorDiscovery.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 <Ice/LocalException.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 __IceLocatorDiscovery__LookupReply__foundLocator_name = "foundLocator";
+const ::std::string iceC_IceLocatorDiscovery_LookupReply_ids[2] =
+{
+    "::Ice::Object",
+    "::IceLocatorDiscovery::LookupReply"
+};
+const ::std::string iceC_IceLocatorDiscovery_LookupReply_ops[] =
+{
+    "foundLocator",
+    "ice_id",
+    "ice_ids",
+    "ice_isA",
+    "ice_ping"
+};
+const ::std::string iceC_IceLocatorDiscovery_LookupReply_foundLocator_name = "foundLocator";
 
-const ::std::string __IceLocatorDiscovery__Lookup__findLocator_name = "findLocator";
+const ::std::string iceC_IceLocatorDiscovery_Lookup_ids[2] =
+{
+    "::Ice::Object",
+    "::IceLocatorDiscovery::Lookup"
+};
+const ::std::string iceC_IceLocatorDiscovery_Lookup_ops[] =
+{
+    "findLocator",
+    "ice_id",
+    "ice_ids",
+    "ice_isA",
+    "ice_ping"
+};
+const ::std::string iceC_IceLocatorDiscovery_Lookup_findLocator_name = "findLocator";
 
 }
-::IceProxy::Ice::Object* ::IceProxy::IceLocatorDiscovery::upCast(::IceProxy::IceLocatorDiscovery::LookupReply* p) { return p; }
 
-void
-::IceProxy::IceLocatorDiscovery::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::LookupReply>& v)
+bool
+IceLocatorDiscovery::LookupReply::ice_isA(::std::string s, const ::Ice::Current&) const
 {
-    ::Ice::ObjectPrx proxy;
-    __is->read(proxy);
-    if(!proxy)
+    return ::std::binary_search(iceC_IceLocatorDiscovery_LookupReply_ids, iceC_IceLocatorDiscovery_LookupReply_ids + 2, s);
+}
+
+::std::vector<::std::string>
+IceLocatorDiscovery::LookupReply::ice_ids(const ::Ice::Current&) const
+{
+    return ::std::vector<::std::string>(&iceC_IceLocatorDiscovery_LookupReply_ids[0], &iceC_IceLocatorDiscovery_LookupReply_ids[2]);
+}
+
+::std::string
+IceLocatorDiscovery::LookupReply::ice_id(const ::Ice::Current&) const
+{
+    return ice_staticId();
+}
+
+const ::std::string&
+IceLocatorDiscovery::LookupReply::ice_staticId()
+{
+    static const ::std::string typeId = "::IceLocatorDiscovery::LookupReply";
+    return typeId;
+}
+
+bool
+IceLocatorDiscovery::LookupReply::_iceD_foundLocator(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+{
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    auto istr = inS.startReadParams();
+    ::std::shared_ptr<::Ice::LocatorPrx> iceP_prx;
+    istr->readAll(iceP_prx);
+    inS.endReadParams();
+    this->foundLocator(::std::move(iceP_prx), current);
+    inS.writeEmptyParams();
+    return true;
+}
+
+bool
+IceLocatorDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+{
+    ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_IceLocatorDiscovery_LookupReply_ops, iceC_IceLocatorDiscovery_LookupReply_ops + 5, current.operation);
+    if(r.first == r.second)
     {
-        v = 0;
+        throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
-    else
+
+    switch(r.first - iceC_IceLocatorDiscovery_LookupReply_ops)
     {
-        v = new ::IceProxy::IceLocatorDiscovery::LookupReply;
-        v->__copyFrom(proxy);
+        case 0:
+        {
+            return _iceD_foundLocator(in, current);
+        }
+        case 1:
+        {
+            return _iceD_ice_id(in, current);
+        }
+        case 2:
+        {
+            return _iceD_ice_ids(in, current);
+        }
+        case 3:
+        {
+            return _iceD_ice_isA(in, current);
+        }
+        case 4:
+        {
+            return _iceD_ice_ping(in, current);
+        }
+        default:
+        {
+            assert(false);
+            throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        }
+    }
+}
+
+bool
+IceLocatorDiscovery::Lookup::ice_isA(::std::string s, const ::Ice::Current&) const
+{
+    return ::std::binary_search(iceC_IceLocatorDiscovery_Lookup_ids, iceC_IceLocatorDiscovery_Lookup_ids + 2, s);
+}
+
+::std::vector<::std::string>
+IceLocatorDiscovery::Lookup::ice_ids(const ::Ice::Current&) const
+{
+    return ::std::vector<::std::string>(&iceC_IceLocatorDiscovery_Lookup_ids[0], &iceC_IceLocatorDiscovery_Lookup_ids[2]);
+}
+
+::std::string
+IceLocatorDiscovery::Lookup::ice_id(const ::Ice::Current&) const
+{
+    return ice_staticId();
+}
+
+const ::std::string&
+IceLocatorDiscovery::Lookup::ice_staticId()
+{
+    static const ::std::string typeId = "::IceLocatorDiscovery::Lookup";
+    return typeId;
+}
+
+bool
+IceLocatorDiscovery::Lookup::_iceD_findLocator(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+{
+    _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
+    auto istr = inS.startReadParams();
+    ::std::string iceP_instanceName;
+    ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx> iceP_reply;
+    istr->readAll(iceP_instanceName, iceP_reply);
+    inS.endReadParams();
+    this->findLocator(::std::move(iceP_instanceName), ::std::move(iceP_reply), current);
+    inS.writeEmptyParams();
+    return true;
+}
+
+bool
+IceLocatorDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+{
+    ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_IceLocatorDiscovery_Lookup_ops, iceC_IceLocatorDiscovery_Lookup_ops + 5, current.operation);
+    if(r.first == r.second)
+    {
+        throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+    }
+
+    switch(r.first - iceC_IceLocatorDiscovery_Lookup_ops)
+    {
+        case 0:
+        {
+            return _iceD_findLocator(in, current);
+        }
+        case 1:
+        {
+            return _iceD_ice_id(in, current);
+        }
+        case 2:
+        {
+            return _iceD_ice_ids(in, current);
+        }
+        case 3:
+        {
+            return _iceD_ice_isA(in, current);
+        }
+        case 4:
+        {
+            return _iceD_ice_ping(in, current);
+        }
+        default:
+        {
+            assert(false);
+            throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        }
     }
 }
 
 void
-IceProxy::IceLocatorDiscovery::LookupReply::foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context* __ctx)
+IceLocatorDiscovery::LookupReplyPrx::_iceI_foundLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::shared_ptr<::Ice::LocatorPrx>& iceP_prx, const ::Ice::Context& context)
 {
-    ::IceInternal::Outgoing __og(this, __IceLocatorDiscovery__LookupReply__foundLocator_name, ::Ice::Normal, __ctx);
-    try
+    outAsync->invoke(iceC_IceLocatorDiscovery_LookupReply_foundLocator_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        [&](::Ice::OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_prx);
+        },
+        nullptr);
+}
+
+::std::shared_ptr<::Ice::ObjectPrx>
+IceLocatorDiscovery::LookupReplyPrx::_newInstance() const
+{
+    return ::IceInternal::createProxy<LookupReplyPrx>();
+}
+
+const ::std::string&
+IceLocatorDiscovery::LookupReplyPrx::ice_staticId()
+{
+    return IceLocatorDiscovery::LookupReply::ice_staticId();
+}
+
+void
+IceLocatorDiscovery::LookupPrx::_iceI_findLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_instanceName, const ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx>& iceP_reply, const ::Ice::Context& context)
+{
+    outAsync->invoke(iceC_IceLocatorDiscovery_Lookup_findLocator_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
+        [&](::Ice::OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_instanceName, iceP_reply);
+        },
+        nullptr);
+}
+
+::std::shared_ptr<::Ice::ObjectPrx>
+IceLocatorDiscovery::LookupPrx::_newInstance() const
+{
+    return ::IceInternal::createProxy<LookupPrx>();
+}
+
+const ::std::string&
+IceLocatorDiscovery::LookupPrx::ice_staticId()
+{
+    return IceLocatorDiscovery::Lookup::ice_staticId();
+}
+
+#else // C++98 mapping
+
+namespace
+{
+
+const ::std::string iceC_IceLocatorDiscovery_LookupReply_foundLocator_name = "foundLocator";
+
+const ::std::string iceC_IceLocatorDiscovery_Lookup_findLocator_name = "findLocator";
+
+}
+::IceProxy::Ice::Object* ::IceProxy::IceLocatorDiscovery::upCast(::IceProxy::IceLocatorDiscovery::LookupReply* p) { return p; }
+
+void
+::IceProxy::IceLocatorDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::LookupReply>& v)
+{
+    ::Ice::ObjectPrx proxy;
+    istr->read(proxy);
+    if(!proxy)
     {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_prx);
-        __og.endWriteParams();
+        v = 0;
     }
-    catch(const ::Ice::LocalException& __ex)
+    else
     {
-        __og.abort(__ex);
+        v = new ::IceProxy::IceLocatorDiscovery::LookupReply;
+        v->_copyFrom(proxy);
     }
-    __invoke(__og);
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::IceLocatorDiscovery::LookupReply::_iceI_begin_foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __IceLocatorDiscovery__LookupReply__foundLocator_name, __del, __cookie);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_IceLocatorDiscovery_LookupReply_foundLocator_name, del, cookie, sync);
     try
     {
-        __result->prepare(__IceLocatorDiscovery__LookupReply__foundLocator_name, ::Ice::Normal, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_prx);
-        __result->endWriteParams();
-        __result->invoke();
+        result->prepare(iceC_IceLocatorDiscovery_LookupReply_foundLocator_name, ::Ice::Normal, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_prx);
+        result->endWriteParams();
+        result->invoke(iceC_IceLocatorDiscovery_LookupReply_foundLocator_name);
     }
-    catch(const ::Ice::Exception& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __result->abort(__ex);
+        result->abort(ex);
     }
-    return __result;
+    return result;
 }
 
 void
-IceProxy::IceLocatorDiscovery::LookupReply::end_foundLocator(const ::Ice::AsyncResultPtr& __result)
+IceProxy::IceLocatorDiscovery::LookupReply::end_foundLocator(const ::Ice::AsyncResultPtr& result)
 {
-    __end(__result, __IceLocatorDiscovery__LookupReply__foundLocator_name);
+    _end(result, iceC_IceLocatorDiscovery_LookupReply_foundLocator_name);
 }
 
-const ::std::string&
-IceProxy::IceLocatorDiscovery::LookupReply::ice_staticId()
+::IceProxy::Ice::Object*
+IceProxy::IceLocatorDiscovery::LookupReply::_newInstance() const
 {
-    return ::IceLocatorDiscovery::LookupReply::ice_staticId();
+    return new LookupReply;
 }
 
-::IceProxy::Ice::Object*
-IceProxy::IceLocatorDiscovery::LookupReply::__newInstance() const
+const ::std::string&
+IceProxy::IceLocatorDiscovery::LookupReply::ice_staticId()
 {
-    return new LookupReply;
+    return ::IceLocatorDiscovery::LookupReply::ice_staticId();
 }
 ::IceProxy::Ice::Object* ::IceProxy::IceLocatorDiscovery::upCast(::IceProxy::IceLocatorDiscovery::Lookup* p) { return p; }
 
 void
-::IceProxy::IceLocatorDiscovery::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::Lookup>& v)
+::IceProxy::IceLocatorDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::Lookup>& v)
 {
     ::Ice::ObjectPrx proxy;
-    __is->read(proxy);
+    istr->read(proxy);
     if(!proxy)
     {
         v = 0;
@@ -133,52 +364,40 @@ void
     else
     {
         v = new ::IceProxy::IceLocatorDiscovery::Lookup;
-        v->__copyFrom(proxy);
+        v->_copyFrom(proxy);
     }
 }
 
-void
-IceProxy::IceLocatorDiscovery::Lookup::findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context* __ctx)
+::Ice::AsyncResultPtr
+IceProxy::IceLocatorDiscovery::Lookup::_iceI_begin_findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
-    ::IceInternal::Outgoing __og(this, __IceLocatorDiscovery__Lookup__findLocator_name, ::Ice::Idempotent, __ctx);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_IceLocatorDiscovery_Lookup_findLocator_name, del, cookie, sync);
     try
     {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_instanceName);
-        __os->write(__p_reply);
-        __og.endWriteParams();
+        result->prepare(iceC_IceLocatorDiscovery_Lookup_findLocator_name, ::Ice::Idempotent, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_instanceName);
+        ostr->write(iceP_reply);
+        result->endWriteParams();
+        result->invoke(iceC_IceLocatorDiscovery_Lookup_findLocator_name);
     }
-    catch(const ::Ice::LocalException& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __og.abort(__ex);
+        result->abort(ex);
     }
-    __invoke(__og);
+    return result;
 }
 
-::Ice::AsyncResultPtr
-IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+void
+IceProxy::IceLocatorDiscovery::Lookup::end_findLocator(const ::Ice::AsyncResultPtr& result)
 {
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __IceLocatorDiscovery__Lookup__findLocator_name, __del, __cookie);
-    try
-    {
-        __result->prepare(__IceLocatorDiscovery__Lookup__findLocator_name, ::Ice::Idempotent, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_instanceName);
-        __os->write(__p_reply);
-        __result->endWriteParams();
-        __result->invoke();
-    }
-    catch(const ::Ice::Exception& __ex)
-    {
-        __result->abort(__ex);
-    }
-    return __result;
+    _end(result, iceC_IceLocatorDiscovery_Lookup_findLocator_name);
 }
 
-void
-IceProxy::IceLocatorDiscovery::Lookup::end_findLocator(const ::Ice::AsyncResultPtr& __result)
+::IceProxy::Ice::Object*
+IceProxy::IceLocatorDiscovery::Lookup::_newInstance() const
 {
-    __end(__result, __IceLocatorDiscovery__Lookup__findLocator_name);
+    return new Lookup;
 }
 
 const ::std::string&
@@ -187,17 +406,16 @@ IceProxy::IceLocatorDiscovery::Lookup::ice_staticId()
     return ::IceLocatorDiscovery::Lookup::ice_staticId();
 }
 
-::IceProxy::Ice::Object*
-IceProxy::IceLocatorDiscovery::Lookup::__newInstance() const
+IceLocatorDiscovery::LookupReply::~LookupReply()
 {
-    return new Lookup;
 }
 
 ::Ice::Object* IceLocatorDiscovery::upCast(::IceLocatorDiscovery::LookupReply* p) { return p; }
 
+
 namespace
 {
-const ::std::string __IceLocatorDiscovery__LookupReply_ids[2] =
+const ::std::string iceC_IceLocatorDiscovery_LookupReply_ids[2] =
 {
     "::Ice::Object",
     "::IceLocatorDiscovery::LookupReply"
@@ -206,21 +424,21 @@ const ::std::string __IceLocatorDiscovery__LookupReply_ids[2] =
 }
 
 bool
-IceLocatorDiscovery::LookupReply::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
+IceLocatorDiscovery::LookupReply::ice_isA(const ::std::string& s, const ::Ice::Current&) const
 {
-    return ::std::binary_search(__IceLocatorDiscovery__LookupReply_ids, __IceLocatorDiscovery__LookupReply_ids + 2, _s);
+    return ::std::binary_search(iceC_IceLocatorDiscovery_LookupReply_ids, iceC_IceLocatorDiscovery_LookupReply_ids + 2, s);
 }
 
 ::std::vector< ::std::string>
 IceLocatorDiscovery::LookupReply::ice_ids(const ::Ice::Current&) const
 {
-    return ::std::vector< ::std::string>(&__IceLocatorDiscovery__LookupReply_ids[0], &__IceLocatorDiscovery__LookupReply_ids[2]);
+    return ::std::vector< ::std::string>(&iceC_IceLocatorDiscovery_LookupReply_ids[0], &iceC_IceLocatorDiscovery_LookupReply_ids[2]);
 }
 
 const ::std::string&
 IceLocatorDiscovery::LookupReply::ice_id(const ::Ice::Current&) const
 {
-    return __IceLocatorDiscovery__LookupReply_ids[1];
+    return ice_staticId();
 }
 
 const ::std::string&
@@ -230,26 +448,26 @@ IceLocatorDiscovery::LookupReply::ice_staticId()
     static const ::std::string typeId = "::IceLocatorDiscovery::LookupReply";
     return typeId;
 #else
-    return __IceLocatorDiscovery__LookupReply_ids[1];
+    return iceC_IceLocatorDiscovery_LookupReply_ids[1];
 #endif
 }
 
-::Ice::DispatchStatus
-IceLocatorDiscovery::LookupReply::___foundLocator(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
+bool
+IceLocatorDiscovery::LookupReply::_iceD_foundLocator(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
-    __checkMode(::Ice::Normal, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::Ice::LocatorPrx __p_prx;
-    __is->read(__p_prx);
-    __inS.endReadParams();
-    foundLocator(__p_prx, __current);
-    __inS.__writeEmptyParams();
-    return ::Ice::DispatchOK;
+    _iceCheckMode(::Ice::Normal, current.mode);
+    ::Ice::InputStream* istr = inS.startReadParams();
+    ::Ice::LocatorPrx iceP_prx;
+    istr->read(iceP_prx);
+    inS.endReadParams();
+    this->foundLocator(iceP_prx, current);
+    inS.writeEmptyParams();
+    return true;
 }
 
 namespace
 {
-const ::std::string __IceLocatorDiscovery__LookupReply_all[] =
+const ::std::string iceC_IceLocatorDiscovery_LookupReply_all[] =
 {
     "foundLocator",
     "ice_id",
@@ -260,59 +478,63 @@ const ::std::string __IceLocatorDiscovery__LookupReply_all[] =
 
 }
 
-::Ice::DispatchStatus
-IceLocatorDiscovery::LookupReply::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+bool
+IceLocatorDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
 {
-    ::std::pair< const ::std::string*, const ::std::string*> r = ::std::equal_range(__IceLocatorDiscovery__LookupReply_all, __IceLocatorDiscovery__LookupReply_all + 5, current.operation);
+    ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_IceLocatorDiscovery_LookupReply_all, iceC_IceLocatorDiscovery_LookupReply_all + 5, current.operation);
     if(r.first == r.second)
     {
         throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
 
-    switch(r.first - __IceLocatorDiscovery__LookupReply_all)
+    switch(r.first - iceC_IceLocatorDiscovery_LookupReply_all)
     {
         case 0:
         {
-            return ___foundLocator(in, current);
+            return _iceD_foundLocator(in, current);
         }
         case 1:
         {
-            return ___ice_id(in, current);
+            return _iceD_ice_id(in, current);
         }
         case 2:
         {
-            return ___ice_ids(in, current);
+            return _iceD_ice_ids(in, current);
         }
         case 3:
         {
-            return ___ice_isA(in, current);
+            return _iceD_ice_isA(in, current);
         }
         case 4:
         {
-            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
-IceLocatorDiscovery::LookupReply::__writeImpl(::IceInternal::BasicStream* __os) const
+IceLocatorDiscovery::LookupReply::_iceWriteImpl(::Ice::OutputStream* ostr) const
 {
-    __os->startWriteSlice(ice_staticId(), -1, true);
-    __os->endWriteSlice();
+    ostr->startSlice(ice_staticId(), -1, true);
+    Ice::StreamWriter< ::IceLocatorDiscovery::LookupReply, ::Ice::OutputStream>::write(ostr, *this);
+    ostr->endSlice();
 }
 
 void
-IceLocatorDiscovery::LookupReply::__readImpl(::IceInternal::BasicStream* __is)
+IceLocatorDiscovery::LookupReply::_iceReadImpl(::Ice::InputStream* istr)
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    istr->startSlice();
+    Ice::StreamReader< ::IceLocatorDiscovery::LookupReply, ::Ice::InputStream>::read(istr, *this);
+    istr->endSlice();
 }
 
-void 
-IceLocatorDiscovery::__patch(LookupReplyPtr& handle, const ::Ice::ObjectPtr& v)
+void
+IceLocatorDiscovery::_icePatchObjectPtr(LookupReplyPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::IceLocatorDiscovery::LookupReplyPtr::dynamicCast(v);
     if(v && !handle)
@@ -321,11 +543,16 @@ IceLocatorDiscovery::__patch(LookupReplyPtr& handle, const ::Ice::ObjectPtr& v)
     }
 }
 
+IceLocatorDiscovery::Lookup::~Lookup()
+{
+}
+
 ::Ice::Object* IceLocatorDiscovery::upCast(::IceLocatorDiscovery::Lookup* p) { return p; }
 
+
 namespace
 {
-const ::std::string __IceLocatorDiscovery__Lookup_ids[2] =
+const ::std::string iceC_IceLocatorDiscovery_Lookup_ids[2] =
 {
     "::Ice::Object",
     "::IceLocatorDiscovery::Lookup"
@@ -334,21 +561,21 @@ const ::std::string __IceLocatorDiscovery__Lookup_ids[2] =
 }
 
 bool
-IceLocatorDiscovery::Lookup::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
+IceLocatorDiscovery::Lookup::ice_isA(const ::std::string& s, const ::Ice::Current&) const
 {
-    return ::std::binary_search(__IceLocatorDiscovery__Lookup_ids, __IceLocatorDiscovery__Lookup_ids + 2, _s);
+    return ::std::binary_search(iceC_IceLocatorDiscovery_Lookup_ids, iceC_IceLocatorDiscovery_Lookup_ids + 2, s);
 }
 
 ::std::vector< ::std::string>
 IceLocatorDiscovery::Lookup::ice_ids(const ::Ice::Current&) const
 {
-    return ::std::vector< ::std::string>(&__IceLocatorDiscovery__Lookup_ids[0], &__IceLocatorDiscovery__Lookup_ids[2]);
+    return ::std::vector< ::std::string>(&iceC_IceLocatorDiscovery_Lookup_ids[0], &iceC_IceLocatorDiscovery_Lookup_ids[2]);
 }
 
 const ::std::string&
 IceLocatorDiscovery::Lookup::ice_id(const ::Ice::Current&) const
 {
-    return __IceLocatorDiscovery__Lookup_ids[1];
+    return ice_staticId();
 }
 
 const ::std::string&
@@ -358,28 +585,28 @@ IceLocatorDiscovery::Lookup::ice_staticId()
     static const ::std::string typeId = "::IceLocatorDiscovery::Lookup";
     return typeId;
 #else
-    return __IceLocatorDiscovery__Lookup_ids[1];
+    return iceC_IceLocatorDiscovery_Lookup_ids[1];
 #endif
 }
 
-::Ice::DispatchStatus
-IceLocatorDiscovery::Lookup::___findLocator(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
+bool
+IceLocatorDiscovery::Lookup::_iceD_findLocator(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
-    __checkMode(::Ice::Idempotent, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string __p_instanceName;
-    ::IceLocatorDiscovery::LookupReplyPrx __p_reply;
-    __is->read(__p_instanceName);
-    __is->read(__p_reply);
-    __inS.endReadParams();
-    findLocator(__p_instanceName, __p_reply, __current);
-    __inS.__writeEmptyParams();
-    return ::Ice::DispatchOK;
+    _iceCheckMode(::Ice::Idempotent, current.mode);
+    ::Ice::InputStream* istr = inS.startReadParams();
+    ::std::string iceP_instanceName;
+    ::IceLocatorDiscovery::LookupReplyPrx iceP_reply;
+    istr->read(iceP_instanceName);
+    istr->read(iceP_reply);
+    inS.endReadParams();
+    this->findLocator(iceP_instanceName, iceP_reply, current);
+    inS.writeEmptyParams();
+    return true;
 }
 
 namespace
 {
-const ::std::string __IceLocatorDiscovery__Lookup_all[] =
+const ::std::string iceC_IceLocatorDiscovery_Lookup_all[] =
 {
     "findLocator",
     "ice_id",
@@ -390,59 +617,63 @@ const ::std::string __IceLocatorDiscovery__Lookup_all[] =
 
 }
 
-::Ice::DispatchStatus
-IceLocatorDiscovery::Lookup::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+bool
+IceLocatorDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
 {
-    ::std::pair< const ::std::string*, const ::std::string*> r = ::std::equal_range(__IceLocatorDiscovery__Lookup_all, __IceLocatorDiscovery__Lookup_all + 5, current.operation);
+    ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_IceLocatorDiscovery_Lookup_all, iceC_IceLocatorDiscovery_Lookup_all + 5, current.operation);
     if(r.first == r.second)
     {
         throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
 
-    switch(r.first - __IceLocatorDiscovery__Lookup_all)
+    switch(r.first - iceC_IceLocatorDiscovery_Lookup_all)
     {
         case 0:
         {
-            return ___findLocator(in, current);
+            return _iceD_findLocator(in, current);
         }
         case 1:
         {
-            return ___ice_id(in, current);
+            return _iceD_ice_id(in, current);
         }
         case 2:
         {
-            return ___ice_ids(in, current);
+            return _iceD_ice_ids(in, current);
         }
         case 3:
         {
-            return ___ice_isA(in, current);
+            return _iceD_ice_isA(in, current);
         }
         case 4:
         {
-            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
-IceLocatorDiscovery::Lookup::__writeImpl(::IceInternal::BasicStream* __os) const
+IceLocatorDiscovery::Lookup::_iceWriteImpl(::Ice::OutputStream* ostr) const
 {
-    __os->startWriteSlice(ice_staticId(), -1, true);
-    __os->endWriteSlice();
+    ostr->startSlice(ice_staticId(), -1, true);
+    Ice::StreamWriter< ::IceLocatorDiscovery::Lookup, ::Ice::OutputStream>::write(ostr, *this);
+    ostr->endSlice();
 }
 
 void
-IceLocatorDiscovery::Lookup::__readImpl(::IceInternal::BasicStream* __is)
+IceLocatorDiscovery::Lookup::_iceReadImpl(::Ice::InputStream* istr)
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    istr->startSlice();
+    Ice::StreamReader< ::IceLocatorDiscovery::Lookup, ::Ice::InputStream>::read(istr, *this);
+    istr->endSlice();
 }
 
-void 
-IceLocatorDiscovery::__patch(LookupPtr& handle, const ::Ice::ObjectPtr& v)
+void
+IceLocatorDiscovery::_icePatchObjectPtr(LookupPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::IceLocatorDiscovery::LookupPtr::dynamicCast(v);
     if(v && !handle)
@@ -450,3 +681,9 @@ IceLocatorDiscovery::__patch(LookupPtr& handle, const ::Ice::ObjectPtr& v)
         IceInternal::Ex::throwUOE(::IceLocatorDiscovery::Lookup::ice_staticId(), v);
     }
 }
+
+namespace Ice
+{
+}
+
+#endif