zeroc-ice 3.6.5 → 3.7.0

data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h

@@ -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>
 //
@@ -24,33 +24,188 @@
 #include <IceUtil/PushDisableWarnings.h>
 #include <Ice/ProxyF.h>
 #include <Ice/ObjectF.h>
+#include <Ice/ValueF.h>
 #include <Ice/Exception.h>
 #include <Ice/LocalObject.h>
 #include <Ice/StreamHelpers.h>
+#include <Ice/Comparable.h>
 #include <Ice/Proxy.h>
+#include <Ice/Object.h>
 #include <Ice/GCObject.h>
-#include <Ice/AsyncResult.h>
+#include <Ice/Value.h>
 #include <Ice/Incoming.h>
 #include <Ice/IncomingAsync.h>
 #include <Ice/FactoryTableInit.h>
 #include <IceUtil/ScopedArray.h>
-#include <IceUtil/Optional.h>
-#include <Ice/StreamF.h>
+#include <Ice/Optional.h>
+#include <Ice/ExceptionHelpers.h>
 #include <Ice/Locator.h>
 #include <IceUtil/UndefSysMacros.h>
 
 #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 IceLocatorDiscovery
+{
+
+class LookupReply;
+class LookupReplyPrx;
+class Lookup;
+class LookupPrx;
+
+}
+
+namespace IceLocatorDiscovery
+{
+
+class LookupReply : public virtual ::Ice::Object
+{
+public:
+
+    using ProxyType = LookupReplyPrx;
+
+    virtual bool ice_isA(::std::string, const ::Ice::Current&) const override;
+    virtual ::std::vector<::std::string> ice_ids(const ::Ice::Current&) const override;
+    virtual ::std::string ice_id(const ::Ice::Current&) const override;
+
+    static const ::std::string& ice_staticId();
+
+    virtual void foundLocator(::std::shared_ptr<::Ice::LocatorPrx>, const ::Ice::Current&) = 0;
+    bool _iceD_foundLocator(::IceInternal::Incoming&, const ::Ice::Current&);
+
+    virtual bool _iceDispatch(::IceInternal::Incoming&, const ::Ice::Current&) override;
+};
+
+class Lookup : public virtual ::Ice::Object
+{
+public:
+
+    using ProxyType = LookupPrx;
+
+    virtual bool ice_isA(::std::string, const ::Ice::Current&) const override;
+    virtual ::std::vector<::std::string> ice_ids(const ::Ice::Current&) const override;
+    virtual ::std::string ice_id(const ::Ice::Current&) const override;
+
+    static const ::std::string& ice_staticId();
+
+    virtual void findLocator(::std::string, ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx>, const ::Ice::Current&) = 0;
+    bool _iceD_findLocator(::IceInternal::Incoming&, const ::Ice::Current&);
+
+    virtual bool _iceDispatch(::IceInternal::Incoming&, const ::Ice::Current&) override;
+};
+
+}
+
+namespace IceLocatorDiscovery
+{
+
+class LookupReplyPrx : public virtual ::Ice::Proxy<LookupReplyPrx, ::Ice::ObjectPrx>
+{
+public:
+
+    void foundLocator(const ::std::shared_ptr<::Ice::LocatorPrx>& iceP_prx, const ::Ice::Context& context = Ice::noExplicitContext)
+    {
+        _makePromiseOutgoing<void>(true, this, &IceLocatorDiscovery::LookupReplyPrx::_iceI_foundLocator, iceP_prx, context).get();
+    }
+
+    template<template<typename> class P = ::std::promise>
+    auto foundLocatorAsync(const ::std::shared_ptr<::Ice::LocatorPrx>& iceP_prx, const ::Ice::Context& context = Ice::noExplicitContext)
+        -> decltype(::std::declval<P<void>>().get_future())
+    {
+        return _makePromiseOutgoing<void, P>(false, this, &IceLocatorDiscovery::LookupReplyPrx::_iceI_foundLocator, iceP_prx, context);
+    }
+
+    ::std::function<void()>
+    foundLocatorAsync(const ::std::shared_ptr<::Ice::LocatorPrx>& iceP_prx,
+                      ::std::function<void()> response,
+                      ::std::function<void(::std::exception_ptr)> ex = nullptr,
+                      ::std::function<void(bool)> sent = nullptr,
+                      const ::Ice::Context& context = Ice::noExplicitContext)
+    {
+        return _makeLamdaOutgoing<void>(response, ex, sent, this, &IceLocatorDiscovery::LookupReplyPrx::_iceI_foundLocator, iceP_prx, context);
+    }
+
+    void _iceI_foundLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const ::std::shared_ptr<::Ice::LocatorPrx>&, const ::Ice::Context&);
+
+    static const ::std::string& ice_staticId();
+
+protected:
+
+    LookupReplyPrx() = default;
+    friend ::std::shared_ptr<LookupReplyPrx> IceInternal::createProxy<LookupReplyPrx>();
+
+    virtual ::std::shared_ptr<::Ice::ObjectPrx> _newInstance() const override;
+};
+
+class LookupPrx : public virtual ::Ice::Proxy<LookupPrx, ::Ice::ObjectPrx>
+{
+public:
+
+    void findLocator(const ::std::string& iceP_instanceName, const ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx>& iceP_reply, const ::Ice::Context& context = Ice::noExplicitContext)
+    {
+        _makePromiseOutgoing<void>(true, this, &IceLocatorDiscovery::LookupPrx::_iceI_findLocator, iceP_instanceName, iceP_reply, context).get();
+    }
+
+    template<template<typename> class P = ::std::promise>
+    auto findLocatorAsync(const ::std::string& iceP_instanceName, const ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx>& iceP_reply, const ::Ice::Context& context = Ice::noExplicitContext)
+        -> decltype(::std::declval<P<void>>().get_future())
+    {
+        return _makePromiseOutgoing<void, P>(false, this, &IceLocatorDiscovery::LookupPrx::_iceI_findLocator, iceP_instanceName, iceP_reply, context);
+    }
+
+    ::std::function<void()>
+    findLocatorAsync(const ::std::string& iceP_instanceName, const ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx>& iceP_reply,
+                     ::std::function<void()> response,
+                     ::std::function<void(::std::exception_ptr)> ex = nullptr,
+                     ::std::function<void(bool)> sent = nullptr,
+                     const ::Ice::Context& context = Ice::noExplicitContext)
+    {
+        return _makeLamdaOutgoing<void>(response, ex, sent, this, &IceLocatorDiscovery::LookupPrx::_iceI_findLocator, iceP_instanceName, iceP_reply, context);
+    }
+
+    void _iceI_findLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const ::std::string&, const ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx>&, const ::Ice::Context&);
+
+    static const ::std::string& ice_staticId();
+
+protected:
+
+    LookupPrx() = default;
+    friend ::std::shared_ptr<LookupPrx> IceInternal::createProxy<LookupPrx>();
+
+    virtual ::std::shared_ptr<::Ice::ObjectPrx> _newInstance() const override;
+};
+
+}
+
+namespace Ice
+{
+
+}
+
+namespace IceLocatorDiscovery
+{
+
+using LookupReplyPtr = ::std::shared_ptr<LookupReply>;
+using LookupReplyPrxPtr = ::std::shared_ptr<LookupReplyPrx>;
+
+using LookupPtr = ::std::shared_ptr<Lookup>;
+using LookupPrxPtr = ::std::shared_ptr<LookupPrx>;
+
+}
+
+#else // C++98 mapping
+
 namespace IceProxy
 {
 
@@ -58,11 +213,11 @@ namespace IceLocatorDiscovery
 {
 
 class LookupReply;
-void __read(::IceInternal::BasicStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::LookupReply>&);
+void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::LookupReply>&);
 ::IceProxy::Ice::Object* upCast(::IceProxy::IceLocatorDiscovery::LookupReply*);
 
 class Lookup;
-void __read(::IceInternal::BasicStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::Lookup>&);
+void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::Lookup>&);
 ::IceProxy::Ice::Object* upCast(::IceProxy::IceLocatorDiscovery::Lookup*);
 
 }
@@ -76,13 +231,15 @@ class LookupReply;
 ::Ice::Object* upCast(::IceLocatorDiscovery::LookupReply*);
 typedef ::IceInternal::Handle< ::IceLocatorDiscovery::LookupReply> LookupReplyPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::LookupReply> LookupReplyPrx;
-void __patch(LookupReplyPtr&, const ::Ice::ObjectPtr&);
+typedef LookupReplyPrx LookupReplyPrxPtr;
+void _icePatchObjectPtr(LookupReplyPtr&, const ::Ice::ObjectPtr&);
 
 class Lookup;
 ::Ice::Object* upCast(::IceLocatorDiscovery::Lookup*);
 typedef ::IceInternal::Handle< ::IceLocatorDiscovery::Lookup> LookupPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::Lookup> LookupPrx;
-void __patch(LookupPtr&, const ::Ice::ObjectPtr&);
+typedef LookupPrx LookupPrxPtr;
+void _icePatchObjectPtr(LookupPtr&, const ::Ice::ObjectPtr&);
 
 }
 
@@ -94,10 +251,10 @@ namespace IceAsync
 namespace IceLocatorDiscovery
 {
 
-class Callback_LookupReply_foundLocator_Base : virtual public ::IceInternal::CallbackBase { };
+class Callback_LookupReply_foundLocator_Base : public virtual ::IceInternal::CallbackBase { };
 typedef ::IceUtil::Handle< Callback_LookupReply_foundLocator_Base> Callback_LookupReply_foundLocatorPtr;
 
-class Callback_Lookup_findLocator_Base : virtual public ::IceInternal::CallbackBase { };
+class Callback_Lookup_findLocator_Base : public virtual ::IceInternal::CallbackBase { };
 typedef ::IceUtil::Handle< Callback_Lookup_findLocator_Base> Callback_Lookup_findLocatorPtr;
 
 }
@@ -108,374 +265,102 @@ namespace IceProxy
 namespace IceLocatorDiscovery
 {
 
-class LookupReply : virtual public ::IceProxy::Ice::Object
+class LookupReply : public virtual ::Ice::Proxy<LookupReply, ::IceProxy::Ice::Object>
 {
 public:
 
-    void foundLocator(const ::Ice::LocatorPrx& __p_prx)
-    {
-        foundLocator(__p_prx, 0);
-    }
-    void foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context& __ctx)
-    {
-        foundLocator(__p_prx, &__ctx);
-    }
-#ifdef ICE_CPP11
-    ::Ice::AsyncResultPtr
-    begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
-    {
-        return begin_foundLocator(__p_prx, 0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent));
-    }
-    ::Ice::AsyncResultPtr
-    begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
-    {
-        return begin_foundLocator(__p_prx, 0, ::Ice::newCallback(__completed, __sent), 0);
-    }
-    ::Ice::AsyncResultPtr
-    begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context& __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
-    {
-        return begin_foundLocator(__p_prx, &__ctx, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent), 0);
-    }
-    ::Ice::AsyncResultPtr
-    begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
-    {
-        return begin_foundLocator(__p_prx, &__ctx, ::Ice::newCallback(__completed, __sent));
-    }
-#endif
-
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& __p_prx)
+    void foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return begin_foundLocator(__p_prx, 0, ::IceInternal::__dummyCallback, 0);
+        end_foundLocator(_iceI_begin_foundLocator(iceP_prx, context, ::IceInternal::dummyCallback, 0, true));
     }
 
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context& __ctx)
+    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return begin_foundLocator(__p_prx, &__ctx, ::IceInternal::__dummyCallback, 0);
+        return _iceI_begin_foundLocator(iceP_prx, context, ::IceInternal::dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
     {
-        return begin_foundLocator(__p_prx, 0, __del, __cookie);
+        return _iceI_begin_foundLocator(iceP_prx, ::Ice::noExplicitContext, del, cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::Ice::Context& context, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
     {
-        return begin_foundLocator(__p_prx, &__ctx, __del, __cookie);
+        return _iceI_begin_foundLocator(iceP_prx, context, del, cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::IceLocatorDiscovery::Callback_LookupReply_foundLocatorPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::IceLocatorDiscovery::Callback_LookupReply_foundLocatorPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
     {
-        return begin_foundLocator(__p_prx, 0, __del, __cookie);
+        return _iceI_begin_foundLocator(iceP_prx, ::Ice::noExplicitContext, del, cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context& __ctx, const ::IceLocatorDiscovery::Callback_LookupReply_foundLocatorPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::Ice::Context& context, const ::IceLocatorDiscovery::Callback_LookupReply_foundLocatorPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
     {
-        return begin_foundLocator(__p_prx, &__ctx, __del, __cookie);
+        return _iceI_begin_foundLocator(iceP_prx, context, del, cookie);
     }
 
     void end_foundLocator(const ::Ice::AsyncResultPtr&);
-    
+
 private:
 
-    void foundLocator(const ::Ice::LocatorPrx&, const ::Ice::Context*);
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx&, const ::Ice::Context*, const ::IceInternal::CallbackBasePtr&, const ::Ice::LocalObjectPtr& __cookie = 0);
-    
+    ::Ice::AsyncResultPtr _iceI_begin_foundLocator(const ::Ice::LocatorPrx&, const ::Ice::Context&, const ::IceInternal::CallbackBasePtr&, const ::Ice::LocalObjectPtr& cookie = 0, bool sync = false);
+
 public:
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_context(const ::Ice::Context& __context) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_context(__context).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_adapterId(const ::std::string& __id) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_endpoints(const ::Ice::EndpointSeq& __endpoints) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_endpoints(__endpoints).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_locatorCacheTimeout(int __timeout) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_locatorCacheTimeout(__timeout).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_connectionCached(bool __cached) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_connectionCached(__cached).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_endpointSelection(::Ice::EndpointSelectionType __est) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_endpointSelection(__est).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_secure(bool __secure) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_preferSecure(bool __preferSecure) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_preferSecure(__preferSecure).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_router(const ::Ice::RouterPrx& __router) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_router(__router).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_locator(const ::Ice::LocatorPrx& __locator) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_collocationOptimized(bool __co) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_collocationOptimized(__co).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_invocationTimeout(int __timeout) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_invocationTimeout(__timeout).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_twoway() const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_twoway().get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_oneway() const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_oneway().get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_batchOneway() const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_batchOneway().get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_datagram() const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_datagram().get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_batchDatagram() const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_compress(bool __compress) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_compress(__compress).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_timeout(int __timeout) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_connectionId(const ::std::string& __id) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_connectionId(__id).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_encodingVersion(const ::Ice::EncodingVersion& __v) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_encodingVersion(__v).get());
-    }
-    
+
     static const ::std::string& ice_staticId();
 
-private: 
-    virtual ::IceProxy::Ice::Object* __newInstance() const;
+protected:
+
+    virtual ::IceProxy::Ice::Object* _newInstance() const;
 };
 
-class Lookup : virtual public ::IceProxy::Ice::Object
+class Lookup : public virtual ::Ice::Proxy<Lookup, ::IceProxy::Ice::Object>
 {
 public:
 
-    void findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply)
-    {
-        findLocator(__p_instanceName, __p_reply, 0);
-    }
-    void findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx)
-    {
-        findLocator(__p_instanceName, __p_reply, &__ctx);
-    }
-#ifdef ICE_CPP11
-    ::Ice::AsyncResultPtr
-    begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
-    {
-        return begin_findLocator(__p_instanceName, __p_reply, 0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent));
-    }
-    ::Ice::AsyncResultPtr
-    begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
-    {
-        return begin_findLocator(__p_instanceName, __p_reply, 0, ::Ice::newCallback(__completed, __sent), 0);
-    }
-    ::Ice::AsyncResultPtr
-    begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
-    {
-        return begin_findLocator(__p_instanceName, __p_reply, &__ctx, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent), 0);
-    }
-    ::Ice::AsyncResultPtr
-    begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
-    {
-        return begin_findLocator(__p_instanceName, __p_reply, &__ctx, ::Ice::newCallback(__completed, __sent));
-    }
-#endif
-
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply)
+    void findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return begin_findLocator(__p_instanceName, __p_reply, 0, ::IceInternal::__dummyCallback, 0);
+        end_findLocator(_iceI_begin_findLocator(iceP_instanceName, iceP_reply, context, ::IceInternal::dummyCallback, 0, true));
     }
 
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx)
+    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return begin_findLocator(__p_instanceName, __p_reply, &__ctx, ::IceInternal::__dummyCallback, 0);
+        return _iceI_begin_findLocator(iceP_instanceName, iceP_reply, context, ::IceInternal::dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
     {
-        return begin_findLocator(__p_instanceName, __p_reply, 0, __del, __cookie);
+        return _iceI_begin_findLocator(iceP_instanceName, iceP_reply, ::Ice::noExplicitContext, del, cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
     {
-        return begin_findLocator(__p_instanceName, __p_reply, &__ctx, __del, __cookie);
+        return _iceI_begin_findLocator(iceP_instanceName, iceP_reply, context, del, cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::IceLocatorDiscovery::Callback_Lookup_findLocatorPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::IceLocatorDiscovery::Callback_Lookup_findLocatorPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
     {
-        return begin_findLocator(__p_instanceName, __p_reply, 0, __del, __cookie);
+        return _iceI_begin_findLocator(iceP_instanceName, iceP_reply, ::Ice::noExplicitContext, del, cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::IceLocatorDiscovery::Callback_Lookup_findLocatorPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context, const ::IceLocatorDiscovery::Callback_Lookup_findLocatorPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
     {
-        return begin_findLocator(__p_instanceName, __p_reply, &__ctx, __del, __cookie);
+        return _iceI_begin_findLocator(iceP_instanceName, iceP_reply, context, del, cookie);
     }
 
     void end_findLocator(const ::Ice::AsyncResultPtr&);
-    
+
 private:
 
-    void findLocator(const ::std::string&, const ::IceLocatorDiscovery::LookupReplyPrx&, const ::Ice::Context*);
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string&, const ::IceLocatorDiscovery::LookupReplyPrx&, const ::Ice::Context*, const ::IceInternal::CallbackBasePtr&, const ::Ice::LocalObjectPtr& __cookie = 0);
-    
+    ::Ice::AsyncResultPtr _iceI_begin_findLocator(const ::std::string&, const ::IceLocatorDiscovery::LookupReplyPrx&, const ::Ice::Context&, const ::IceInternal::CallbackBasePtr&, const ::Ice::LocalObjectPtr& cookie = 0, bool sync = false);
+
 public:
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_context(const ::Ice::Context& __context) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_context(__context).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_adapterId(const ::std::string& __id) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_endpoints(const ::Ice::EndpointSeq& __endpoints) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_endpoints(__endpoints).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_locatorCacheTimeout(int __timeout) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_locatorCacheTimeout(__timeout).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_connectionCached(bool __cached) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_connectionCached(__cached).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_endpointSelection(::Ice::EndpointSelectionType __est) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_endpointSelection(__est).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_secure(bool __secure) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_preferSecure(bool __preferSecure) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_preferSecure(__preferSecure).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_router(const ::Ice::RouterPrx& __router) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_router(__router).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_locator(const ::Ice::LocatorPrx& __locator) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_collocationOptimized(bool __co) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_collocationOptimized(__co).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_invocationTimeout(int __timeout) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_invocationTimeout(__timeout).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_twoway() const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_twoway().get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_oneway() const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_oneway().get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_batchOneway() const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_batchOneway().get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_datagram() const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_datagram().get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_batchDatagram() const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_compress(bool __compress) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_compress(__compress).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_timeout(int __timeout) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_connectionId(const ::std::string& __id) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_connectionId(__id).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_encodingVersion(const ::Ice::EncodingVersion& __v) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_encodingVersion(__v).get());
-    }
-    
+
     static const ::std::string& ice_staticId();
 
-private: 
-    virtual ::IceProxy::Ice::Object* __newInstance() const;
+protected:
+
+    virtual ::IceProxy::Ice::Object* _newInstance() const;
 };
 
 }
@@ -485,76 +370,85 @@ private:
 namespace IceLocatorDiscovery
 {
 
-class LookupReply : virtual public ::Ice::Object
+class LookupReply : public virtual ::Ice::Object
 {
 public:
 
     typedef LookupReplyPrx ProxyType;
     typedef LookupReplyPtr PointerType;
 
-    virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
-    virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
-    virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
+    virtual ~LookupReply();
+
+    virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::emptyCurrent) const;
+    virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::emptyCurrent) const;
+    virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::emptyCurrent) const;
+
     static const ::std::string& ice_staticId();
 
-    virtual void foundLocator(const ::Ice::LocatorPrx&, const ::Ice::Current& = ::Ice::Current()) = 0;
-    ::Ice::DispatchStatus ___foundLocator(::IceInternal::Incoming&, const ::Ice::Current&);
+    virtual void foundLocator(const ::Ice::LocatorPrx&, const ::Ice::Current& = ::Ice::emptyCurrent) = 0;
+    bool _iceD_foundLocator(::IceInternal::Incoming&, const ::Ice::Current&);
 
-    virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);
+    virtual bool _iceDispatch(::IceInternal::Incoming&, const ::Ice::Current&);
 
 protected:
-    virtual void __writeImpl(::IceInternal::BasicStream*) const;
-    virtual void __readImpl(::IceInternal::BasicStream*);
-    using ::Ice::Object::__writeImpl;
-    using ::Ice::Object::__readImpl;
+
+    virtual void _iceWriteImpl(::Ice::OutputStream*) const;
+    virtual void _iceReadImpl(::Ice::InputStream*);
 };
 
-inline bool operator==(const LookupReply& l, const LookupReply& r)
+inline bool operator==(const LookupReply& lhs, const LookupReply& rhs)
 {
-    return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
+    return static_cast<const ::Ice::Object&>(lhs) == static_cast<const ::Ice::Object&>(rhs);
 }
 
-inline bool operator<(const LookupReply& l, const LookupReply& r)
+inline bool operator<(const LookupReply& lhs, const LookupReply& rhs)
 {
-    return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
+    return static_cast<const ::Ice::Object&>(lhs) < static_cast<const ::Ice::Object&>(rhs);
 }
 
-class Lookup : virtual public ::Ice::Object
+class Lookup : public virtual ::Ice::Object
 {
 public:
 
     typedef LookupPrx ProxyType;
     typedef LookupPtr PointerType;
 
-    virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
-    virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
-    virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
+    virtual ~Lookup();
+
+    virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::emptyCurrent) const;
+    virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::emptyCurrent) const;
+    virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::emptyCurrent) const;
+
     static const ::std::string& ice_staticId();
 
-    virtual void findLocator(const ::std::string&, const ::IceLocatorDiscovery::LookupReplyPrx&, const ::Ice::Current& = ::Ice::Current()) = 0;
-    ::Ice::DispatchStatus ___findLocator(::IceInternal::Incoming&, const ::Ice::Current&);
+    virtual void findLocator(const ::std::string&, const ::IceLocatorDiscovery::LookupReplyPrx&, const ::Ice::Current& = ::Ice::emptyCurrent) = 0;
+    bool _iceD_findLocator(::IceInternal::Incoming&, const ::Ice::Current&);
 
-    virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);
+    virtual bool _iceDispatch(::IceInternal::Incoming&, const ::Ice::Current&);
 
 protected:
-    virtual void __writeImpl(::IceInternal::BasicStream*) const;
-    virtual void __readImpl(::IceInternal::BasicStream*);
-    using ::Ice::Object::__writeImpl;
-    using ::Ice::Object::__readImpl;
+
+    virtual void _iceWriteImpl(::Ice::OutputStream*) const;
+    virtual void _iceReadImpl(::Ice::InputStream*);
 };
 
-inline bool operator==(const Lookup& l, const Lookup& r)
+inline bool operator==(const Lookup& lhs, const Lookup& rhs)
 {
-    return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
+    return static_cast<const ::Ice::Object&>(lhs) == static_cast<const ::Ice::Object&>(rhs);
 }
 
-inline bool operator<(const Lookup& l, const Lookup& r)
+inline bool operator<(const Lookup& lhs, const Lookup& rhs)
 {
-    return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
+    return static_cast<const ::Ice::Object&>(lhs) < static_cast<const ::Ice::Object&>(rhs);
 }
 
 }
 
+namespace Ice
+{
+
+}
+
 namespace IceLocatorDiscovery
 {
 
@@ -724,5 +618,7 @@ newCallback_Lookup_findLocator(T* instance, void (T::*excb)(const ::Ice::Excepti
 
 }
 
+#endif
+
 #include <IceUtil/PopDisableWarnings.h>
 #endif