zeroc-ice 3.6.5 → 3.7.4

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.4
 //
 // <auto-generated>
 //
@@ -21,165 +16,410 @@
 #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
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 5
+#   if ICE_INT_VERSION % 100 < 4
 #       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)
-    {
-        v = 0;
-    }
-    else
-    {
-        v = new ::IceProxy::IceLocatorDiscovery::LookupReply;
-        v->__copyFrom(proxy);
-    }
+    return ::std::binary_search(iceC_IceLocatorDiscovery_LookupReply_ids, iceC_IceLocatorDiscovery_LookupReply_ids + 2, s);
 }
 
-void
-IceProxy::IceLocatorDiscovery::LookupReply::foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context* __ctx)
+::std::vector<::std::string>
+IceLocatorDiscovery::LookupReply::ice_ids(const ::Ice::Current&) const
 {
-    ::IceInternal::Outgoing __og(this, __IceLocatorDiscovery__LookupReply__foundLocator_name, ::Ice::Normal, __ctx);
-    try
+    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;
+}
+
+/// \cond INTERNAL
+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;
+}
+/// \endcond
+
+/// \cond INTERNAL
+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)
     {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __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_IceLocatorDiscovery_LookupReply_ops)
     {
-        __og.abort(__ex);
+        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);
+        }
     }
-    __invoke(__og);
 }
+/// \endcond
 
-::Ice::AsyncResultPtr
-IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+bool
+IceLocatorDiscovery::Lookup::ice_isA(::std::string s, const ::Ice::Current&) const
 {
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __IceLocatorDiscovery__LookupReply__foundLocator_name, __del, __cookie);
-    try
+    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;
+}
+
+/// \cond INTERNAL
+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<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;
+}
+/// \endcond
+
+/// \cond INTERNAL
+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)
     {
-        __result->prepare(__IceLocatorDiscovery__LookupReply__foundLocator_name, ::Ice::Normal, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __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_IceLocatorDiscovery_Lookup_ops)
     {
-        __result->abort(__ex);
+        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);
+        }
     }
-    return __result;
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-IceProxy::IceLocatorDiscovery::LookupReply::end_foundLocator(const ::Ice::AsyncResultPtr& __result)
+IceLocatorDiscovery::LookupReplyPrx::_iceI_foundLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::shared_ptr<::Ice::LocatorPrx>& iceP_prx, const ::Ice::Context& context)
 {
-    __end(__result, __IceLocatorDiscovery__LookupReply__foundLocator_name);
+    outAsync->invoke(iceC_IceLocatorDiscovery_LookupReply_foundLocator_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        [&](::Ice::OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_prx);
+        },
+        nullptr);
 }
+/// \endcond
+
+/// \cond INTERNAL
+::std::shared_ptr<::Ice::ObjectPrx>
+IceLocatorDiscovery::LookupReplyPrx::_newInstance() const
+{
+    return ::IceInternal::createProxy<LookupReplyPrx>();
+}
+/// \endcond
 
 const ::std::string&
-IceProxy::IceLocatorDiscovery::LookupReply::ice_staticId()
+IceLocatorDiscovery::LookupReplyPrx::ice_staticId()
 {
-    return ::IceLocatorDiscovery::LookupReply::ice_staticId();
+    return LookupReply::ice_staticId();
 }
 
-::IceProxy::Ice::Object*
-IceProxy::IceLocatorDiscovery::LookupReply::__newInstance() const
+/// \cond INTERNAL
+void
+IceLocatorDiscovery::LookupPrx::_iceI_findLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_instanceName, const ::std::shared_ptr<LookupReplyPrx>& iceP_reply, const ::Ice::Context& context)
 {
-    return new LookupReply;
+    outAsync->invoke(iceC_IceLocatorDiscovery_Lookup_findLocator_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
+        [&](::Ice::OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_instanceName, iceP_reply);
+        },
+        nullptr);
+}
+/// \endcond
+
+/// \cond INTERNAL
+::std::shared_ptr<::Ice::ObjectPrx>
+IceLocatorDiscovery::LookupPrx::_newInstance() const
+{
+    return ::IceInternal::createProxy<LookupPrx>();
+}
+/// \endcond
+
+const ::std::string&
+IceLocatorDiscovery::LookupPrx::ice_staticId()
+{
+    return 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::Lookup* p) { return p; }
+
+/// \cond INTERNAL
+::IceProxy::Ice::Object* ::IceProxy::IceLocatorDiscovery::upCast(LookupReply* p) { return p; }
 
 void
-::IceProxy::IceLocatorDiscovery::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::Lookup>& v)
+::IceProxy::IceLocatorDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< LookupReply>& v)
 {
     ::Ice::ObjectPrx proxy;
-    __is->read(proxy);
+    istr->read(proxy);
     if(!proxy)
     {
         v = 0;
     }
     else
     {
-        v = new ::IceProxy::IceLocatorDiscovery::Lookup;
-        v->__copyFrom(proxy);
+        v = new LookupReply;
+        v->_copyFrom(proxy);
     }
 }
+/// \endcond
 
-void
-IceProxy::IceLocatorDiscovery::Lookup::findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context* __ctx)
+::Ice::AsyncResultPtr
+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::Outgoing __og(this, __IceLocatorDiscovery__Lookup__findLocator_name, ::Ice::Idempotent, __ctx);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_IceLocatorDiscovery_LookupReply_foundLocator_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_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::LocalException& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __og.abort(__ex);
+        result->abort(ex);
     }
-    __invoke(__og);
+    return result;
+}
+
+void
+IceProxy::IceLocatorDiscovery::LookupReply::end_foundLocator(const ::Ice::AsyncResultPtr& result)
+{
+    _end(result, iceC_IceLocatorDiscovery_LookupReply_foundLocator_name);
 }
 
+/// \cond INTERNAL
+::IceProxy::Ice::Object*
+IceProxy::IceLocatorDiscovery::LookupReply::_newInstance() const
+{
+    return new LookupReply;
+}
+/// \endcond
+
+const ::std::string&
+IceProxy::IceLocatorDiscovery::LookupReply::ice_staticId()
+{
+    return ::IceLocatorDiscovery::LookupReply::ice_staticId();
+}
+
+/// \cond INTERNAL
+::IceProxy::Ice::Object* ::IceProxy::IceLocatorDiscovery::upCast(Lookup* p) { return p; }
+
+void
+::IceProxy::IceLocatorDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< Lookup>& v)
+{
+    ::Ice::ObjectPrx proxy;
+    istr->read(proxy);
+    if(!proxy)
+    {
+        v = 0;
+    }
+    else
+    {
+        v = new Lookup;
+        v->_copyFrom(proxy);
+    }
+}
+/// \endcond
+
 ::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)
+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::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __IceLocatorDiscovery__Lookup__findLocator_name, __del, __cookie);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_IceLocatorDiscovery_Lookup_findLocator_name, del, cookie, sync);
     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();
+        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::Exception& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __result->abort(__ex);
+        result->abort(ex);
     }
-    return __result;
+    return result;
 }
 
 void
-IceProxy::IceLocatorDiscovery::Lookup::end_findLocator(const ::Ice::AsyncResultPtr& __result)
+IceProxy::IceLocatorDiscovery::Lookup::end_findLocator(const ::Ice::AsyncResultPtr& result)
+{
+    _end(result, iceC_IceLocatorDiscovery_Lookup_findLocator_name);
+}
+
+/// \cond INTERNAL
+::IceProxy::Ice::Object*
+IceProxy::IceLocatorDiscovery::Lookup::_newInstance() const
 {
-    __end(__result, __IceLocatorDiscovery__Lookup__findLocator_name);
+    return new Lookup;
 }
+/// \endcond
 
 const ::std::string&
 IceProxy::IceLocatorDiscovery::Lookup::ice_staticId()
@@ -187,17 +427,18 @@ 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; }
+/// \cond INTERNAL
+::Ice::Object* IceLocatorDiscovery::upCast(LookupReply* p) { return p; }
+
+/// \endcond
 
 namespace
 {
-const ::std::string __IceLocatorDiscovery__LookupReply_ids[2] =
+const ::std::string iceC_IceLocatorDiscovery_LookupReply_ids[2] =
 {
     "::Ice::Object",
     "::IceLocatorDiscovery::LookupReply"
@@ -206,21 +447,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 +471,28 @@ 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)
+/// \cond INTERNAL
+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;
 }
+/// \endcond
 
 namespace
 {
-const ::std::string __IceLocatorDiscovery__LookupReply_all[] =
+const ::std::string iceC_IceLocatorDiscovery_LookupReply_all[] =
 {
     "foundLocator",
     "ice_id",
@@ -260,72 +503,89 @@ const ::std::string __IceLocatorDiscovery__LookupReply_all[] =
 
 }
 
-::Ice::DispatchStatus
-IceLocatorDiscovery::LookupReply::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+/// \cond INTERNAL
+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);
 }
+/// \endcond
 
+/// \cond STREAM
 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< 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< LookupReply, ::Ice::InputStream>::read(istr, *this);
+    istr->endSlice();
 }
+/// \endcond
 
-void 
-IceLocatorDiscovery::__patch(LookupReplyPtr& handle, const ::Ice::ObjectPtr& v)
+/// \cond INTERNAL
+void
+IceLocatorDiscovery::_icePatchObjectPtr(LookupReplyPtr& handle, const ::Ice::ObjectPtr& v)
 {
-    handle = ::IceLocatorDiscovery::LookupReplyPtr::dynamicCast(v);
+    handle = LookupReplyPtr::dynamicCast(v);
     if(v && !handle)
     {
-        IceInternal::Ex::throwUOE(::IceLocatorDiscovery::LookupReply::ice_staticId(), v);
+        IceInternal::Ex::throwUOE(LookupReply::ice_staticId(), v);
     }
 }
+/// \endcond
+
+IceLocatorDiscovery::Lookup::~Lookup()
+{
+}
+
+/// \cond INTERNAL
+::Ice::Object* IceLocatorDiscovery::upCast(Lookup* p) { return p; }
 
-::Ice::Object* IceLocatorDiscovery::upCast(::IceLocatorDiscovery::Lookup* p) { return p; }
+/// \endcond
 
 namespace
 {
-const ::std::string __IceLocatorDiscovery__Lookup_ids[2] =
+const ::std::string iceC_IceLocatorDiscovery_Lookup_ids[2] =
 {
     "::Ice::Object",
     "::IceLocatorDiscovery::Lookup"
@@ -334,21 +594,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 +618,30 @@ 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)
+/// \cond INTERNAL
+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;
+    LookupReplyPrx iceP_reply;
+    istr->read(iceP_instanceName);
+    istr->read(iceP_reply);
+    inS.endReadParams();
+    this->findLocator(iceP_instanceName, iceP_reply, current);
+    inS.writeEmptyParams();
+    return true;
 }
+/// \endcond
 
 namespace
 {
-const ::std::string __IceLocatorDiscovery__Lookup_all[] =
+const ::std::string iceC_IceLocatorDiscovery_Lookup_all[] =
 {
     "findLocator",
     "ice_id",
@@ -390,63 +652,79 @@ const ::std::string __IceLocatorDiscovery__Lookup_all[] =
 
 }
 
-::Ice::DispatchStatus
-IceLocatorDiscovery::Lookup::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+/// \cond INTERNAL
+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);
 }
+/// \endcond
 
+/// \cond STREAM
 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< 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< Lookup, ::Ice::InputStream>::read(istr, *this);
+    istr->endSlice();
 }
+/// \endcond
 
-void 
-IceLocatorDiscovery::__patch(LookupPtr& handle, const ::Ice::ObjectPtr& v)
+/// \cond INTERNAL
+void
+IceLocatorDiscovery::_icePatchObjectPtr(LookupPtr& handle, const ::Ice::ObjectPtr& v)
 {
-    handle = ::IceLocatorDiscovery::LookupPtr::dynamicCast(v);
+    handle = LookupPtr::dynamicCast(v);
     if(v && !handle)
     {
-        IceInternal::Ex::throwUOE(::IceLocatorDiscovery::Lookup::ice_staticId(), v);
+        IceInternal::Ex::throwUOE(Lookup::ice_staticId(), v);
     }
 }
+/// \endcond
+
+namespace Ice
+{
+}
+
+#endif