zeroc-ice 3.6.5 → 3.7.4

data/ext/ice/cpp/src/Ice/LocalObject.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// 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.
-//
-// **********************************************************************
 
 #include <Ice/LocalObject.h>
 
@@ -26,4 +21,3 @@ Ice::LocalObject::operator<(const LocalObject& r) const
 {
     return this < &r;
 }
-

data/ext/ice/cpp/src/Ice/Locator.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>
 //
@@ -24,1124 +19,1270 @@
 #include <Ice/Locator.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 __Ice__Locator__findObjectById_name = "findObjectById";
-
-const ::std::string __Ice__Locator__findAdapterById_name = "findAdapterById";
+const ::IceInternal::DefaultUserExceptionFactoryInit<::Ice::AdapterNotFoundException> iceC_Ice_AdapterNotFoundException_init("::Ice::AdapterNotFoundException");
 
-const ::std::string __Ice__Locator__getRegistry_name = "getRegistry";
+const ::IceInternal::DefaultUserExceptionFactoryInit<::Ice::InvalidReplicaGroupIdException> iceC_Ice_InvalidReplicaGroupIdException_init("::Ice::InvalidReplicaGroupIdException");
 
-const ::std::string __Ice__LocatorRegistry__setAdapterDirectProxy_name = "setAdapterDirectProxy";
+const ::IceInternal::DefaultUserExceptionFactoryInit<::Ice::AdapterAlreadyActiveException> iceC_Ice_AdapterAlreadyActiveException_init("::Ice::AdapterAlreadyActiveException");
 
-const ::std::string __Ice__LocatorRegistry__setReplicatedAdapterDirectProxy_name = "setReplicatedAdapterDirectProxy";
+const ::IceInternal::DefaultUserExceptionFactoryInit<::Ice::ObjectNotFoundException> iceC_Ice_ObjectNotFoundException_init("::Ice::ObjectNotFoundException");
 
-const ::std::string __Ice__LocatorRegistry__setServerProcessProxy_name = "setServerProcessProxy";
+const ::IceInternal::DefaultUserExceptionFactoryInit<::Ice::ServerNotFoundException> iceC_Ice_ServerNotFoundException_init("::Ice::ServerNotFoundException");
 
-const ::std::string __Ice__LocatorFinder__getLocator_name = "getLocator";
-
-}
+const ::std::string iceC_Ice_Locator_ids[2] =
+{
+    "::Ice::Locator",
+    "::Ice::Object"
+};
+const ::std::string iceC_Ice_Locator_ops[] =
+{
+    "findAdapterById",
+    "findObjectById",
+    "getRegistry",
+    "ice_id",
+    "ice_ids",
+    "ice_isA",
+    "ice_ping"
+};
+const ::std::string iceC_Ice_Locator_findObjectById_name = "findObjectById";
+const ::std::string iceC_Ice_Locator_findAdapterById_name = "findAdapterById";
+const ::std::string iceC_Ice_Locator_getRegistry_name = "getRegistry";
 
-namespace
+const ::std::string iceC_Ice_LocatorRegistry_ids[2] =
+{
+    "::Ice::LocatorRegistry",
+    "::Ice::Object"
+};
+const ::std::string iceC_Ice_LocatorRegistry_ops[] =
 {
+    "ice_id",
+    "ice_ids",
+    "ice_isA",
+    "ice_ping",
+    "setAdapterDirectProxy",
+    "setReplicatedAdapterDirectProxy",
+    "setServerProcessProxy"
+};
+const ::std::string iceC_Ice_LocatorRegistry_setAdapterDirectProxy_name = "setAdapterDirectProxy";
+const ::std::string iceC_Ice_LocatorRegistry_setReplicatedAdapterDirectProxy_name = "setReplicatedAdapterDirectProxy";
+const ::std::string iceC_Ice_LocatorRegistry_setServerProcessProxy_name = "setServerProcessProxy";
 
-const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::AdapterNotFoundException> __Ice__AdapterNotFoundException_init("::Ice::AdapterNotFoundException");
+const ::std::string iceC_Ice_LocatorFinder_ids[2] =
+{
+    "::Ice::LocatorFinder",
+    "::Ice::Object"
+};
+const ::std::string iceC_Ice_LocatorFinder_ops[] =
+{
+    "getLocator",
+    "ice_id",
+    "ice_ids",
+    "ice_isA",
+    "ice_ping"
+};
+const ::std::string iceC_Ice_LocatorFinder_getLocator_name = "getLocator";
 
 }
 
-Ice::AdapterNotFoundException::~AdapterNotFoundException() throw()
+Ice::AdapterNotFoundException::~AdapterNotFoundException()
 {
 }
 
-::std::string
-Ice::AdapterNotFoundException::ice_name() const
+const ::std::string&
+Ice::AdapterNotFoundException::ice_staticId()
 {
-    return "Ice::AdapterNotFoundException";
+    static const ::std::string typeId = "::Ice::AdapterNotFoundException";
+    return typeId;
 }
 
-Ice::AdapterNotFoundException*
-Ice::AdapterNotFoundException::ice_clone() const
+Ice::InvalidReplicaGroupIdException::~InvalidReplicaGroupIdException()
 {
-    return new AdapterNotFoundException(*this);
 }
 
-void
-Ice::AdapterNotFoundException::ice_throw() const
+const ::std::string&
+Ice::InvalidReplicaGroupIdException::ice_staticId()
 {
-    throw *this;
+    static const ::std::string typeId = "::Ice::InvalidReplicaGroupIdException";
+    return typeId;
 }
 
-void
-Ice::AdapterNotFoundException::__writeImpl(::IceInternal::BasicStream* __os) const
+Ice::AdapterAlreadyActiveException::~AdapterAlreadyActiveException()
 {
-    __os->startWriteSlice("::Ice::AdapterNotFoundException", -1, true);
-    __os->endWriteSlice();
 }
 
-void
-Ice::AdapterNotFoundException::__readImpl(::IceInternal::BasicStream* __is)
+const ::std::string&
+Ice::AdapterAlreadyActiveException::ice_staticId()
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    static const ::std::string typeId = "::Ice::AdapterAlreadyActiveException";
+    return typeId;
 }
 
-namespace
+Ice::ObjectNotFoundException::~ObjectNotFoundException()
 {
-
-const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::InvalidReplicaGroupIdException> __Ice__InvalidReplicaGroupIdException_init("::Ice::InvalidReplicaGroupIdException");
-
 }
 
-Ice::InvalidReplicaGroupIdException::~InvalidReplicaGroupIdException() throw()
+const ::std::string&
+Ice::ObjectNotFoundException::ice_staticId()
 {
+    static const ::std::string typeId = "::Ice::ObjectNotFoundException";
+    return typeId;
 }
 
-::std::string
-Ice::InvalidReplicaGroupIdException::ice_name() const
+Ice::ServerNotFoundException::~ServerNotFoundException()
 {
-    return "Ice::InvalidReplicaGroupIdException";
 }
 
-Ice::InvalidReplicaGroupIdException*
-Ice::InvalidReplicaGroupIdException::ice_clone() const
+const ::std::string&
+Ice::ServerNotFoundException::ice_staticId()
 {
-    return new InvalidReplicaGroupIdException(*this);
+    static const ::std::string typeId = "::Ice::ServerNotFoundException";
+    return typeId;
 }
 
-void
-Ice::InvalidReplicaGroupIdException::ice_throw() const
+bool
+Ice::Locator::ice_isA(::std::string s, const Current&) const
 {
-    throw *this;
+    return ::std::binary_search(iceC_Ice_Locator_ids, iceC_Ice_Locator_ids + 2, s);
 }
 
-void
-Ice::InvalidReplicaGroupIdException::__writeImpl(::IceInternal::BasicStream* __os) const
+::std::vector<::std::string>
+Ice::Locator::ice_ids(const Current&) const
 {
-    __os->startWriteSlice("::Ice::InvalidReplicaGroupIdException", -1, true);
-    __os->endWriteSlice();
+    return ::std::vector<::std::string>(&iceC_Ice_Locator_ids[0], &iceC_Ice_Locator_ids[2]);
 }
 
-void
-Ice::InvalidReplicaGroupIdException::__readImpl(::IceInternal::BasicStream* __is)
+::std::string
+Ice::Locator::ice_id(const Current&) const
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    return ice_staticId();
 }
 
-namespace
+const ::std::string&
+Ice::Locator::ice_staticId()
 {
-
-const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::AdapterAlreadyActiveException> __Ice__AdapterAlreadyActiveException_init("::Ice::AdapterAlreadyActiveException");
-
+    static const ::std::string typeId = "::Ice::Locator";
+    return typeId;
 }
 
-Ice::AdapterAlreadyActiveException::~AdapterAlreadyActiveException() throw()
-{
+/// \cond INTERNAL
+bool
+Ice::Locator::_iceD_findObjectById(::IceInternal::Incoming& inS, const Current& current) const
+{
+    _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
+    auto istr = inS.startReadParams();
+    Identity iceP_id;
+    istr->readAll(iceP_id);
+    inS.endReadParams();
+    auto inA = ::IceInternal::IncomingAsync::create(inS);
+    auto responseCB = [inA](const ::std::shared_ptr<ObjectPrx>& ret)
+    {
+        auto ostr = inA->startWriteParams();
+        ostr->writeAll(ret);
+        inA->endWriteParams();
+        inA->completed();
+    };
+    this->findObjectByIdAsync(::std::move(iceP_id), responseCB, inA->exception(), current);
+    return false;
 }
+/// \endcond
 
-::std::string
-Ice::AdapterAlreadyActiveException::ice_name() const
-{
-    return "Ice::AdapterAlreadyActiveException";
+/// \cond INTERNAL
+bool
+Ice::Locator::_iceD_findAdapterById(::IceInternal::Incoming& inS, const Current& current) const
+{
+    _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
+    auto istr = inS.startReadParams();
+    ::std::string iceP_id;
+    istr->readAll(iceP_id);
+    inS.endReadParams();
+    auto inA = ::IceInternal::IncomingAsync::create(inS);
+    auto responseCB = [inA](const ::std::shared_ptr<ObjectPrx>& ret)
+    {
+        auto ostr = inA->startWriteParams();
+        ostr->writeAll(ret);
+        inA->endWriteParams();
+        inA->completed();
+    };
+    this->findAdapterByIdAsync(::std::move(iceP_id), responseCB, inA->exception(), current);
+    return false;
 }
+/// \endcond
 
-Ice::AdapterAlreadyActiveException*
-Ice::AdapterAlreadyActiveException::ice_clone() const
+/// \cond INTERNAL
+bool
+Ice::Locator::_iceD_getRegistry(::IceInternal::Incoming& inS, const Current& current) const
 {
-    return new AdapterAlreadyActiveException(*this);
+    _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
+    inS.readEmptyParams();
+    ::std::shared_ptr<LocatorRegistryPrx> ret = this->getRegistry(current);
+    auto ostr = inS.startWriteParams();
+    ostr->writeAll(ret);
+    inS.endWriteParams();
+    return true;
 }
+/// \endcond
 
-void
-Ice::AdapterAlreadyActiveException::ice_throw() const
+/// \cond INTERNAL
+bool
+Ice::Locator::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
-    throw *this;
+    ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_Locator_ops, iceC_Ice_Locator_ops + 7, current.operation);
+    if(r.first == r.second)
+    {
+        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+    }
+
+    switch(r.first - iceC_Ice_Locator_ops)
+    {
+        case 0:
+        {
+            return _iceD_findAdapterById(in, current);
+        }
+        case 1:
+        {
+            return _iceD_findObjectById(in, current);
+        }
+        case 2:
+        {
+            return _iceD_getRegistry(in, current);
+        }
+        case 3:
+        {
+            return _iceD_ice_id(in, current);
+        }
+        case 4:
+        {
+            return _iceD_ice_ids(in, current);
+        }
+        case 5:
+        {
+            return _iceD_ice_isA(in, current);
+        }
+        case 6:
+        {
+            return _iceD_ice_ping(in, current);
+        }
+        default:
+        {
+            assert(false);
+            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        }
+    }
 }
+/// \endcond
 
-void
-Ice::AdapterAlreadyActiveException::__writeImpl(::IceInternal::BasicStream* __os) const
+bool
+Ice::LocatorRegistry::ice_isA(::std::string s, const Current&) const
 {
-    __os->startWriteSlice("::Ice::AdapterAlreadyActiveException", -1, true);
-    __os->endWriteSlice();
+    return ::std::binary_search(iceC_Ice_LocatorRegistry_ids, iceC_Ice_LocatorRegistry_ids + 2, s);
 }
 
-void
-Ice::AdapterAlreadyActiveException::__readImpl(::IceInternal::BasicStream* __is)
+::std::vector<::std::string>
+Ice::LocatorRegistry::ice_ids(const Current&) const
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    return ::std::vector<::std::string>(&iceC_Ice_LocatorRegistry_ids[0], &iceC_Ice_LocatorRegistry_ids[2]);
 }
 
-namespace
+::std::string
+Ice::LocatorRegistry::ice_id(const Current&) const
 {
-
-const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::ObjectNotFoundException> __Ice__ObjectNotFoundException_init("::Ice::ObjectNotFoundException");
-
+    return ice_staticId();
 }
 
-Ice::ObjectNotFoundException::~ObjectNotFoundException() throw()
+const ::std::string&
+Ice::LocatorRegistry::ice_staticId()
 {
+    static const ::std::string typeId = "::Ice::LocatorRegistry";
+    return typeId;
 }
 
-::std::string
-Ice::ObjectNotFoundException::ice_name() const
+/// \cond INTERNAL
+bool
+Ice::LocatorRegistry::_iceD_setAdapterDirectProxy(::IceInternal::Incoming& inS, const Current& current)
 {
-    return "Ice::ObjectNotFoundException";
+    _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
+    auto istr = inS.startReadParams();
+    ::std::string iceP_id;
+    ::std::shared_ptr<ObjectPrx> iceP_proxy;
+    istr->readAll(iceP_id, iceP_proxy);
+    inS.endReadParams();
+    auto inA = ::IceInternal::IncomingAsync::create(inS);
+    this->setAdapterDirectProxyAsync(::std::move(iceP_id), ::std::move(iceP_proxy), inA->response(), inA->exception(), current);
+    return false;
 }
+/// \endcond
 
-Ice::ObjectNotFoundException*
-Ice::ObjectNotFoundException::ice_clone() const
+/// \cond INTERNAL
+bool
+Ice::LocatorRegistry::_iceD_setReplicatedAdapterDirectProxy(::IceInternal::Incoming& inS, const Current& current)
+{
+    _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
+    auto istr = inS.startReadParams();
+    ::std::string iceP_adapterId;
+    ::std::string iceP_replicaGroupId;
+    ::std::shared_ptr<ObjectPrx> iceP_p;
+    istr->readAll(iceP_adapterId, iceP_replicaGroupId, iceP_p);
+    inS.endReadParams();
+    auto inA = ::IceInternal::IncomingAsync::create(inS);
+    this->setReplicatedAdapterDirectProxyAsync(::std::move(iceP_adapterId), ::std::move(iceP_replicaGroupId), ::std::move(iceP_p), inA->response(), inA->exception(), current);
+    return false;
+}
+/// \endcond
+
+/// \cond INTERNAL
+bool
+Ice::LocatorRegistry::_iceD_setServerProcessProxy(::IceInternal::Incoming& inS, const Current& current)
 {
-    return new ObjectNotFoundException(*this);
+    _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
+    auto istr = inS.startReadParams();
+    ::std::string iceP_id;
+    ::std::shared_ptr<ProcessPrx> iceP_proxy;
+    istr->readAll(iceP_id, iceP_proxy);
+    inS.endReadParams();
+    auto inA = ::IceInternal::IncomingAsync::create(inS);
+    this->setServerProcessProxyAsync(::std::move(iceP_id), ::std::move(iceP_proxy), inA->response(), inA->exception(), current);
+    return false;
 }
+/// \endcond
 
-void
-Ice::ObjectNotFoundException::ice_throw() const
+/// \cond INTERNAL
+bool
+Ice::LocatorRegistry::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
-    throw *this;
+    ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_LocatorRegistry_ops, iceC_Ice_LocatorRegistry_ops + 7, current.operation);
+    if(r.first == r.second)
+    {
+        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+    }
+
+    switch(r.first - iceC_Ice_LocatorRegistry_ops)
+    {
+        case 0:
+        {
+            return _iceD_ice_id(in, current);
+        }
+        case 1:
+        {
+            return _iceD_ice_ids(in, current);
+        }
+        case 2:
+        {
+            return _iceD_ice_isA(in, current);
+        }
+        case 3:
+        {
+            return _iceD_ice_ping(in, current);
+        }
+        case 4:
+        {
+            return _iceD_setAdapterDirectProxy(in, current);
+        }
+        case 5:
+        {
+            return _iceD_setReplicatedAdapterDirectProxy(in, current);
+        }
+        case 6:
+        {
+            return _iceD_setServerProcessProxy(in, current);
+        }
+        default:
+        {
+            assert(false);
+            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        }
+    }
 }
+/// \endcond
 
-void
-Ice::ObjectNotFoundException::__writeImpl(::IceInternal::BasicStream* __os) const
+bool
+Ice::LocatorFinder::ice_isA(::std::string s, const Current&) const
 {
-    __os->startWriteSlice("::Ice::ObjectNotFoundException", -1, true);
-    __os->endWriteSlice();
+    return ::std::binary_search(iceC_Ice_LocatorFinder_ids, iceC_Ice_LocatorFinder_ids + 2, s);
 }
 
-void
-Ice::ObjectNotFoundException::__readImpl(::IceInternal::BasicStream* __is)
+::std::vector<::std::string>
+Ice::LocatorFinder::ice_ids(const Current&) const
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    return ::std::vector<::std::string>(&iceC_Ice_LocatorFinder_ids[0], &iceC_Ice_LocatorFinder_ids[2]);
 }
 
-namespace
+::std::string
+Ice::LocatorFinder::ice_id(const Current&) const
 {
-
-const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::ServerNotFoundException> __Ice__ServerNotFoundException_init("::Ice::ServerNotFoundException");
-
+    return ice_staticId();
 }
 
-Ice::ServerNotFoundException::~ServerNotFoundException() throw()
+const ::std::string&
+Ice::LocatorFinder::ice_staticId()
 {
+    static const ::std::string typeId = "::Ice::LocatorFinder";
+    return typeId;
 }
 
-::std::string
-Ice::ServerNotFoundException::ice_name() const
+/// \cond INTERNAL
+bool
+Ice::LocatorFinder::_iceD_getLocator(::IceInternal::Incoming& inS, const Current& current)
 {
-    return "Ice::ServerNotFoundException";
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    inS.readEmptyParams();
+    ::std::shared_ptr<LocatorPrx> ret = this->getLocator(current);
+    auto ostr = inS.startWriteParams();
+    ostr->writeAll(ret);
+    inS.endWriteParams();
+    return true;
 }
+/// \endcond
 
-Ice::ServerNotFoundException*
-Ice::ServerNotFoundException::ice_clone() const
+/// \cond INTERNAL
+bool
+Ice::LocatorFinder::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
-    return new ServerNotFoundException(*this);
+    ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_LocatorFinder_ops, iceC_Ice_LocatorFinder_ops + 5, current.operation);
+    if(r.first == r.second)
+    {
+        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+    }
+
+    switch(r.first - iceC_Ice_LocatorFinder_ops)
+    {
+        case 0:
+        {
+            return _iceD_getLocator(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 OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        }
+    }
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::ServerNotFoundException::ice_throw() const
+Ice::LocatorPrx::_iceI_findObjectById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::ObjectPrx>>>& outAsync, const Identity& iceP_id, const Context& context)
 {
-    throw *this;
+    _checkTwowayOnly(iceC_Ice_Locator_findObjectById_name);
+    outAsync->invoke(iceC_Ice_Locator_findObjectById_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context,
+        [&](OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_id);
+        },
+        [](const UserException& ex)
+        {
+            try
+            {
+                ex.ice_throw();
+            }
+            catch(const ObjectNotFoundException&)
+            {
+                throw;
+            }
+            catch(const UserException&)
+            {
+            }
+        });
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::ServerNotFoundException::__writeImpl(::IceInternal::BasicStream* __os) const
+Ice::LocatorPrx::_iceI_findAdapterById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::ObjectPrx>>>& outAsync, const ::std::string& iceP_id, const Context& context)
 {
-    __os->startWriteSlice("::Ice::ServerNotFoundException", -1, true);
-    __os->endWriteSlice();
+    _checkTwowayOnly(iceC_Ice_Locator_findAdapterById_name);
+    outAsync->invoke(iceC_Ice_Locator_findAdapterById_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context,
+        [&](OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_id);
+        },
+        [](const UserException& ex)
+        {
+            try
+            {
+                ex.ice_throw();
+            }
+            catch(const AdapterNotFoundException&)
+            {
+                throw;
+            }
+            catch(const UserException&)
+            {
+            }
+        });
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::ServerNotFoundException::__readImpl(::IceInternal::BasicStream* __is)
+Ice::LocatorPrx::_iceI_getRegistry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::LocatorRegistryPrx>>>& outAsync, const Context& context)
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    _checkTwowayOnly(iceC_Ice_Locator_getRegistry_name);
+    outAsync->invoke(iceC_Ice_Locator_getRegistry_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context,
+        nullptr,
+        nullptr);
 }
+/// \endcond
 
-namespace Ice
+/// \cond INTERNAL
+::std::shared_ptr<::Ice::ObjectPrx>
+Ice::LocatorPrx::_newInstance() const
 {
+    return ::IceInternal::createProxy<LocatorPrx>();
 }
+/// \endcond
 
-IceAsync::Ice::AMD_Locator_findObjectById::AMD_Locator_findObjectById(::IceInternal::Incoming& in) :
-    ::IceInternal::IncomingAsync(in)
+const ::std::string&
+Ice::LocatorPrx::ice_staticId()
 {
+    return Locator::ice_staticId();
 }
 
+/// \cond INTERNAL
 void
-IceAsync::Ice::AMD_Locator_findObjectById::ice_response(const ::Ice::ObjectPrx& __ret)
+Ice::LocatorRegistryPrx::_iceI_setAdapterDirectProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_id, const ::std::shared_ptr<ObjectPrx>& iceP_proxy, const Context& context)
 {
-    if(__validateResponse(true))
-    {
-        try
+    _checkTwowayOnly(iceC_Ice_LocatorRegistry_setAdapterDirectProxy_name);
+    outAsync->invoke(iceC_Ice_LocatorRegistry_setAdapterDirectProxy_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
+        [&](OutputStream* ostr)
         {
-            ::IceInternal::BasicStream* __os = __startWriteParams(::Ice::DefaultFormat);
-            __os->write(__ret);
-            __endWriteParams(true);
-        }
-        catch(const ::Ice::Exception& __ex)
+            ostr->writeAll(iceP_id, iceP_proxy);
+        },
+        [](const UserException& ex)
         {
-            __exception(__ex);
-            return;
-        }
-        __response();
-    }
-}
-
+            try
+            {
+                ex.ice_throw();
+            }
+            catch(const AdapterAlreadyActiveException&)
+            {
+                throw;
+            }
+            catch(const AdapterNotFoundException&)
+            {
+                throw;
+            }
+            catch(const UserException&)
+            {
+            }
+        });
+}
+/// \endcond
+
+/// \cond INTERNAL
 void
-IceAsync::Ice::AMD_Locator_findObjectById::ice_exception(const ::std::exception& ex)
+Ice::LocatorRegistryPrx::_iceI_setReplicatedAdapterDirectProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_adapterId, const ::std::string& iceP_replicaGroupId, const ::std::shared_ptr<ObjectPrx>& iceP_p, const Context& context)
 {
-    if(const ::Ice::ObjectNotFoundException* __ex = dynamic_cast<const ::Ice::ObjectNotFoundException*>(&ex))
-    {
-        if(__validateResponse(false))
+    _checkTwowayOnly(iceC_Ice_LocatorRegistry_setReplicatedAdapterDirectProxy_name);
+    outAsync->invoke(iceC_Ice_LocatorRegistry_setReplicatedAdapterDirectProxy_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
+        [&](OutputStream* ostr)
         {
-            __writeUserException(*__ex, ::Ice::DefaultFormat);
-            __response();
-        }
-    }
-    else
-    {
-        ::IceInternal::IncomingAsync::ice_exception(ex);
-    }
+            ostr->writeAll(iceP_adapterId, iceP_replicaGroupId, iceP_p);
+        },
+        [](const UserException& ex)
+        {
+            try
+            {
+                ex.ice_throw();
+            }
+            catch(const AdapterAlreadyActiveException&)
+            {
+                throw;
+            }
+            catch(const AdapterNotFoundException&)
+            {
+                throw;
+            }
+            catch(const InvalidReplicaGroupIdException&)
+            {
+                throw;
+            }
+            catch(const UserException&)
+            {
+            }
+        });
 }
+/// \endcond
 
-IceAsync::Ice::AMD_Locator_findAdapterById::AMD_Locator_findAdapterById(::IceInternal::Incoming& in) :
-    ::IceInternal::IncomingAsync(in)
+/// \cond INTERNAL
+void
+Ice::LocatorRegistryPrx::_iceI_setServerProcessProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_id, const ::std::shared_ptr<ProcessPrx>& iceP_proxy, const Context& context)
 {
+    _checkTwowayOnly(iceC_Ice_LocatorRegistry_setServerProcessProxy_name);
+    outAsync->invoke(iceC_Ice_LocatorRegistry_setServerProcessProxy_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
+        [&](OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_id, iceP_proxy);
+        },
+        [](const UserException& ex)
+        {
+            try
+            {
+                ex.ice_throw();
+            }
+            catch(const ServerNotFoundException&)
+            {
+                throw;
+            }
+            catch(const UserException&)
+            {
+            }
+        });
 }
+/// \endcond
 
+/// \cond INTERNAL
+::std::shared_ptr<::Ice::ObjectPrx>
+Ice::LocatorRegistryPrx::_newInstance() const
+{
+    return ::IceInternal::createProxy<LocatorRegistryPrx>();
+}
+/// \endcond
+
+const ::std::string&
+Ice::LocatorRegistryPrx::ice_staticId()
+{
+    return LocatorRegistry::ice_staticId();
+}
+
+/// \cond INTERNAL
 void
-IceAsync::Ice::AMD_Locator_findAdapterById::ice_response(const ::Ice::ObjectPrx& __ret)
+Ice::LocatorFinderPrx::_iceI_getLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::LocatorPrx>>>& outAsync, const Context& context)
 {
-    if(__validateResponse(true))
-    {
-        try
-        {
-            ::IceInternal::BasicStream* __os = __startWriteParams(::Ice::DefaultFormat);
-            __os->write(__ret);
-            __endWriteParams(true);
-        }
-        catch(const ::Ice::Exception& __ex)
-        {
-            __exception(__ex);
-            return;
-        }
-        __response();
-    }
+    _checkTwowayOnly(iceC_Ice_LocatorFinder_getLocator_name);
+    outAsync->invoke(iceC_Ice_LocatorFinder_getLocator_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        nullptr,
+        nullptr);
+}
+/// \endcond
+
+/// \cond INTERNAL
+::std::shared_ptr<::Ice::ObjectPrx>
+Ice::LocatorFinderPrx::_newInstance() const
+{
+    return ::IceInternal::createProxy<LocatorFinderPrx>();
+}
+/// \endcond
+
+const ::std::string&
+Ice::LocatorFinderPrx::ice_staticId()
+{
+    return LocatorFinder::ice_staticId();
+}
+
+#else // C++98 mapping
+
+namespace
+{
+
+const ::std::string iceC_Ice_Locator_findObjectById_name = "findObjectById";
+
+const ::std::string iceC_Ice_Locator_findAdapterById_name = "findAdapterById";
+
+const ::std::string iceC_Ice_Locator_getRegistry_name = "getRegistry";
+
+const ::std::string iceC_Ice_LocatorRegistry_setAdapterDirectProxy_name = "setAdapterDirectProxy";
+
+const ::std::string iceC_Ice_LocatorRegistry_setReplicatedAdapterDirectProxy_name = "setReplicatedAdapterDirectProxy";
+
+const ::std::string iceC_Ice_LocatorRegistry_setServerProcessProxy_name = "setServerProcessProxy";
+
+const ::std::string iceC_Ice_LocatorFinder_getLocator_name = "getLocator";
+
+}
+
+namespace
+{
+
+const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::AdapterNotFoundException> iceC_Ice_AdapterNotFoundException_init("::Ice::AdapterNotFoundException");
+
+}
+
+Ice::AdapterNotFoundException::~AdapterNotFoundException() throw()
+{
+}
+
+::std::string
+Ice::AdapterNotFoundException::ice_id() const
+{
+    return "::Ice::AdapterNotFoundException";
+}
+
+Ice::AdapterNotFoundException*
+Ice::AdapterNotFoundException::ice_clone() const
+{
+    return new AdapterNotFoundException(*this);
 }
 
 void
-IceAsync::Ice::AMD_Locator_findAdapterById::ice_exception(const ::std::exception& ex)
+Ice::AdapterNotFoundException::ice_throw() const
 {
-    if(const ::Ice::AdapterNotFoundException* __ex = dynamic_cast<const ::Ice::AdapterNotFoundException*>(&ex))
-    {
-        if(__validateResponse(false))
-        {
-            __writeUserException(*__ex, ::Ice::DefaultFormat);
-            __response();
-        }
-    }
-    else
-    {
-        ::IceInternal::IncomingAsync::ice_exception(ex);
-    }
+    throw *this;
 }
 
-IceAsync::Ice::AMD_LocatorRegistry_setAdapterDirectProxy::AMD_LocatorRegistry_setAdapterDirectProxy(::IceInternal::Incoming& in) :
-    ::IceInternal::IncomingAsync(in)
+/// \cond STREAM
+void
+Ice::AdapterNotFoundException::_writeImpl(OutputStream* ostr) const
 {
+    ostr->startSlice("::Ice::AdapterNotFoundException", -1, true);
+    StreamWriter< AdapterNotFoundException, OutputStream>::write(ostr, *this);
+    ostr->endSlice();
 }
 
 void
-IceAsync::Ice::AMD_LocatorRegistry_setAdapterDirectProxy::ice_response()
+Ice::AdapterNotFoundException::_readImpl(InputStream* istr)
 {
-    if(__validateResponse(true))
-    {
-        __writeEmptyParams();
-        __response();
-    }
+    istr->startSlice();
+    StreamReader< AdapterNotFoundException, InputStream>::read(istr, *this);
+    istr->endSlice();
+}
+/// \endcond
+
+namespace
+{
+
+const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::InvalidReplicaGroupIdException> iceC_Ice_InvalidReplicaGroupIdException_init("::Ice::InvalidReplicaGroupIdException");
+
+}
+
+Ice::InvalidReplicaGroupIdException::~InvalidReplicaGroupIdException() throw()
+{
+}
+
+::std::string
+Ice::InvalidReplicaGroupIdException::ice_id() const
+{
+    return "::Ice::InvalidReplicaGroupIdException";
+}
+
+Ice::InvalidReplicaGroupIdException*
+Ice::InvalidReplicaGroupIdException::ice_clone() const
+{
+    return new InvalidReplicaGroupIdException(*this);
 }
 
 void
-IceAsync::Ice::AMD_LocatorRegistry_setAdapterDirectProxy::ice_exception(const ::std::exception& ex)
+Ice::InvalidReplicaGroupIdException::ice_throw() const
 {
-    if(const ::Ice::AdapterAlreadyActiveException* __ex = dynamic_cast<const ::Ice::AdapterAlreadyActiveException*>(&ex))
-    {
-        if(__validateResponse(false))
-        {
-            __writeUserException(*__ex, ::Ice::DefaultFormat);
-            __response();
-        }
-    }
-    else if(const ::Ice::AdapterNotFoundException* __ex = dynamic_cast<const ::Ice::AdapterNotFoundException*>(&ex))
-    {
-        if(__validateResponse(false))
-        {
-            __writeUserException(*__ex, ::Ice::DefaultFormat);
-            __response();
-        }
-    }
-    else
-    {
-        ::IceInternal::IncomingAsync::ice_exception(ex);
-    }
+    throw *this;
 }
 
-IceAsync::Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxy::AMD_LocatorRegistry_setReplicatedAdapterDirectProxy(::IceInternal::Incoming& in) :
-    ::IceInternal::IncomingAsync(in)
+/// \cond STREAM
+void
+Ice::InvalidReplicaGroupIdException::_writeImpl(OutputStream* ostr) const
 {
+    ostr->startSlice("::Ice::InvalidReplicaGroupIdException", -1, true);
+    StreamWriter< InvalidReplicaGroupIdException, OutputStream>::write(ostr, *this);
+    ostr->endSlice();
 }
 
 void
-IceAsync::Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxy::ice_response()
+Ice::InvalidReplicaGroupIdException::_readImpl(InputStream* istr)
 {
-    if(__validateResponse(true))
-    {
-        __writeEmptyParams();
-        __response();
-    }
+    istr->startSlice();
+    StreamReader< InvalidReplicaGroupIdException, InputStream>::read(istr, *this);
+    istr->endSlice();
+}
+/// \endcond
+
+namespace
+{
+
+const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::AdapterAlreadyActiveException> iceC_Ice_AdapterAlreadyActiveException_init("::Ice::AdapterAlreadyActiveException");
+
+}
+
+Ice::AdapterAlreadyActiveException::~AdapterAlreadyActiveException() throw()
+{
+}
+
+::std::string
+Ice::AdapterAlreadyActiveException::ice_id() const
+{
+    return "::Ice::AdapterAlreadyActiveException";
+}
+
+Ice::AdapterAlreadyActiveException*
+Ice::AdapterAlreadyActiveException::ice_clone() const
+{
+    return new AdapterAlreadyActiveException(*this);
 }
 
 void
-IceAsync::Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxy::ice_exception(const ::std::exception& ex)
+Ice::AdapterAlreadyActiveException::ice_throw() const
 {
-    if(const ::Ice::AdapterAlreadyActiveException* __ex = dynamic_cast<const ::Ice::AdapterAlreadyActiveException*>(&ex))
-    {
-        if(__validateResponse(false))
-        {
-            __writeUserException(*__ex, ::Ice::DefaultFormat);
-            __response();
-        }
-    }
-    else if(const ::Ice::AdapterNotFoundException* __ex = dynamic_cast<const ::Ice::AdapterNotFoundException*>(&ex))
-    {
-        if(__validateResponse(false))
-        {
-            __writeUserException(*__ex, ::Ice::DefaultFormat);
-            __response();
-        }
-    }
-    else if(const ::Ice::InvalidReplicaGroupIdException* __ex = dynamic_cast<const ::Ice::InvalidReplicaGroupIdException*>(&ex))
-    {
-        if(__validateResponse(false))
-        {
-            __writeUserException(*__ex, ::Ice::DefaultFormat);
-            __response();
-        }
-    }
-    else
-    {
-        ::IceInternal::IncomingAsync::ice_exception(ex);
-    }
+    throw *this;
 }
 
-IceAsync::Ice::AMD_LocatorRegistry_setServerProcessProxy::AMD_LocatorRegistry_setServerProcessProxy(::IceInternal::Incoming& in) :
-    ::IceInternal::IncomingAsync(in)
+/// \cond STREAM
+void
+Ice::AdapterAlreadyActiveException::_writeImpl(OutputStream* ostr) const
 {
+    ostr->startSlice("::Ice::AdapterAlreadyActiveException", -1, true);
+    StreamWriter< AdapterAlreadyActiveException, OutputStream>::write(ostr, *this);
+    ostr->endSlice();
 }
 
 void
-IceAsync::Ice::AMD_LocatorRegistry_setServerProcessProxy::ice_response()
+Ice::AdapterAlreadyActiveException::_readImpl(InputStream* istr)
+{
+    istr->startSlice();
+    StreamReader< AdapterAlreadyActiveException, InputStream>::read(istr, *this);
+    istr->endSlice();
+}
+/// \endcond
+
+namespace
+{
+
+const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::ObjectNotFoundException> iceC_Ice_ObjectNotFoundException_init("::Ice::ObjectNotFoundException");
+
+}
+
+Ice::ObjectNotFoundException::~ObjectNotFoundException() throw()
 {
-    if(__validateResponse(true))
-    {
-        __writeEmptyParams();
-        __response();
-    }
+}
+
+::std::string
+Ice::ObjectNotFoundException::ice_id() const
+{
+    return "::Ice::ObjectNotFoundException";
+}
+
+Ice::ObjectNotFoundException*
+Ice::ObjectNotFoundException::ice_clone() const
+{
+    return new ObjectNotFoundException(*this);
 }
 
 void
-IceAsync::Ice::AMD_LocatorRegistry_setServerProcessProxy::ice_exception(const ::std::exception& ex)
+Ice::ObjectNotFoundException::ice_throw() const
 {
-    if(const ::Ice::ServerNotFoundException* __ex = dynamic_cast<const ::Ice::ServerNotFoundException*>(&ex))
-    {
-        if(__validateResponse(false))
-        {
-            __writeUserException(*__ex, ::Ice::DefaultFormat);
-            __response();
-        }
-    }
-    else
-    {
-        ::IceInternal::IncomingAsync::ice_exception(ex);
-    }
+    throw *this;
 }
-#ifdef __SUNPRO_CC
-class ICE_API IceProxy::Ice::Locator;
-#endif
-ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::Locator* p) { return p; }
 
+/// \cond STREAM
 void
-::IceProxy::Ice::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Locator>& v)
+Ice::ObjectNotFoundException::_writeImpl(OutputStream* ostr) const
 {
-    ::Ice::ObjectPrx proxy;
-    __is->read(proxy);
-    if(!proxy)
-    {
-        v = 0;
-    }
-    else
-    {
-        v = new ::IceProxy::Ice::Locator;
-        v->__copyFrom(proxy);
-    }
+    ostr->startSlice("::Ice::ObjectNotFoundException", -1, true);
+    StreamWriter< ObjectNotFoundException, OutputStream>::write(ostr, *this);
+    ostr->endSlice();
 }
 
-::Ice::ObjectPrx
-IceProxy::Ice::Locator::findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Context* __ctx)
+void
+Ice::ObjectNotFoundException::_readImpl(InputStream* istr)
 {
-    __checkTwowayOnly(__Ice__Locator__findObjectById_name);
-    ::IceInternal::Outgoing __og(this, __Ice__Locator__findObjectById_name, ::Ice::Nonmutating, __ctx);
-    try
-    {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_id);
-        __og.endWriteParams();
-    }
-    catch(const ::Ice::LocalException& __ex)
-    {
-        __og.abort(__ex);
-    }
-    if(!__og.invoke())
-    {
-        try
-        {
-            __og.throwUserException();
-        }
-        catch(const ::Ice::ObjectNotFoundException&)
-        {
-            throw;
-        }
-        catch(const ::Ice::UserException& __ex)
-        {
-            ::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());
-            throw __uue;
-        }
-    }
-    ::Ice::ObjectPrx __ret;
-    ::IceInternal::BasicStream* __is = __og.startReadParams();
-    __is->read(__ret);
-    __og.endReadParams();
-    return __ret;
+    istr->startSlice();
+    StreamReader< ObjectNotFoundException, InputStream>::read(istr, *this);
+    istr->endSlice();
 }
+/// \endcond
 
-::Ice::AsyncResultPtr
-IceProxy::Ice::Locator::begin_findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+namespace
 {
-    __checkAsyncTwowayOnly(__Ice__Locator__findObjectById_name);
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__Locator__findObjectById_name, __del, __cookie);
-    try
-    {
-        __result->prepare(__Ice__Locator__findObjectById_name, ::Ice::Nonmutating, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_id);
-        __result->endWriteParams();
-        __result->invoke();
-    }
-    catch(const ::Ice::Exception& __ex)
-    {
-        __result->abort(__ex);
-    }
-    return __result;
+
+const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::ServerNotFoundException> iceC_Ice_ServerNotFoundException_init("::Ice::ServerNotFoundException");
+
 }
 
-#ifdef ICE_CPP11
+Ice::ServerNotFoundException::~ServerNotFoundException() throw()
+{
+}
 
-::Ice::AsyncResultPtr
-IceProxy::Ice::Locator::__begin_findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::ObjectPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+::std::string
+Ice::ServerNotFoundException::ice_id() const
 {
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
-    {
-    public:
+    return "::Ice::ServerNotFoundException";
+}
 
-        Cpp11CB(const ::std::function<void (const ::Ice::ObjectPrx&)>& responseFunc, const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc, const ::std::function<void (bool)>& sentFunc) :
-            ::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
-            _response(responseFunc)
-        {
-            CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
-        }
+Ice::ServerNotFoundException*
+Ice::ServerNotFoundException::ice_clone() const
+{
+    return new ServerNotFoundException(*this);
+}
 
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
-        {
-            ::Ice::LocatorPrx __proxy = ::Ice::LocatorPrx::uncheckedCast(__result->getProxy());
-            ::Ice::ObjectPrx __ret;
-            try
-            {
-                __ret = __proxy->end_findObjectById(__result);
-            }
-            catch(const ::Ice::Exception& ex)
-            {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
-            }
-            if(_response != nullptr)
-            {
-                _response(__ret);
-            }
-        }
-    
-    private:
-        
-        ::std::function<void (const ::Ice::ObjectPrx&)> _response;
-    };
-    return begin_findObjectById(__p_id, __ctx, new Cpp11CB(__response, __exception, __sent));
+void
+Ice::ServerNotFoundException::ice_throw() const
+{
+    throw *this;
 }
-#endif
 
-::Ice::ObjectPrx
-IceProxy::Ice::Locator::end_findObjectById(const ::Ice::AsyncResultPtr& __result)
+/// \cond STREAM
+void
+Ice::ServerNotFoundException::_writeImpl(OutputStream* ostr) const
 {
-    ::Ice::AsyncResult::__check(__result, this, __Ice__Locator__findObjectById_name);
-    ::Ice::ObjectPrx __ret;
-    if(!__result->__wait())
-    {
-        try
-        {
-            __result->__throwUserException();
-        }
-        catch(const ::Ice::ObjectNotFoundException&)
-        {
-            throw;
-        }
-        catch(const ::Ice::UserException& __ex)
-        {
-            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
-        }
-    }
-    ::IceInternal::BasicStream* __is = __result->__startReadParams();
-    __is->read(__ret);
-    __result->__endReadParams();
-    return __ret;
+    ostr->startSlice("::Ice::ServerNotFoundException", -1, true);
+    StreamWriter< ServerNotFoundException, OutputStream>::write(ostr, *this);
+    ostr->endSlice();
 }
 
-::Ice::ObjectPrx
-IceProxy::Ice::Locator::findAdapterById(const ::std::string& __p_id, const ::Ice::Context* __ctx)
+void
+Ice::ServerNotFoundException::_readImpl(InputStream* istr)
 {
-    __checkTwowayOnly(__Ice__Locator__findAdapterById_name);
-    ::IceInternal::Outgoing __og(this, __Ice__Locator__findAdapterById_name, ::Ice::Nonmutating, __ctx);
-    try
-    {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_id);
-        __og.endWriteParams();
-    }
-    catch(const ::Ice::LocalException& __ex)
-    {
-        __og.abort(__ex);
-    }
-    if(!__og.invoke())
-    {
-        try
-        {
-            __og.throwUserException();
-        }
-        catch(const ::Ice::AdapterNotFoundException&)
-        {
-            throw;
-        }
-        catch(const ::Ice::UserException& __ex)
-        {
-            ::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());
-            throw __uue;
-        }
-    }
-    ::Ice::ObjectPrx __ret;
-    ::IceInternal::BasicStream* __is = __og.startReadParams();
-    __is->read(__ret);
-    __og.endReadParams();
-    return __ret;
+    istr->startSlice();
+    StreamReader< ServerNotFoundException, InputStream>::read(istr, *this);
+    istr->endSlice();
 }
+/// \endcond
 
-::Ice::AsyncResultPtr
-IceProxy::Ice::Locator::begin_findAdapterById(const ::std::string& __p_id, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+Ice::AMD_Locator_findObjectById::~AMD_Locator_findObjectById()
 {
-    __checkAsyncTwowayOnly(__Ice__Locator__findAdapterById_name);
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__Locator__findAdapterById_name, __del, __cookie);
-    try
-    {
-        __result->prepare(__Ice__Locator__findAdapterById_name, ::Ice::Nonmutating, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_id);
-        __result->endWriteParams();
-        __result->invoke();
-    }
-    catch(const ::Ice::Exception& __ex)
-    {
-        __result->abort(__ex);
-    }
-    return __result;
 }
 
-#ifdef ICE_CPP11
+Ice::AMD_Locator_findAdapterById::~AMD_Locator_findAdapterById()
+{
+}
 
-::Ice::AsyncResultPtr
-IceProxy::Ice::Locator::__begin_findAdapterById(const ::std::string& __p_id, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::ObjectPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+Ice::AMD_LocatorRegistry_setAdapterDirectProxy::~AMD_LocatorRegistry_setAdapterDirectProxy()
 {
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
-    {
-    public:
+}
 
-        Cpp11CB(const ::std::function<void (const ::Ice::ObjectPrx&)>& responseFunc, const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc, const ::std::function<void (bool)>& sentFunc) :
-            ::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
-            _response(responseFunc)
-        {
-            CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
-        }
+Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxy::~AMD_LocatorRegistry_setReplicatedAdapterDirectProxy()
+{
+}
 
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
-        {
-            ::Ice::LocatorPrx __proxy = ::Ice::LocatorPrx::uncheckedCast(__result->getProxy());
-            ::Ice::ObjectPrx __ret;
-            try
-            {
-                __ret = __proxy->end_findAdapterById(__result);
-            }
-            catch(const ::Ice::Exception& ex)
-            {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
-            }
-            if(_response != nullptr)
-            {
-                _response(__ret);
-            }
-        }
-    
-    private:
-        
-        ::std::function<void (const ::Ice::ObjectPrx&)> _response;
-    };
-    return begin_findAdapterById(__p_id, __ctx, new Cpp11CB(__response, __exception, __sent));
+Ice::AMD_LocatorRegistry_setServerProcessProxy::~AMD_LocatorRegistry_setServerProcessProxy()
+{
 }
-#endif
 
-::Ice::ObjectPrx
-IceProxy::Ice::Locator::end_findAdapterById(const ::Ice::AsyncResultPtr& __result)
+/// \cond INTERNAL
+IceAsync::Ice::AMD_Locator_findObjectById::AMD_Locator_findObjectById(::IceInternal::Incoming& in) :
+    ::IceInternal::IncomingAsync(in)
 {
-    ::Ice::AsyncResult::__check(__result, this, __Ice__Locator__findAdapterById_name);
-    ::Ice::ObjectPrx __ret;
-    if(!__result->__wait())
-    {
-        try
-        {
-            __result->__throwUserException();
-        }
-        catch(const ::Ice::AdapterNotFoundException&)
-        {
-            throw;
-        }
-        catch(const ::Ice::UserException& __ex)
-        {
-            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
-        }
-    }
-    ::IceInternal::BasicStream* __is = __result->__startReadParams();
-    __is->read(__ret);
-    __result->__endReadParams();
-    return __ret;
 }
 
-::Ice::LocatorRegistryPrx
-IceProxy::Ice::Locator::getRegistry(const ::Ice::Context* __ctx)
+void
+IceAsync::Ice::AMD_Locator_findObjectById::ice_response(const ::Ice::ObjectPrx& ret)
 {
-    __checkTwowayOnly(__Ice__Locator__getRegistry_name);
-    ::IceInternal::Outgoing __og(this, __Ice__Locator__getRegistry_name, ::Ice::Nonmutating, __ctx);
-    __og.writeEmptyParams();
-    if(!__og.invoke())
-    {
-        try
-        {
-            __og.throwUserException();
-        }
-        catch(const ::Ice::UserException& __ex)
-        {
-            ::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());
-            throw __uue;
-        }
-    }
-    ::Ice::LocatorRegistryPrx __ret;
-    ::IceInternal::BasicStream* __is = __og.startReadParams();
-    __is->read(__ret);
-    __og.endReadParams();
-    return __ret;
+    ::Ice::OutputStream* ostr = startWriteParams();
+    ostr->write(ret);
+    endWriteParams();
+    completed();
 }
+/// \endcond
 
-::Ice::AsyncResultPtr
-IceProxy::Ice::Locator::begin_getRegistry(const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+/// \cond INTERNAL
+IceAsync::Ice::AMD_Locator_findAdapterById::AMD_Locator_findAdapterById(::IceInternal::Incoming& in) :
+    ::IceInternal::IncomingAsync(in)
 {
-    __checkAsyncTwowayOnly(__Ice__Locator__getRegistry_name);
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__Locator__getRegistry_name, __del, __cookie);
-    try
-    {
-        __result->prepare(__Ice__Locator__getRegistry_name, ::Ice::Nonmutating, __ctx);
-        __result->writeEmptyParams();
-        __result->invoke();
-    }
-    catch(const ::Ice::Exception& __ex)
-    {
-        __result->abort(__ex);
-    }
-    return __result;
 }
 
-#ifdef ICE_CPP11
+void
+IceAsync::Ice::AMD_Locator_findAdapterById::ice_response(const ::Ice::ObjectPrx& ret)
+{
+    ::Ice::OutputStream* ostr = startWriteParams();
+    ostr->write(ret);
+    endWriteParams();
+    completed();
+}
+/// \endcond
 
-::Ice::AsyncResultPtr
-IceProxy::Ice::Locator::__begin_getRegistry(const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::LocatorRegistryPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+/// \cond INTERNAL
+IceAsync::Ice::AMD_LocatorRegistry_setAdapterDirectProxy::AMD_LocatorRegistry_setAdapterDirectProxy(::IceInternal::Incoming& in) :
+    ::IceInternal::IncomingAsync(in)
 {
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
-    {
-    public:
+}
 
-        Cpp11CB(const ::std::function<void (const ::Ice::LocatorRegistryPrx&)>& responseFunc, const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc, const ::std::function<void (bool)>& sentFunc) :
-            ::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
-            _response(responseFunc)
-        {
-            CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
-        }
+void
+IceAsync::Ice::AMD_LocatorRegistry_setAdapterDirectProxy::ice_response()
+{
+    writeEmptyParams();
+    completed();
+}
+/// \endcond
 
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
-        {
-            ::Ice::LocatorPrx __proxy = ::Ice::LocatorPrx::uncheckedCast(__result->getProxy());
-            ::Ice::LocatorRegistryPrx __ret;
-            try
-            {
-                __ret = __proxy->end_getRegistry(__result);
-            }
-            catch(const ::Ice::Exception& ex)
-            {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
-            }
-            if(_response != nullptr)
-            {
-                _response(__ret);
-            }
-        }
-    
-    private:
-        
-        ::std::function<void (const ::Ice::LocatorRegistryPrx&)> _response;
-    };
-    return begin_getRegistry(__ctx, new Cpp11CB(__response, __exception, __sent));
+/// \cond INTERNAL
+IceAsync::Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxy::AMD_LocatorRegistry_setReplicatedAdapterDirectProxy(::IceInternal::Incoming& in) :
+    ::IceInternal::IncomingAsync(in)
+{
 }
-#endif
 
-::Ice::LocatorRegistryPrx
-IceProxy::Ice::Locator::end_getRegistry(const ::Ice::AsyncResultPtr& __result)
+void
+IceAsync::Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxy::ice_response()
 {
-    ::Ice::AsyncResult::__check(__result, this, __Ice__Locator__getRegistry_name);
-    ::Ice::LocatorRegistryPrx __ret;
-    if(!__result->__wait())
-    {
-        try
-        {
-            __result->__throwUserException();
-        }
-        catch(const ::Ice::UserException& __ex)
-        {
-            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
-        }
-    }
-    ::IceInternal::BasicStream* __is = __result->__startReadParams();
-    __is->read(__ret);
-    __result->__endReadParams();
-    return __ret;
+    writeEmptyParams();
+    completed();
 }
+/// \endcond
 
-const ::std::string&
-IceProxy::Ice::Locator::ice_staticId()
+/// \cond INTERNAL
+IceAsync::Ice::AMD_LocatorRegistry_setServerProcessProxy::AMD_LocatorRegistry_setServerProcessProxy(::IceInternal::Incoming& in) :
+    ::IceInternal::IncomingAsync(in)
 {
-    return ::Ice::Locator::ice_staticId();
 }
 
-::IceProxy::Ice::Object*
-IceProxy::Ice::Locator::__newInstance() const
+void
+IceAsync::Ice::AMD_LocatorRegistry_setServerProcessProxy::ice_response()
 {
-    return new Locator;
+    writeEmptyParams();
+    completed();
 }
-#ifdef __SUNPRO_CC
-class ICE_API IceProxy::Ice::LocatorRegistry;
-#endif
-ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::LocatorRegistry* p) { return p; }
+/// \endcond
+
+/// \cond INTERNAL
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(Locator* p) { return p; }
 
 void
-::IceProxy::Ice::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::Ice::LocatorRegistry>& v)
+::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< Locator>& v)
 {
     ::Ice::ObjectPrx proxy;
-    __is->read(proxy);
+    istr->read(proxy);
     if(!proxy)
     {
         v = 0;
     }
     else
     {
-        v = new ::IceProxy::Ice::LocatorRegistry;
-        v->__copyFrom(proxy);
+        v = new Locator;
+        v->_copyFrom(proxy);
     }
 }
+/// \endcond
 
-void
-IceProxy::Ice::LocatorRegistry::setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Context* __ctx)
+::Ice::AsyncResultPtr
+IceProxy::Ice::Locator::_iceI_begin_findObjectById(const ::Ice::Identity& iceP_id, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
-    __checkTwowayOnly(__Ice__LocatorRegistry__setAdapterDirectProxy_name);
-    ::IceInternal::Outgoing __og(this, __Ice__LocatorRegistry__setAdapterDirectProxy_name, ::Ice::Idempotent, __ctx);
+    _checkTwowayOnly(iceC_Ice_Locator_findObjectById_name, sync);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_Locator_findObjectById_name, del, cookie, sync);
     try
     {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_id);
-        __os->write(__p_proxy);
-        __og.endWriteParams();
+        result->prepare(iceC_Ice_Locator_findObjectById_name, ::Ice::Nonmutating, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_id);
+        result->endWriteParams();
+        result->invoke(iceC_Ice_Locator_findObjectById_name);
     }
-    catch(const ::Ice::LocalException& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __og.abort(__ex);
+        result->abort(ex);
     }
-    if(!__og.invoke())
+    return result;
+}
+
+::Ice::ObjectPrx
+IceProxy::Ice::Locator::end_findObjectById(const ::Ice::AsyncResultPtr& result)
+{
+    ::Ice::AsyncResult::_check(result, this, iceC_Ice_Locator_findObjectById_name);
+    ::Ice::ObjectPrx ret;
+    if(!result->_waitForResponse())
     {
         try
         {
-            __og.throwUserException();
-        }
-        catch(const ::Ice::AdapterAlreadyActiveException&)
-        {
-            throw;
+            result->_throwUserException();
         }
-        catch(const ::Ice::AdapterNotFoundException&)
+        catch(const ::Ice::ObjectNotFoundException&)
         {
             throw;
         }
-        catch(const ::Ice::UserException& __ex)
+        catch(const ::Ice::UserException& ex)
         {
-            ::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());
-            throw __uue;
+            throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
         }
     }
+    ::Ice::InputStream* istr = result->_startReadParams();
+    istr->read(ret);
+    result->_endReadParams();
+    return ret;
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LocatorRegistry::begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::Locator::_iceI_begin_findAdapterById(const ::std::string& iceP_id, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
-    __checkAsyncTwowayOnly(__Ice__LocatorRegistry__setAdapterDirectProxy_name);
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__LocatorRegistry__setAdapterDirectProxy_name, __del, __cookie);
+    _checkTwowayOnly(iceC_Ice_Locator_findAdapterById_name, sync);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_Locator_findAdapterById_name, del, cookie, sync);
     try
     {
-        __result->prepare(__Ice__LocatorRegistry__setAdapterDirectProxy_name, ::Ice::Idempotent, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_id);
-        __os->write(__p_proxy);
-        __result->endWriteParams();
-        __result->invoke();
+        result->prepare(iceC_Ice_Locator_findAdapterById_name, ::Ice::Nonmutating, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_id);
+        result->endWriteParams();
+        result->invoke(iceC_Ice_Locator_findAdapterById_name);
     }
-    catch(const ::Ice::Exception& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __result->abort(__ex);
+        result->abort(ex);
     }
-    return __result;
-}
-
-#ifdef ICE_CPP11
-
-::Ice::AsyncResultPtr
-IceProxy::Ice::LocatorRegistry::__begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Context* __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
-{
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
-    {
-    public:
-
-        Cpp11CB(const ::std::function<void ()>& responseFunc, const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc, const ::std::function<void (bool)>& sentFunc) :
-            ::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
-            _response(responseFunc)
-        {
-            CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
-        }
-
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
-        {
-            ::Ice::LocatorRegistryPrx __proxy = ::Ice::LocatorRegistryPrx::uncheckedCast(__result->getProxy());
-            try
-            {
-                __proxy->end_setAdapterDirectProxy(__result);
-            }
-            catch(const ::Ice::Exception& ex)
-            {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
-            }
-            if(_response != nullptr)
-            {
-                _response();
-            }
-        }
-    
-    private:
-        
-        ::std::function<void ()> _response;
-    };
-    return begin_setAdapterDirectProxy(__p_id, __p_proxy, __ctx, new Cpp11CB(__response, __exception, __sent));
+    return result;
 }
-#endif
 
-void
-IceProxy::Ice::LocatorRegistry::end_setAdapterDirectProxy(const ::Ice::AsyncResultPtr& __result)
+::Ice::ObjectPrx
+IceProxy::Ice::Locator::end_findAdapterById(const ::Ice::AsyncResultPtr& result)
 {
-    ::Ice::AsyncResult::__check(__result, this, __Ice__LocatorRegistry__setAdapterDirectProxy_name);
-    if(!__result->__wait())
+    ::Ice::AsyncResult::_check(result, this, iceC_Ice_Locator_findAdapterById_name);
+    ::Ice::ObjectPrx ret;
+    if(!result->_waitForResponse())
     {
         try
         {
-            __result->__throwUserException();
-        }
-        catch(const ::Ice::AdapterAlreadyActiveException&)
-        {
-            throw;
+            result->_throwUserException();
         }
         catch(const ::Ice::AdapterNotFoundException&)
         {
             throw;
         }
-        catch(const ::Ice::UserException& __ex)
+        catch(const ::Ice::UserException& ex)
         {
-            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
+            throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
         }
     }
-    __result->__readEmptyParams();
+    ::Ice::InputStream* istr = result->_startReadParams();
+    istr->read(ret);
+    result->_endReadParams();
+    return ret;
 }
 
-void
-IceProxy::Ice::LocatorRegistry::setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::Context* __ctx)
+::Ice::AsyncResultPtr
+IceProxy::Ice::Locator::_iceI_begin_getRegistry(const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
-    __checkTwowayOnly(__Ice__LocatorRegistry__setReplicatedAdapterDirectProxy_name);
-    ::IceInternal::Outgoing __og(this, __Ice__LocatorRegistry__setReplicatedAdapterDirectProxy_name, ::Ice::Idempotent, __ctx);
+    _checkTwowayOnly(iceC_Ice_Locator_getRegistry_name, sync);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_Locator_getRegistry_name, del, cookie, sync);
     try
     {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_adapterId);
-        __os->write(__p_replicaGroupId);
-        __os->write(__p_p);
-        __og.endWriteParams();
+        result->prepare(iceC_Ice_Locator_getRegistry_name, ::Ice::Nonmutating, context);
+        result->writeEmptyParams();
+        result->invoke(iceC_Ice_Locator_getRegistry_name);
     }
-    catch(const ::Ice::LocalException& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __og.abort(__ex);
+        result->abort(ex);
     }
-    if(!__og.invoke())
+    return result;
+}
+
+::Ice::LocatorRegistryPrx
+IceProxy::Ice::Locator::end_getRegistry(const ::Ice::AsyncResultPtr& result)
+{
+    ::Ice::AsyncResult::_check(result, this, iceC_Ice_Locator_getRegistry_name);
+    ::Ice::LocatorRegistryPrx ret;
+    if(!result->_waitForResponse())
     {
         try
         {
-            __og.throwUserException();
-        }
-        catch(const ::Ice::AdapterAlreadyActiveException&)
-        {
-            throw;
-        }
-        catch(const ::Ice::AdapterNotFoundException&)
-        {
-            throw;
-        }
-        catch(const ::Ice::InvalidReplicaGroupIdException&)
-        {
-            throw;
+            result->_throwUserException();
         }
-        catch(const ::Ice::UserException& __ex)
+        catch(const ::Ice::UserException& ex)
         {
-            ::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());
-            throw __uue;
+            throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
         }
     }
+    ::Ice::InputStream* istr = result->_startReadParams();
+    istr->read(ret);
+    result->_endReadParams();
+    return ret;
 }
 
-::Ice::AsyncResultPtr
-IceProxy::Ice::LocatorRegistry::begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+/// \cond INTERNAL
+::IceProxy::Ice::Object*
+IceProxy::Ice::Locator::_newInstance() const
 {
-    __checkAsyncTwowayOnly(__Ice__LocatorRegistry__setReplicatedAdapterDirectProxy_name);
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__LocatorRegistry__setReplicatedAdapterDirectProxy_name, __del, __cookie);
-    try
+    return new Locator;
+}
+/// \endcond
+
+const ::std::string&
+IceProxy::Ice::Locator::ice_staticId()
+{
+    return ::Ice::Locator::ice_staticId();
+}
+
+/// \cond INTERNAL
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(LocatorRegistry* p) { return p; }
+
+void
+::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< LocatorRegistry>& v)
+{
+    ::Ice::ObjectPrx proxy;
+    istr->read(proxy);
+    if(!proxy)
     {
-        __result->prepare(__Ice__LocatorRegistry__setReplicatedAdapterDirectProxy_name, ::Ice::Idempotent, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_adapterId);
-        __os->write(__p_replicaGroupId);
-        __os->write(__p_p);
-        __result->endWriteParams();
-        __result->invoke();
+        v = 0;
     }
-    catch(const ::Ice::Exception& __ex)
+    else
     {
-        __result->abort(__ex);
+        v = new LocatorRegistry;
+        v->_copyFrom(proxy);
     }
-    return __result;
 }
-
-#ifdef ICE_CPP11
+/// \endcond
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LocatorRegistry::__begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::Context* __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+IceProxy::Ice::LocatorRegistry::_iceI_begin_setAdapterDirectProxy(const ::std::string& iceP_id, const ::Ice::ObjectPrx& iceP_proxy, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
+    _checkTwowayOnly(iceC_Ice_LocatorRegistry_setAdapterDirectProxy_name, sync);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_LocatorRegistry_setAdapterDirectProxy_name, del, cookie, sync);
+    try
     {
-    public:
-
-        Cpp11CB(const ::std::function<void ()>& responseFunc, const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc, const ::std::function<void (bool)>& sentFunc) :
-            ::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
-            _response(responseFunc)
-        {
-            CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
-        }
-
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
-        {
-            ::Ice::LocatorRegistryPrx __proxy = ::Ice::LocatorRegistryPrx::uncheckedCast(__result->getProxy());
-            try
-            {
-                __proxy->end_setReplicatedAdapterDirectProxy(__result);
-            }
-            catch(const ::Ice::Exception& ex)
-            {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
-            }
-            if(_response != nullptr)
-            {
-                _response();
-            }
-        }
-    
-    private:
-        
-        ::std::function<void ()> _response;
-    };
-    return begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, __ctx, new Cpp11CB(__response, __exception, __sent));
+        result->prepare(iceC_Ice_LocatorRegistry_setAdapterDirectProxy_name, ::Ice::Idempotent, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_id);
+        ostr->write(iceP_proxy);
+        result->endWriteParams();
+        result->invoke(iceC_Ice_LocatorRegistry_setAdapterDirectProxy_name);
+    }
+    catch(const ::Ice::Exception& ex)
+    {
+        result->abort(ex);
+    }
+    return result;
 }
-#endif
 
 void
-IceProxy::Ice::LocatorRegistry::end_setReplicatedAdapterDirectProxy(const ::Ice::AsyncResultPtr& __result)
+IceProxy::Ice::LocatorRegistry::end_setAdapterDirectProxy(const ::Ice::AsyncResultPtr& result)
 {
-    ::Ice::AsyncResult::__check(__result, this, __Ice__LocatorRegistry__setReplicatedAdapterDirectProxy_name);
-    if(!__result->__wait())
+    ::Ice::AsyncResult::_check(result, this, iceC_Ice_LocatorRegistry_setAdapterDirectProxy_name);
+    if(!result->_waitForResponse())
     {
         try
         {
-            __result->__throwUserException();
+            result->_throwUserException();
         }
         catch(const ::Ice::AdapterAlreadyActiveException&)
         {
@@ -1151,136 +1292,116 @@ IceProxy::Ice::LocatorRegistry::end_setReplicatedAdapterDirectProxy(const ::Ice:
         {
             throw;
         }
-        catch(const ::Ice::InvalidReplicaGroupIdException&)
-        {
-            throw;
-        }
-        catch(const ::Ice::UserException& __ex)
+        catch(const ::Ice::UserException& ex)
         {
-            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
+            throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
         }
     }
-    __result->__readEmptyParams();
+    result->_readEmptyParams();
 }
 
-void
-IceProxy::Ice::LocatorRegistry::setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Context* __ctx)
+::Ice::AsyncResultPtr
+IceProxy::Ice::LocatorRegistry::_iceI_begin_setReplicatedAdapterDirectProxy(const ::std::string& iceP_adapterId, const ::std::string& iceP_replicaGroupId, const ::Ice::ObjectPrx& iceP_p, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
-    __checkTwowayOnly(__Ice__LocatorRegistry__setServerProcessProxy_name);
-    ::IceInternal::Outgoing __og(this, __Ice__LocatorRegistry__setServerProcessProxy_name, ::Ice::Idempotent, __ctx);
+    _checkTwowayOnly(iceC_Ice_LocatorRegistry_setReplicatedAdapterDirectProxy_name, sync);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_LocatorRegistry_setReplicatedAdapterDirectProxy_name, del, cookie, sync);
     try
     {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_id);
-        __os->write(__p_proxy);
-        __og.endWriteParams();
+        result->prepare(iceC_Ice_LocatorRegistry_setReplicatedAdapterDirectProxy_name, ::Ice::Idempotent, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_adapterId);
+        ostr->write(iceP_replicaGroupId);
+        ostr->write(iceP_p);
+        result->endWriteParams();
+        result->invoke(iceC_Ice_LocatorRegistry_setReplicatedAdapterDirectProxy_name);
     }
-    catch(const ::Ice::LocalException& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __og.abort(__ex);
+        result->abort(ex);
     }
-    if(!__og.invoke())
+    return result;
+}
+
+void
+IceProxy::Ice::LocatorRegistry::end_setReplicatedAdapterDirectProxy(const ::Ice::AsyncResultPtr& result)
+{
+    ::Ice::AsyncResult::_check(result, this, iceC_Ice_LocatorRegistry_setReplicatedAdapterDirectProxy_name);
+    if(!result->_waitForResponse())
     {
         try
         {
-            __og.throwUserException();
+            result->_throwUserException();
         }
-        catch(const ::Ice::ServerNotFoundException&)
+        catch(const ::Ice::AdapterAlreadyActiveException&)
+        {
+            throw;
+        }
+        catch(const ::Ice::AdapterNotFoundException&)
+        {
+            throw;
+        }
+        catch(const ::Ice::InvalidReplicaGroupIdException&)
         {
             throw;
         }
-        catch(const ::Ice::UserException& __ex)
+        catch(const ::Ice::UserException& ex)
         {
-            ::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());
-            throw __uue;
+            throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
         }
     }
+    result->_readEmptyParams();
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LocatorRegistry::begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::LocatorRegistry::_iceI_begin_setServerProcessProxy(const ::std::string& iceP_id, const ::Ice::ProcessPrx& iceP_proxy, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
-    __checkAsyncTwowayOnly(__Ice__LocatorRegistry__setServerProcessProxy_name);
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__LocatorRegistry__setServerProcessProxy_name, __del, __cookie);
+    _checkTwowayOnly(iceC_Ice_LocatorRegistry_setServerProcessProxy_name, sync);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_LocatorRegistry_setServerProcessProxy_name, del, cookie, sync);
     try
     {
-        __result->prepare(__Ice__LocatorRegistry__setServerProcessProxy_name, ::Ice::Idempotent, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_id);
-        __os->write(__p_proxy);
-        __result->endWriteParams();
-        __result->invoke();
+        result->prepare(iceC_Ice_LocatorRegistry_setServerProcessProxy_name, ::Ice::Idempotent, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_id);
+        ostr->write(iceP_proxy);
+        result->endWriteParams();
+        result->invoke(iceC_Ice_LocatorRegistry_setServerProcessProxy_name);
     }
-    catch(const ::Ice::Exception& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __result->abort(__ex);
+        result->abort(ex);
     }
-    return __result;
-}
-
-#ifdef ICE_CPP11
-
-::Ice::AsyncResultPtr
-IceProxy::Ice::LocatorRegistry::__begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Context* __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
-{
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
-    {
-    public:
-
-        Cpp11CB(const ::std::function<void ()>& responseFunc, const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc, const ::std::function<void (bool)>& sentFunc) :
-            ::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
-            _response(responseFunc)
-        {
-            CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
-        }
-
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
-        {
-            ::Ice::LocatorRegistryPrx __proxy = ::Ice::LocatorRegistryPrx::uncheckedCast(__result->getProxy());
-            try
-            {
-                __proxy->end_setServerProcessProxy(__result);
-            }
-            catch(const ::Ice::Exception& ex)
-            {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
-            }
-            if(_response != nullptr)
-            {
-                _response();
-            }
-        }
-    
-    private:
-        
-        ::std::function<void ()> _response;
-    };
-    return begin_setServerProcessProxy(__p_id, __p_proxy, __ctx, new Cpp11CB(__response, __exception, __sent));
+    return result;
 }
-#endif
 
 void
-IceProxy::Ice::LocatorRegistry::end_setServerProcessProxy(const ::Ice::AsyncResultPtr& __result)
+IceProxy::Ice::LocatorRegistry::end_setServerProcessProxy(const ::Ice::AsyncResultPtr& result)
 {
-    ::Ice::AsyncResult::__check(__result, this, __Ice__LocatorRegistry__setServerProcessProxy_name);
-    if(!__result->__wait())
+    ::Ice::AsyncResult::_check(result, this, iceC_Ice_LocatorRegistry_setServerProcessProxy_name);
+    if(!result->_waitForResponse())
     {
         try
         {
-            __result->__throwUserException();
+            result->_throwUserException();
         }
         catch(const ::Ice::ServerNotFoundException&)
         {
             throw;
         }
-        catch(const ::Ice::UserException& __ex)
+        catch(const ::Ice::UserException& ex)
         {
-            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
+            throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
         }
     }
-    __result->__readEmptyParams();
+    result->_readEmptyParams();
+}
+
+/// \cond INTERNAL
+::IceProxy::Ice::Object*
+IceProxy::Ice::LocatorRegistry::_newInstance() const
+{
+    return new LocatorRegistry;
 }
+/// \endcond
 
 const ::std::string&
 IceProxy::Ice::LocatorRegistry::ice_staticId()
@@ -1288,139 +1409,73 @@ IceProxy::Ice::LocatorRegistry::ice_staticId()
     return ::Ice::LocatorRegistry::ice_staticId();
 }
 
-::IceProxy::Ice::Object*
-IceProxy::Ice::LocatorRegistry::__newInstance() const
-{
-    return new LocatorRegistry;
-}
-#ifdef __SUNPRO_CC
-class ICE_API IceProxy::Ice::LocatorFinder;
-#endif
-ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::LocatorFinder* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(LocatorFinder* p) { return p; }
 
 void
-::IceProxy::Ice::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::Ice::LocatorFinder>& v)
+::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< LocatorFinder>& v)
 {
     ::Ice::ObjectPrx proxy;
-    __is->read(proxy);
+    istr->read(proxy);
     if(!proxy)
     {
         v = 0;
     }
     else
     {
-        v = new ::IceProxy::Ice::LocatorFinder;
-        v->__copyFrom(proxy);
-    }
-}
-
-::Ice::LocatorPrx
-IceProxy::Ice::LocatorFinder::getLocator(const ::Ice::Context* __ctx)
-{
-    __checkTwowayOnly(__Ice__LocatorFinder__getLocator_name);
-    ::IceInternal::Outgoing __og(this, __Ice__LocatorFinder__getLocator_name, ::Ice::Normal, __ctx);
-    __og.writeEmptyParams();
-    if(!__og.invoke())
-    {
-        try
-        {
-            __og.throwUserException();
-        }
-        catch(const ::Ice::UserException& __ex)
-        {
-            ::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());
-            throw __uue;
-        }
+        v = new LocatorFinder;
+        v->_copyFrom(proxy);
     }
-    ::Ice::LocatorPrx __ret;
-    ::IceInternal::BasicStream* __is = __og.startReadParams();
-    __is->read(__ret);
-    __og.endReadParams();
-    return __ret;
 }
+/// \endcond
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LocatorFinder::begin_getLocator(const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::LocatorFinder::_iceI_begin_getLocator(const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
-    __checkAsyncTwowayOnly(__Ice__LocatorFinder__getLocator_name);
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__LocatorFinder__getLocator_name, __del, __cookie);
+    _checkTwowayOnly(iceC_Ice_LocatorFinder_getLocator_name, sync);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_LocatorFinder_getLocator_name, del, cookie, sync);
     try
     {
-        __result->prepare(__Ice__LocatorFinder__getLocator_name, ::Ice::Normal, __ctx);
-        __result->writeEmptyParams();
-        __result->invoke();
+        result->prepare(iceC_Ice_LocatorFinder_getLocator_name, ::Ice::Normal, context);
+        result->writeEmptyParams();
+        result->invoke(iceC_Ice_LocatorFinder_getLocator_name);
     }
-    catch(const ::Ice::Exception& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __result->abort(__ex);
+        result->abort(ex);
     }
-    return __result;
-}
-
-#ifdef ICE_CPP11
-
-::Ice::AsyncResultPtr
-IceProxy::Ice::LocatorFinder::__begin_getLocator(const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::LocatorPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
-{
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
-    {
-    public:
-
-        Cpp11CB(const ::std::function<void (const ::Ice::LocatorPrx&)>& responseFunc, const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc, const ::std::function<void (bool)>& sentFunc) :
-            ::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
-            _response(responseFunc)
-        {
-            CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
-        }
-
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
-        {
-            ::Ice::LocatorFinderPrx __proxy = ::Ice::LocatorFinderPrx::uncheckedCast(__result->getProxy());
-            ::Ice::LocatorPrx __ret;
-            try
-            {
-                __ret = __proxy->end_getLocator(__result);
-            }
-            catch(const ::Ice::Exception& ex)
-            {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
-            }
-            if(_response != nullptr)
-            {
-                _response(__ret);
-            }
-        }
-    
-    private:
-        
-        ::std::function<void (const ::Ice::LocatorPrx&)> _response;
-    };
-    return begin_getLocator(__ctx, new Cpp11CB(__response, __exception, __sent));
+    return result;
 }
-#endif
 
 ::Ice::LocatorPrx
-IceProxy::Ice::LocatorFinder::end_getLocator(const ::Ice::AsyncResultPtr& __result)
+IceProxy::Ice::LocatorFinder::end_getLocator(const ::Ice::AsyncResultPtr& result)
 {
-    ::Ice::AsyncResult::__check(__result, this, __Ice__LocatorFinder__getLocator_name);
-    ::Ice::LocatorPrx __ret;
-    if(!__result->__wait())
+    ::Ice::AsyncResult::_check(result, this, iceC_Ice_LocatorFinder_getLocator_name);
+    ::Ice::LocatorPrx ret;
+    if(!result->_waitForResponse())
     {
         try
         {
-            __result->__throwUserException();
+            result->_throwUserException();
         }
-        catch(const ::Ice::UserException& __ex)
+        catch(const ::Ice::UserException& ex)
         {
-            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
+            throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
         }
     }
-    ::IceInternal::BasicStream* __is = __result->__startReadParams();
-    __is->read(__ret);
-    __result->__endReadParams();
-    return __ret;
+    ::Ice::InputStream* istr = result->_startReadParams();
+    istr->read(ret);
+    result->_endReadParams();
+    return ret;
+}
+
+/// \cond INTERNAL
+::IceProxy::Ice::Object*
+IceProxy::Ice::LocatorFinder::_newInstance() const
+{
+    return new LocatorFinder;
 }
+/// \endcond
 
 const ::std::string&
 IceProxy::Ice::LocatorFinder::ice_staticId()
@@ -1428,17 +1483,18 @@ IceProxy::Ice::LocatorFinder::ice_staticId()
     return ::Ice::LocatorFinder::ice_staticId();
 }
 
-::IceProxy::Ice::Object*
-IceProxy::Ice::LocatorFinder::__newInstance() const
+Ice::Locator::~Locator()
 {
-    return new LocatorFinder;
 }
 
-ICE_API ::Ice::Object* Ice::upCast(::Ice::Locator* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::Object* Ice::upCast(Locator* p) { return p; }
+
+/// \endcond
 
 namespace
 {
-const ::std::string __Ice__Locator_ids[2] =
+const ::std::string iceC_Ice_Locator_ids[2] =
 {
     "::Ice::Locator",
     "::Ice::Object"
@@ -1447,21 +1503,21 @@ const ::std::string __Ice__Locator_ids[2] =
 }
 
 bool
-Ice::Locator::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
+Ice::Locator::ice_isA(const ::std::string& s, const Current&) const
 {
-    return ::std::binary_search(__Ice__Locator_ids, __Ice__Locator_ids + 2, _s);
+    return ::std::binary_search(iceC_Ice_Locator_ids, iceC_Ice_Locator_ids + 2, s);
 }
 
 ::std::vector< ::std::string>
-Ice::Locator::ice_ids(const ::Ice::Current&) const
+Ice::Locator::ice_ids(const Current&) const
 {
-    return ::std::vector< ::std::string>(&__Ice__Locator_ids[0], &__Ice__Locator_ids[2]);
+    return ::std::vector< ::std::string>(&iceC_Ice_Locator_ids[0], &iceC_Ice_Locator_ids[2]);
 }
 
 const ::std::string&
-Ice::Locator::ice_id(const ::Ice::Current&) const
+Ice::Locator::ice_id(const Current&) const
 {
-    return __Ice__Locator_ids[0];
+    return ice_staticId();
 }
 
 const ::std::string&
@@ -1471,73 +1527,55 @@ Ice::Locator::ice_staticId()
     static const ::std::string typeId = "::Ice::Locator";
     return typeId;
 #else
-    return __Ice__Locator_ids[0];
+    return iceC_Ice_Locator_ids[0];
 #endif
 }
 
-::Ice::DispatchStatus
-Ice::Locator::___findObjectById(::IceInternal::Incoming& __inS, const ::Ice::Current& __current) const
+/// \cond INTERNAL
+bool
+Ice::Locator::_iceD_findObjectById(::IceInternal::Incoming& inS, const Current& current) const
 {
-    __checkMode(::Ice::Idempotent, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::Ice::Identity __p_id;
-    __is->read(__p_id);
-    __inS.endReadParams();
-    ::Ice::AMD_Locator_findObjectByIdPtr __cb = new IceAsync::Ice::AMD_Locator_findObjectById(__inS);
-    try
-    {
-        findObjectById_async(__cb, __p_id, __current);
-    }
-    catch(const ::std::exception& __ex)
-    {
-        __cb->ice_exception(__ex);
-    }
-    catch(...)
-    {
-        __cb->ice_exception();
-    }
-    return ::Ice::DispatchAsync;
+    _iceCheckMode(::Ice::Idempotent, current.mode);
+    InputStream* istr = inS.startReadParams();
+    Identity iceP_id;
+    istr->read(iceP_id);
+    inS.endReadParams();
+    this->findObjectById_async(new IceAsync::Ice::AMD_Locator_findObjectById(inS), iceP_id, current);
+    return false;
 }
+/// \endcond
 
-::Ice::DispatchStatus
-Ice::Locator::___findAdapterById(::IceInternal::Incoming& __inS, const ::Ice::Current& __current) const
+/// \cond INTERNAL
+bool
+Ice::Locator::_iceD_findAdapterById(::IceInternal::Incoming& inS, const Current& current) const
 {
-    __checkMode(::Ice::Idempotent, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string __p_id;
-    __is->read(__p_id);
-    __inS.endReadParams();
-    ::Ice::AMD_Locator_findAdapterByIdPtr __cb = new IceAsync::Ice::AMD_Locator_findAdapterById(__inS);
-    try
-    {
-        findAdapterById_async(__cb, __p_id, __current);
-    }
-    catch(const ::std::exception& __ex)
-    {
-        __cb->ice_exception(__ex);
-    }
-    catch(...)
-    {
-        __cb->ice_exception();
-    }
-    return ::Ice::DispatchAsync;
+    _iceCheckMode(::Ice::Idempotent, current.mode);
+    InputStream* istr = inS.startReadParams();
+    ::std::string iceP_id;
+    istr->read(iceP_id);
+    inS.endReadParams();
+    this->findAdapterById_async(new IceAsync::Ice::AMD_Locator_findAdapterById(inS), iceP_id, current);
+    return false;
 }
+/// \endcond
 
-::Ice::DispatchStatus
-Ice::Locator::___getRegistry(::IceInternal::Incoming& __inS, const ::Ice::Current& __current) const
+/// \cond INTERNAL
+bool
+Ice::Locator::_iceD_getRegistry(::IceInternal::Incoming& inS, const Current& current) const
 {
-    __checkMode(::Ice::Idempotent, __current.mode);
-    __inS.readEmptyParams();
-    ::Ice::LocatorRegistryPrx __ret = getRegistry(__current);
-    ::IceInternal::BasicStream* __os = __inS.__startWriteParams(::Ice::DefaultFormat);
-    __os->write(__ret);
-    __inS.__endWriteParams(true);
-    return ::Ice::DispatchOK;
+    _iceCheckMode(::Ice::Idempotent, current.mode);
+    inS.readEmptyParams();
+    LocatorRegistryPrx ret = this->getRegistry(current);
+    OutputStream* ostr = inS.startWriteParams();
+    ostr->write(ret);
+    inS.endWriteParams();
+    return true;
 }
+/// \endcond
 
 namespace
 {
-const ::std::string __Ice__Locator_all[] =
+const ::std::string iceC_Ice_Locator_all[] =
 {
     "findAdapterById",
     "findObjectById",
@@ -1550,80 +1588,97 @@ const ::std::string __Ice__Locator_all[] =
 
 }
 
-::Ice::DispatchStatus
-Ice::Locator::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+/// \cond INTERNAL
+bool
+Ice::Locator::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
-    ::std::pair< const ::std::string*, const ::std::string*> r = ::std::equal_range(__Ice__Locator_all, __Ice__Locator_all + 7, current.operation);
+    ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_Locator_all, iceC_Ice_Locator_all + 7, current.operation);
     if(r.first == r.second)
     {
-        throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
 
-    switch(r.first - __Ice__Locator_all)
+    switch(r.first - iceC_Ice_Locator_all)
     {
         case 0:
         {
-            return ___findAdapterById(in, current);
+            return _iceD_findAdapterById(in, current);
         }
         case 1:
         {
-            return ___findObjectById(in, current);
+            return _iceD_findObjectById(in, current);
         }
         case 2:
         {
-            return ___getRegistry(in, current);
+            return _iceD_getRegistry(in, current);
         }
         case 3:
         {
-            return ___ice_id(in, current);
+            return _iceD_ice_id(in, current);
         }
         case 4:
         {
-            return ___ice_ids(in, current);
+            return _iceD_ice_ids(in, current);
         }
         case 5:
         {
-            return ___ice_isA(in, current);
+            return _iceD_ice_isA(in, current);
         }
         case 6:
         {
-            return ___ice_ping(in, current);
+            return _iceD_ice_ping(in, current);
+        }
+        default:
+        {
+            assert(false);
+            throw 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
-Ice::Locator::__writeImpl(::IceInternal::BasicStream* __os) const
+Ice::Locator::_iceWriteImpl(OutputStream* ostr) const
 {
-    __os->startWriteSlice(ice_staticId(), -1, true);
-    __os->endWriteSlice();
+    ostr->startSlice(ice_staticId(), -1, true);
+    StreamWriter< Locator, OutputStream>::write(ostr, *this);
+    ostr->endSlice();
 }
 
 void
-Ice::Locator::__readImpl(::IceInternal::BasicStream* __is)
+Ice::Locator::_iceReadImpl(InputStream* istr)
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    istr->startSlice();
+    StreamReader< Locator, InputStream>::read(istr, *this);
+    istr->endSlice();
 }
+/// \endcond
 
-void ICE_API 
-Ice::__patch(LocatorPtr& handle, const ::Ice::ObjectPtr& v)
+/// \cond INTERNAL
+void
+Ice::_icePatchObjectPtr(LocatorPtr& handle, const ObjectPtr& v)
 {
-    handle = ::Ice::LocatorPtr::dynamicCast(v);
+    handle = LocatorPtr::dynamicCast(v);
     if(v && !handle)
     {
-        IceInternal::Ex::throwUOE(::Ice::Locator::ice_staticId(), v);
+        IceInternal::Ex::throwUOE(Locator::ice_staticId(), v);
     }
 }
+/// \endcond
+
+Ice::LocatorRegistry::~LocatorRegistry()
+{
+}
 
-ICE_API ::Ice::Object* Ice::upCast(::Ice::LocatorRegistry* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::Object* Ice::upCast(LocatorRegistry* p) { return p; }
+
+/// \endcond
 
 namespace
 {
-const ::std::string __Ice__LocatorRegistry_ids[2] =
+const ::std::string iceC_Ice_LocatorRegistry_ids[2] =
 {
     "::Ice::LocatorRegistry",
     "::Ice::Object"
@@ -1632,21 +1687,21 @@ const ::std::string __Ice__LocatorRegistry_ids[2] =
 }
 
 bool
-Ice::LocatorRegistry::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
+Ice::LocatorRegistry::ice_isA(const ::std::string& s, const Current&) const
 {
-    return ::std::binary_search(__Ice__LocatorRegistry_ids, __Ice__LocatorRegistry_ids + 2, _s);
+    return ::std::binary_search(iceC_Ice_LocatorRegistry_ids, iceC_Ice_LocatorRegistry_ids + 2, s);
 }
 
 ::std::vector< ::std::string>
-Ice::LocatorRegistry::ice_ids(const ::Ice::Current&) const
+Ice::LocatorRegistry::ice_ids(const Current&) const
 {
-    return ::std::vector< ::std::string>(&__Ice__LocatorRegistry_ids[0], &__Ice__LocatorRegistry_ids[2]);
+    return ::std::vector< ::std::string>(&iceC_Ice_LocatorRegistry_ids[0], &iceC_Ice_LocatorRegistry_ids[2]);
 }
 
 const ::std::string&
-Ice::LocatorRegistry::ice_id(const ::Ice::Current&) const
+Ice::LocatorRegistry::ice_id(const Current&) const
 {
-    return __Ice__LocatorRegistry_ids[0];
+    return ice_staticId();
 }
 
 const ::std::string&
@@ -1656,93 +1711,63 @@ Ice::LocatorRegistry::ice_staticId()
     static const ::std::string typeId = "::Ice::LocatorRegistry";
     return typeId;
 #else
-    return __Ice__LocatorRegistry_ids[0];
+    return iceC_Ice_LocatorRegistry_ids[0];
 #endif
 }
 
-::Ice::DispatchStatus
-Ice::LocatorRegistry::___setAdapterDirectProxy(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
+/// \cond INTERNAL
+bool
+Ice::LocatorRegistry::_iceD_setAdapterDirectProxy(::IceInternal::Incoming& inS, const Current& current)
 {
-    __checkMode(::Ice::Idempotent, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string __p_id;
-    ::Ice::ObjectPrx __p_proxy;
-    __is->read(__p_id);
-    __is->read(__p_proxy);
-    __inS.endReadParams();
-    ::Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr __cb = new IceAsync::Ice::AMD_LocatorRegistry_setAdapterDirectProxy(__inS);
-    try
-    {
-        setAdapterDirectProxy_async(__cb, __p_id, __p_proxy, __current);
-    }
-    catch(const ::std::exception& __ex)
-    {
-        __cb->ice_exception(__ex);
-    }
-    catch(...)
-    {
-        __cb->ice_exception();
-    }
-    return ::Ice::DispatchAsync;
-}
-
-::Ice::DispatchStatus
-Ice::LocatorRegistry::___setReplicatedAdapterDirectProxy(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
-    __checkMode(::Ice::Idempotent, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string __p_adapterId;
-    ::std::string __p_replicaGroupId;
-    ::Ice::ObjectPrx __p_p;
-    __is->read(__p_adapterId);
-    __is->read(__p_replicaGroupId);
-    __is->read(__p_p);
-    __inS.endReadParams();
-    ::Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxyPtr __cb = new IceAsync::Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxy(__inS);
-    try
-    {
-        setReplicatedAdapterDirectProxy_async(__cb, __p_adapterId, __p_replicaGroupId, __p_p, __current);
-    }
-    catch(const ::std::exception& __ex)
-    {
-        __cb->ice_exception(__ex);
-    }
-    catch(...)
-    {
-        __cb->ice_exception();
-    }
-    return ::Ice::DispatchAsync;
+    _iceCheckMode(::Ice::Idempotent, current.mode);
+    InputStream* istr = inS.startReadParams();
+    ::std::string iceP_id;
+    ObjectPrx iceP_proxy;
+    istr->read(iceP_id);
+    istr->read(iceP_proxy);
+    inS.endReadParams();
+    this->setAdapterDirectProxy_async(new IceAsync::Ice::AMD_LocatorRegistry_setAdapterDirectProxy(inS), iceP_id, iceP_proxy, current);
+    return false;
 }
+/// \endcond
 
-::Ice::DispatchStatus
-Ice::LocatorRegistry::___setServerProcessProxy(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
+/// \cond INTERNAL
+bool
+Ice::LocatorRegistry::_iceD_setReplicatedAdapterDirectProxy(::IceInternal::Incoming& inS, const Current& current)
+{
+    _iceCheckMode(::Ice::Idempotent, current.mode);
+    InputStream* istr = inS.startReadParams();
+    ::std::string iceP_adapterId;
+    ::std::string iceP_replicaGroupId;
+    ObjectPrx iceP_p;
+    istr->read(iceP_adapterId);
+    istr->read(iceP_replicaGroupId);
+    istr->read(iceP_p);
+    inS.endReadParams();
+    this->setReplicatedAdapterDirectProxy_async(new IceAsync::Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxy(inS), iceP_adapterId, iceP_replicaGroupId, iceP_p, current);
+    return false;
+}
+/// \endcond
+
+/// \cond INTERNAL
+bool
+Ice::LocatorRegistry::_iceD_setServerProcessProxy(::IceInternal::Incoming& inS, const Current& current)
 {
-    __checkMode(::Ice::Idempotent, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string __p_id;
-    ::Ice::ProcessPrx __p_proxy;
-    __is->read(__p_id);
-    __is->read(__p_proxy);
-    __inS.endReadParams();
-    ::Ice::AMD_LocatorRegistry_setServerProcessProxyPtr __cb = new IceAsync::Ice::AMD_LocatorRegistry_setServerProcessProxy(__inS);
-    try
-    {
-        setServerProcessProxy_async(__cb, __p_id, __p_proxy, __current);
-    }
-    catch(const ::std::exception& __ex)
-    {
-        __cb->ice_exception(__ex);
-    }
-    catch(...)
-    {
-        __cb->ice_exception();
-    }
-    return ::Ice::DispatchAsync;
+    _iceCheckMode(::Ice::Idempotent, current.mode);
+    InputStream* istr = inS.startReadParams();
+    ::std::string iceP_id;
+    ProcessPrx iceP_proxy;
+    istr->read(iceP_id);
+    istr->read(iceP_proxy);
+    inS.endReadParams();
+    this->setServerProcessProxy_async(new IceAsync::Ice::AMD_LocatorRegistry_setServerProcessProxy(inS), iceP_id, iceP_proxy, current);
+    return false;
 }
+/// \endcond
 
 namespace
 {
-const ::std::string __Ice__LocatorRegistry_all[] =
+const ::std::string iceC_Ice_LocatorRegistry_all[] =
 {
     "ice_id",
     "ice_ids",
@@ -1755,80 +1780,97 @@ const ::std::string __Ice__LocatorRegistry_all[] =
 
 }
 
-::Ice::DispatchStatus
-Ice::LocatorRegistry::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+/// \cond INTERNAL
+bool
+Ice::LocatorRegistry::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
-    ::std::pair< const ::std::string*, const ::std::string*> r = ::std::equal_range(__Ice__LocatorRegistry_all, __Ice__LocatorRegistry_all + 7, current.operation);
+    ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_LocatorRegistry_all, iceC_Ice_LocatorRegistry_all + 7, current.operation);
     if(r.first == r.second)
     {
-        throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
 
-    switch(r.first - __Ice__LocatorRegistry_all)
+    switch(r.first - iceC_Ice_LocatorRegistry_all)
     {
         case 0:
         {
-            return ___ice_id(in, current);
+            return _iceD_ice_id(in, current);
         }
         case 1:
         {
-            return ___ice_ids(in, current);
+            return _iceD_ice_ids(in, current);
         }
         case 2:
         {
-            return ___ice_isA(in, current);
+            return _iceD_ice_isA(in, current);
         }
         case 3:
         {
-            return ___ice_ping(in, current);
+            return _iceD_ice_ping(in, current);
         }
         case 4:
         {
-            return ___setAdapterDirectProxy(in, current);
+            return _iceD_setAdapterDirectProxy(in, current);
         }
         case 5:
         {
-            return ___setReplicatedAdapterDirectProxy(in, current);
+            return _iceD_setReplicatedAdapterDirectProxy(in, current);
         }
         case 6:
         {
-            return ___setServerProcessProxy(in, current);
+            return _iceD_setServerProcessProxy(in, current);
+        }
+        default:
+        {
+            assert(false);
+            throw 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
-Ice::LocatorRegistry::__writeImpl(::IceInternal::BasicStream* __os) const
+Ice::LocatorRegistry::_iceWriteImpl(OutputStream* ostr) const
 {
-    __os->startWriteSlice(ice_staticId(), -1, true);
-    __os->endWriteSlice();
+    ostr->startSlice(ice_staticId(), -1, true);
+    StreamWriter< LocatorRegistry, OutputStream>::write(ostr, *this);
+    ostr->endSlice();
 }
 
 void
-Ice::LocatorRegistry::__readImpl(::IceInternal::BasicStream* __is)
+Ice::LocatorRegistry::_iceReadImpl(InputStream* istr)
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    istr->startSlice();
+    StreamReader< LocatorRegistry, InputStream>::read(istr, *this);
+    istr->endSlice();
 }
+/// \endcond
 
-void ICE_API 
-Ice::__patch(LocatorRegistryPtr& handle, const ::Ice::ObjectPtr& v)
+/// \cond INTERNAL
+void
+Ice::_icePatchObjectPtr(LocatorRegistryPtr& handle, const ObjectPtr& v)
 {
-    handle = ::Ice::LocatorRegistryPtr::dynamicCast(v);
+    handle = LocatorRegistryPtr::dynamicCast(v);
     if(v && !handle)
     {
-        IceInternal::Ex::throwUOE(::Ice::LocatorRegistry::ice_staticId(), v);
+        IceInternal::Ex::throwUOE(LocatorRegistry::ice_staticId(), v);
     }
 }
+/// \endcond
 
-ICE_API ::Ice::Object* Ice::upCast(::Ice::LocatorFinder* p) { return p; }
+Ice::LocatorFinder::~LocatorFinder()
+{
+}
+
+/// \cond INTERNAL
+ICE_API ::Ice::Object* Ice::upCast(LocatorFinder* p) { return p; }
+
+/// \endcond
 
 namespace
 {
-const ::std::string __Ice__LocatorFinder_ids[2] =
+const ::std::string iceC_Ice_LocatorFinder_ids[2] =
 {
     "::Ice::LocatorFinder",
     "::Ice::Object"
@@ -1837,21 +1879,21 @@ const ::std::string __Ice__LocatorFinder_ids[2] =
 }
 
 bool
-Ice::LocatorFinder::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
+Ice::LocatorFinder::ice_isA(const ::std::string& s, const Current&) const
 {
-    return ::std::binary_search(__Ice__LocatorFinder_ids, __Ice__LocatorFinder_ids + 2, _s);
+    return ::std::binary_search(iceC_Ice_LocatorFinder_ids, iceC_Ice_LocatorFinder_ids + 2, s);
 }
 
 ::std::vector< ::std::string>
-Ice::LocatorFinder::ice_ids(const ::Ice::Current&) const
+Ice::LocatorFinder::ice_ids(const Current&) const
 {
-    return ::std::vector< ::std::string>(&__Ice__LocatorFinder_ids[0], &__Ice__LocatorFinder_ids[2]);
+    return ::std::vector< ::std::string>(&iceC_Ice_LocatorFinder_ids[0], &iceC_Ice_LocatorFinder_ids[2]);
 }
 
 const ::std::string&
-Ice::LocatorFinder::ice_id(const ::Ice::Current&) const
+Ice::LocatorFinder::ice_id(const Current&) const
 {
-    return __Ice__LocatorFinder_ids[0];
+    return ice_staticId();
 }
 
 const ::std::string&
@@ -1861,25 +1903,27 @@ Ice::LocatorFinder::ice_staticId()
     static const ::std::string typeId = "::Ice::LocatorFinder";
     return typeId;
 #else
-    return __Ice__LocatorFinder_ids[0];
+    return iceC_Ice_LocatorFinder_ids[0];
 #endif
 }
 
-::Ice::DispatchStatus
-Ice::LocatorFinder::___getLocator(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
+/// \cond INTERNAL
+bool
+Ice::LocatorFinder::_iceD_getLocator(::IceInternal::Incoming& inS, const Current& current)
 {
-    __checkMode(::Ice::Normal, __current.mode);
-    __inS.readEmptyParams();
-    ::Ice::LocatorPrx __ret = getLocator(__current);
-    ::IceInternal::BasicStream* __os = __inS.__startWriteParams(::Ice::DefaultFormat);
-    __os->write(__ret);
-    __inS.__endWriteParams(true);
-    return ::Ice::DispatchOK;
+    _iceCheckMode(::Ice::Normal, current.mode);
+    inS.readEmptyParams();
+    LocatorPrx ret = this->getLocator(current);
+    OutputStream* ostr = inS.startWriteParams();
+    ostr->write(ret);
+    inS.endWriteParams();
+    return true;
 }
+/// \endcond
 
 namespace
 {
-const ::std::string __Ice__LocatorFinder_all[] =
+const ::std::string iceC_Ice_LocatorFinder_all[] =
 {
     "getLocator",
     "ice_id",
@@ -1890,63 +1934,79 @@ const ::std::string __Ice__LocatorFinder_all[] =
 
 }
 
-::Ice::DispatchStatus
-Ice::LocatorFinder::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+/// \cond INTERNAL
+bool
+Ice::LocatorFinder::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
-    ::std::pair< const ::std::string*, const ::std::string*> r = ::std::equal_range(__Ice__LocatorFinder_all, __Ice__LocatorFinder_all + 5, current.operation);
+    ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_LocatorFinder_all, iceC_Ice_LocatorFinder_all + 5, current.operation);
     if(r.first == r.second)
     {
-        throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
 
-    switch(r.first - __Ice__LocatorFinder_all)
+    switch(r.first - iceC_Ice_LocatorFinder_all)
     {
         case 0:
         {
-            return ___getLocator(in, current);
+            return _iceD_getLocator(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 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
-Ice::LocatorFinder::__writeImpl(::IceInternal::BasicStream* __os) const
+Ice::LocatorFinder::_iceWriteImpl(OutputStream* ostr) const
 {
-    __os->startWriteSlice(ice_staticId(), -1, true);
-    __os->endWriteSlice();
+    ostr->startSlice(ice_staticId(), -1, true);
+    StreamWriter< LocatorFinder, OutputStream>::write(ostr, *this);
+    ostr->endSlice();
 }
 
 void
-Ice::LocatorFinder::__readImpl(::IceInternal::BasicStream* __is)
+Ice::LocatorFinder::_iceReadImpl(InputStream* istr)
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    istr->startSlice();
+    StreamReader< LocatorFinder, InputStream>::read(istr, *this);
+    istr->endSlice();
 }
+/// \endcond
 
-void ICE_API 
-Ice::__patch(LocatorFinderPtr& handle, const ::Ice::ObjectPtr& v)
+/// \cond INTERNAL
+void
+Ice::_icePatchObjectPtr(LocatorFinderPtr& handle, const ObjectPtr& v)
 {
-    handle = ::Ice::LocatorFinderPtr::dynamicCast(v);
+    handle = LocatorFinderPtr::dynamicCast(v);
     if(v && !handle)
     {
-        IceInternal::Ex::throwUOE(::Ice::LocatorFinder::ice_staticId(), v);
+        IceInternal::Ex::throwUOE(LocatorFinder::ice_staticId(), v);
     }
 }
+/// \endcond
+
+namespace Ice
+{
+}
+
+#endif