zeroc-ice 3.6.5 → 3.7.4

data/ext/ice/cpp/src/Ice/Plugin.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>
 //
@@ -23,27 +18,70 @@
 #endif
 #include <Ice/Plugin.h>
 #include <IceUtil/PushDisableWarnings.h>
-#include <Ice/BasicStream.h>
-#include <IceUtil/Iterator.h>
+#include <Ice/InputStream.h>
+#include <Ice/OutputStream.h>
 #include <IceUtil/PopDisableWarnings.h>
 
+#if defined(_MSC_VER)
+#   pragma warning(disable:4458) // declaration of ... hides class member
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 306
+#   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   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
 {
 
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::Plugin* p) { return p; }
+Ice::Plugin::~Plugin()
+{
+}
+
+Ice::PluginManager::~PluginManager()
+{
+}
+
+#else // C++98 mapping
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::PluginManager* p) { return p; }
+namespace
+{
+
+}
+
+Ice::Plugin::~Plugin()
+{
+}
+
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(Plugin* p) { return p; }
+/// \endcond
+
+Ice::PluginManager::~PluginManager()
+{
+}
+
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(PluginManager* p) { return p; }
+/// \endcond
+
+namespace Ice
+{
+}
+
+#endif

data/ext/ice/cpp/src/Ice/PluginF.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>
 //
@@ -23,22 +18,44 @@
 #endif
 #include <Ice/PluginF.h>
 #include <IceUtil/PushDisableWarnings.h>
-#include <IceUtil/Iterator.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
 {
 
 }
+
+#else // C++98 mapping
+
+namespace
+{
+
+}
+
+namespace Ice
+{
+}
+
+#endif

data/ext/ice/cpp/src/Ice/PluginManagerI.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 <IceUtil/Options.h>
 #include <Ice/PluginManagerI.h>
@@ -25,7 +20,7 @@ const char * const Ice::PluginManagerI::_kindOfObject = "plugin";
 namespace
 {
 
-map<string, PLUGIN_FACTORY>* factories = 0;
+map<string, PluginFactory>* factories = 0;
 vector<string>* loadOnInitialization = 0;
 
 class PluginFactoryDestroy
@@ -46,14 +41,14 @@ PluginFactoryDestroy destroy;
 }
 
 void
-Ice::PluginManagerI::registerPluginFactory(const std::string& name, PLUGIN_FACTORY factory, bool loadOnInit)
+Ice::PluginManagerI::registerPluginFactory(const std::string& name, PluginFactory factory, bool loadOnInit)
 {
     if(factories == 0)
     {
-        factories = new map<string, PLUGIN_FACTORY>();
+        factories = new map<string, PluginFactory>();
     }
 
-    map<string, PLUGIN_FACTORY>::const_iterator p = factories->find(name);
+    map<string, PluginFactory>::const_iterator p = factories->find(name);
     if(p == factories->end())
     {
         factories->insert(make_pair(name, factory));
@@ -73,9 +68,7 @@ Ice::PluginManagerI::initializePlugins()
 {
     if(_initialized)
     {
-        InitializationException ex(__FILE__, __LINE__);
-        ex.reason = "plug-ins already initialized";
-        throw ex;
+        throw InitializationException(__FILE__, __LINE__, "plug-ins already initialized");
     }
 
     //
@@ -133,7 +126,7 @@ Ice::PluginManagerI::initializePlugins()
 }
 
 StringSeq
-Ice::PluginManagerI::getPlugins()
+Ice::PluginManagerI::getPlugins() ICE_NOEXCEPT
 {
     IceUtil::Mutex::Lock sync(*this);
 
@@ -161,10 +154,7 @@ Ice::PluginManagerI::getPlugin(const string& name)
         return p;
     }
 
-    NotRegisteredException ex(__FILE__, __LINE__);
-    ex.kindOfObject = _kindOfObject;
-    ex.id = name;
-    throw ex;
+    throw NotRegisteredException(__FILE__, __LINE__, _kindOfObject, name);
 }
 
 void
@@ -179,10 +169,7 @@ Ice::PluginManagerI::addPlugin(const string& name, const PluginPtr& plugin)
 
     if(findPlugin(name))
     {
-        AlreadyRegisteredException ex(__FILE__, __LINE__);
-        ex.kindOfObject = _kindOfObject;
-        ex.id = name;
-        throw ex;
+        throw AlreadyRegisteredException(__FILE__, __LINE__, _kindOfObject, name);
     }
 
     PluginInfo info;
@@ -192,7 +179,7 @@ Ice::PluginManagerI::addPlugin(const string& name, const PluginPtr& plugin)
 }
 
 void
-Ice::PluginManagerI::destroy()
+Ice::PluginManagerI::destroy() ICE_NOEXCEPT
 {
     IceUtil::Mutex::Lock sync(*this);
 
@@ -249,7 +236,7 @@ Ice::PluginManagerI::PluginManagerI(const CommunicatorPtr& communicator, const D
 }
 
 void
-Ice::PluginManagerI::loadPlugins(int& argc, char* argv[])
+Ice::PluginManagerI::loadPlugins(int& argc, const char* argv[])
 {
     assert(_communicator);
 
@@ -311,9 +298,7 @@ Ice::PluginManagerI::loadPlugins(int& argc, char* argv[])
 
         if(findPlugin(name))
         {
-            PluginInitializationException ex(__FILE__, __LINE__);
-            ex.reason = "plug-in `" + name + "' already loaded";
-            throw ex;
+            throw PluginInitializationException(__FILE__, __LINE__, "plug-in `" + name + "' already loaded");
         }
 
         string property = prefix + name;
@@ -334,9 +319,7 @@ Ice::PluginManagerI::loadPlugins(int& argc, char* argv[])
         }
         else
         {
-            PluginInitializationException ex(__FILE__, __LINE__);
-            ex.reason = "plug-in `" + name + "' not defined";
-            throw ex;
+            throw PluginInitializationException(__FILE__, __LINE__, "plug-in `" + name + "' not defined");
         }
     }
 
@@ -417,9 +400,8 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St
         }
         catch(const IceUtilInternal::BadOptException& ex)
         {
-            PluginInitializationException e(__FILE__, __LINE__);
-            e.reason = "invalid arguments for plug-in `" + name + "':\n" + ex.reason;
-            throw e;
+            throw PluginInitializationException(__FILE__, __LINE__, "invalid arguments for plug-in `" + name + "':\n" +
+                                                ex.reason);
         }
 
         assert(!args.empty());
@@ -440,8 +422,7 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St
         cmdArgs = properties->parseCommandLineOptions(name, cmdArgs);
     }
 
-    PluginPtr plugin;
-    PLUGIN_FACTORY factory = 0;
+    PluginFactory factory = 0;
     DynamicLibraryPtr library;
 
     //
@@ -451,7 +432,7 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St
     //
     if(factories)
     {
-        map<string, PLUGIN_FACTORY>::const_iterator p = factories->find(name);
+        map<string, PluginFactory>::const_iterator p = factories->find(name);
         if(p != factories->end())
         {
             factory = p->second;
@@ -469,37 +450,32 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St
         DynamicLibrary::symbol_type sym = library->loadEntryPoint(entryPoint);
         if(sym == 0)
         {
-            ostringstream out;
+            ostringstream os;
             string msg = library->getErrorMessage();
-            out << "unable to load entry point `" << entryPoint << "'";
+            os << "unable to load entry point `" << entryPoint << "'";
             if(!msg.empty())
             {
-                out << ": " + msg;
+                os << ": " + msg;
             }
-            PluginInitializationException ex(__FILE__, __LINE__);
-            ex.reason = out.str();
-            throw ex;
+            throw PluginInitializationException(__FILE__, __LINE__, os.str());
         }
+
 #ifdef __IBMCPP__
-	// xlC warns when casting a void* to function pointer
-#pragma report(disable, "1540-0216")
+    // xlC warns when casting a void* to function pointer
+#   pragma report(disable, "1540-0216")
 #endif
 
-        factory = reinterpret_cast<PLUGIN_FACTORY>(sym);
+        factory = reinterpret_cast<PluginFactory>(sym);
     }
 
     //
     // Invoke the factory function. No exceptions can be raised
     // by the factory function because it's declared extern "C".
     //
-    plugin = factory(_communicator, name, args);
+    PluginPtr plugin(factory(_communicator, name, args));
     if(!plugin)
     {
-        PluginInitializationException e(__FILE__, __LINE__);
-        ostringstream out;
-        out << "failure in entry point `" << entryPoint << "'";
-        e.reason = out.str();
-        throw e;
+        throw PluginInitializationException(__FILE__, __LINE__, "failure in entry point `" + entryPoint + "'");
     }
 
     PluginInfo info;

data/ext/ice/cpp/src/Ice/PluginManagerI.h

@@ -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.
-//
-// **********************************************************************
 
 #ifndef ICE_PLUGIN_MANAGER_I_H
 #define ICE_PLUGIN_MANAGER_I_H
@@ -21,26 +16,26 @@
 namespace Ice
 {
 
-typedef Ice::Plugin* (*PLUGIN_FACTORY)(const ::Ice::CommunicatorPtr&, const std::string&, const ::Ice::StringSeq&);
+typedef Ice::Plugin* (*PluginFactory)(const ::Ice::CommunicatorPtr&, const std::string&, const ::Ice::StringSeq&);
 
 class PluginManagerI : public PluginManager, public IceUtil::Mutex
 {
 public:
 
-    static void registerPluginFactory(const std::string&, PLUGIN_FACTORY, bool);
+    static void registerPluginFactory(const std::string&, PluginFactory, bool);
 
     virtual void initializePlugins();
-    virtual StringSeq getPlugins();
+    virtual StringSeq getPlugins() ICE_NOEXCEPT;
     virtual PluginPtr getPlugin(const std::string&);
     virtual void addPlugin(const std::string&, const PluginPtr&);
-    virtual void destroy();
+    virtual void destroy() ICE_NOEXCEPT;
+    PluginManagerI(const CommunicatorPtr&, const IceInternal::DynamicLibraryListPtr&);
 
 private:
 
-    PluginManagerI(const CommunicatorPtr&, const IceInternal::DynamicLibraryListPtr&);
     friend class IceInternal::Instance;
 
-    void loadPlugins(int&, char*[]);
+    void loadPlugins(int&, const char*[]);
     void loadPlugin(const std::string&, const std::string&, StringSeq&);
 
     PluginPtr findPlugin(const std::string&) const;
@@ -63,5 +58,4 @@ typedef IceUtil::Handle PluginManagerIPtr;
 
 }
 
-
 #endif

data/ext/ice/cpp/src/Ice/Process.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,128 +19,278 @@
 #include <Ice/Process.h>
 #include <IceUtil/PushDisableWarnings.h>
 #include <Ice/LocalException.h>
-#include <Ice/ObjectFactory.h>
-#include <Ice/Outgoing.h>
+#include <Ice/ValueFactory.h>
 #include <Ice/OutgoingAsync.h>
-#include <Ice/BasicStream.h>
-#include <IceUtil/Iterator.h>
+#include <Ice/InputStream.h>
+#include <Ice/OutputStream.h>
 #include <IceUtil/PopDisableWarnings.h>
 
+#if defined(_MSC_VER)
+#   pragma warning(disable:4458) // declaration of ... hides class member
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 306
+#   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   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__Process__shutdown_name = "shutdown";
+const ::std::string iceC_Ice_Process_ids[2] =
+{
+    "::Ice::Object",
+    "::Ice::Process"
+};
+const ::std::string iceC_Ice_Process_ops[] =
+{
+    "ice_id",
+    "ice_ids",
+    "ice_isA",
+    "ice_ping",
+    "shutdown",
+    "writeMessage"
+};
+const ::std::string iceC_Ice_Process_shutdown_name = "shutdown";
+const ::std::string iceC_Ice_Process_writeMessage_name = "writeMessage";
 
-const ::std::string __Ice__Process__writeMessage_name = "writeMessage";
+}
 
+bool
+Ice::Process::ice_isA(::std::string s, const Current&) const
+{
+    return ::std::binary_search(iceC_Ice_Process_ids, iceC_Ice_Process_ids + 2, s);
 }
-#ifdef __SUNPRO_CC
-class ICE_API IceProxy::Ice::Process;
-#endif
-ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::Process* p) { return p; }
 
-void
-::IceProxy::Ice::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Process>& v)
+::std::vector<::std::string>
+Ice::Process::ice_ids(const Current&) const
 {
-    ::Ice::ObjectPrx proxy;
-    __is->read(proxy);
-    if(!proxy)
-    {
-        v = 0;
-    }
-    else
-    {
-        v = new ::IceProxy::Ice::Process;
-        v->__copyFrom(proxy);
-    }
+    return ::std::vector<::std::string>(&iceC_Ice_Process_ids[0], &iceC_Ice_Process_ids[2]);
 }
 
-void
-IceProxy::Ice::Process::shutdown(const ::Ice::Context* __ctx)
+::std::string
+Ice::Process::ice_id(const Current&) const
 {
-    ::IceInternal::Outgoing __og(this, __Ice__Process__shutdown_name, ::Ice::Normal, __ctx);
-    __og.writeEmptyParams();
-    __invoke(__og);
+    return ice_staticId();
 }
 
-::Ice::AsyncResultPtr
-IceProxy::Ice::Process::begin_shutdown(const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+const ::std::string&
+Ice::Process::ice_staticId()
 {
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__Process__shutdown_name, __del, __cookie);
-    try
+    static const ::std::string typeId = "::Ice::Process";
+    return typeId;
+}
+
+/// \cond INTERNAL
+bool
+Ice::Process::_iceD_shutdown(::IceInternal::Incoming& inS, const Current& current)
+{
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    inS.readEmptyParams();
+    this->shutdown(current);
+    inS.writeEmptyParams();
+    return true;
+}
+/// \endcond
+
+/// \cond INTERNAL
+bool
+Ice::Process::_iceD_writeMessage(::IceInternal::Incoming& inS, const Current& current)
+{
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    auto istr = inS.startReadParams();
+    ::std::string iceP_message;
+    int iceP_fd;
+    istr->readAll(iceP_message, iceP_fd);
+    inS.endReadParams();
+    this->writeMessage(::std::move(iceP_message), iceP_fd, current);
+    inS.writeEmptyParams();
+    return true;
+}
+/// \endcond
+
+/// \cond INTERNAL
+bool
+Ice::Process::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
+{
+    ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_Process_ops, iceC_Ice_Process_ops + 6, current.operation);
+    if(r.first == r.second)
     {
-        __result->prepare(__Ice__Process__shutdown_name, ::Ice::Normal, __ctx);
-        __result->writeEmptyParams();
-        __result->invoke();
+        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
-    catch(const ::Ice::Exception& __ex)
+
+    switch(r.first - iceC_Ice_Process_ops)
     {
-        __result->abort(__ex);
+        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_shutdown(in, current);
+        }
+        case 5:
+        {
+            return _iceD_writeMessage(in, current);
+        }
+        default:
+        {
+            assert(false);
+            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        }
     }
-    return __result;
 }
+/// \endcond
+
+/// \cond INTERNAL
+void
+Ice::ProcessPrx::_iceI_shutdown(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const Context& context)
+{
+    outAsync->invoke(iceC_Ice_Process_shutdown_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        nullptr,
+        nullptr);
+}
+/// \endcond
 
+/// \cond INTERNAL
 void
-IceProxy::Ice::Process::end_shutdown(const ::Ice::AsyncResultPtr& __result)
+Ice::ProcessPrx::_iceI_writeMessage(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_message, int iceP_fd, const Context& context)
+{
+    outAsync->invoke(iceC_Ice_Process_writeMessage_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        [&](OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_message, iceP_fd);
+        },
+        nullptr);
+}
+/// \endcond
+
+/// \cond INTERNAL
+::std::shared_ptr<::Ice::ObjectPrx>
+Ice::ProcessPrx::_newInstance() const
+{
+    return ::IceInternal::createProxy<ProcessPrx>();
+}
+/// \endcond
+
+const ::std::string&
+Ice::ProcessPrx::ice_staticId()
+{
+    return Process::ice_staticId();
+}
+
+#else // C++98 mapping
+
+namespace
 {
-    __end(__result, __Ice__Process__shutdown_name);
+
+const ::std::string iceC_Ice_Process_shutdown_name = "shutdown";
+
+const ::std::string iceC_Ice_Process_writeMessage_name = "writeMessage";
+
 }
 
+/// \cond INTERNAL
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(Process* p) { return p; }
+
 void
-IceProxy::Ice::Process::writeMessage(const ::std::string& __p_message, ::Ice::Int __p_fd, const ::Ice::Context* __ctx)
+::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< Process>& v)
 {
-    ::IceInternal::Outgoing __og(this, __Ice__Process__writeMessage_name, ::Ice::Normal, __ctx);
+    ::Ice::ObjectPrx proxy;
+    istr->read(proxy);
+    if(!proxy)
+    {
+        v = 0;
+    }
+    else
+    {
+        v = new Process;
+        v->_copyFrom(proxy);
+    }
+}
+/// \endcond
+
+::Ice::AsyncResultPtr
+IceProxy::Ice::Process::_iceI_begin_shutdown(const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
+{
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_Process_shutdown_name, del, cookie, sync);
     try
     {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_message);
-        __os->write(__p_fd);
-        __og.endWriteParams();
+        result->prepare(iceC_Ice_Process_shutdown_name, ::Ice::Normal, context);
+        result->writeEmptyParams();
+        result->invoke(iceC_Ice_Process_shutdown_name);
     }
-    catch(const ::Ice::LocalException& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __og.abort(__ex);
+        result->abort(ex);
     }
-    __invoke(__og);
+    return result;
+}
+
+void
+IceProxy::Ice::Process::end_shutdown(const ::Ice::AsyncResultPtr& result)
+{
+    _end(result, iceC_Ice_Process_shutdown_name);
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::Process::begin_writeMessage(const ::std::string& __p_message, ::Ice::Int __p_fd, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::Process::_iceI_begin_writeMessage(const ::std::string& iceP_message, ::Ice::Int iceP_fd, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__Process__writeMessage_name, __del, __cookie);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_Process_writeMessage_name, del, cookie, sync);
     try
     {
-        __result->prepare(__Ice__Process__writeMessage_name, ::Ice::Normal, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_message);
-        __os->write(__p_fd);
-        __result->endWriteParams();
-        __result->invoke();
+        result->prepare(iceC_Ice_Process_writeMessage_name, ::Ice::Normal, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_message);
+        ostr->write(iceP_fd);
+        result->endWriteParams();
+        result->invoke(iceC_Ice_Process_writeMessage_name);
     }
-    catch(const ::Ice::Exception& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __result->abort(__ex);
+        result->abort(ex);
     }
-    return __result;
+    return result;
 }
 
 void
-IceProxy::Ice::Process::end_writeMessage(const ::Ice::AsyncResultPtr& __result)
+IceProxy::Ice::Process::end_writeMessage(const ::Ice::AsyncResultPtr& result)
+{
+    _end(result, iceC_Ice_Process_writeMessage_name);
+}
+
+/// \cond INTERNAL
+::IceProxy::Ice::Object*
+IceProxy::Ice::Process::_newInstance() const
 {
-    __end(__result, __Ice__Process__writeMessage_name);
+    return new Process;
 }
+/// \endcond
 
 const ::std::string&
 IceProxy::Ice::Process::ice_staticId()
@@ -153,17 +298,18 @@ IceProxy::Ice::Process::ice_staticId()
     return ::Ice::Process::ice_staticId();
 }
 
-::IceProxy::Ice::Object*
-IceProxy::Ice::Process::__newInstance() const
+Ice::Process::~Process()
 {
-    return new Process;
 }
 
-ICE_API ::Ice::Object* Ice::upCast(::Ice::Process* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::Object* Ice::upCast(Process* p) { return p; }
+
+/// \endcond
 
 namespace
 {
-const ::std::string __Ice__Process_ids[2] =
+const ::std::string iceC_Ice_Process_ids[2] =
 {
     "::Ice::Object",
     "::Ice::Process"
@@ -172,21 +318,21 @@ const ::std::string __Ice__Process_ids[2] =
 }
 
 bool
-Ice::Process::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
+Ice::Process::ice_isA(const ::std::string& s, const Current&) const
 {
-    return ::std::binary_search(__Ice__Process_ids, __Ice__Process_ids + 2, _s);
+    return ::std::binary_search(iceC_Ice_Process_ids, iceC_Ice_Process_ids + 2, s);
 }
 
 ::std::vector< ::std::string>
-Ice::Process::ice_ids(const ::Ice::Current&) const
+Ice::Process::ice_ids(const Current&) const
 {
-    return ::std::vector< ::std::string>(&__Ice__Process_ids[0], &__Ice__Process_ids[2]);
+    return ::std::vector< ::std::string>(&iceC_Ice_Process_ids[0], &iceC_Ice_Process_ids[2]);
 }
 
 const ::std::string&
-Ice::Process::ice_id(const ::Ice::Current&) const
+Ice::Process::ice_id(const Current&) const
 {
-    return __Ice__Process_ids[1];
+    return ice_staticId();
 }
 
 const ::std::string&
@@ -196,38 +342,42 @@ Ice::Process::ice_staticId()
     static const ::std::string typeId = "::Ice::Process";
     return typeId;
 #else
-    return __Ice__Process_ids[1];
+    return iceC_Ice_Process_ids[1];
 #endif
 }
 
-::Ice::DispatchStatus
-Ice::Process::___shutdown(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
+/// \cond INTERNAL
+bool
+Ice::Process::_iceD_shutdown(::IceInternal::Incoming& inS, const Current& current)
 {
-    __checkMode(::Ice::Normal, __current.mode);
-    __inS.readEmptyParams();
-    shutdown(__current);
-    __inS.__writeEmptyParams();
-    return ::Ice::DispatchOK;
+    _iceCheckMode(::Ice::Normal, current.mode);
+    inS.readEmptyParams();
+    this->shutdown(current);
+    inS.writeEmptyParams();
+    return true;
 }
+/// \endcond
 
-::Ice::DispatchStatus
-Ice::Process::___writeMessage(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
+/// \cond INTERNAL
+bool
+Ice::Process::_iceD_writeMessage(::IceInternal::Incoming& inS, const Current& current)
 {
-    __checkMode(::Ice::Normal, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string __p_message;
-    ::Ice::Int __p_fd;
-    __is->read(__p_message);
-    __is->read(__p_fd);
-    __inS.endReadParams();
-    writeMessage(__p_message, __p_fd, __current);
-    __inS.__writeEmptyParams();
-    return ::Ice::DispatchOK;
+    _iceCheckMode(::Ice::Normal, current.mode);
+    InputStream* istr = inS.startReadParams();
+    ::std::string iceP_message;
+    Int iceP_fd;
+    istr->read(iceP_message);
+    istr->read(iceP_fd);
+    inS.endReadParams();
+    this->writeMessage(iceP_message, iceP_fd, current);
+    inS.writeEmptyParams();
+    return true;
 }
+/// \endcond
 
 namespace
 {
-const ::std::string __Ice__Process_all[] =
+const ::std::string iceC_Ice_Process_all[] =
 {
     "ice_id",
     "ice_ids",
@@ -239,67 +389,83 @@ const ::std::string __Ice__Process_all[] =
 
 }
 
-::Ice::DispatchStatus
-Ice::Process::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+/// \cond INTERNAL
+bool
+Ice::Process::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
-    ::std::pair< const ::std::string*, const ::std::string*> r = ::std::equal_range(__Ice__Process_all, __Ice__Process_all + 6, current.operation);
+    ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_Process_all, iceC_Ice_Process_all + 6, 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__Process_all)
+    switch(r.first - iceC_Ice_Process_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 ___shutdown(in, current);
+            return _iceD_shutdown(in, current);
         }
         case 5:
         {
-            return ___writeMessage(in, current);
+            return _iceD_writeMessage(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::Process::__writeImpl(::IceInternal::BasicStream* __os) const
+Ice::Process::_iceWriteImpl(OutputStream* ostr) const
 {
-    __os->startWriteSlice(ice_staticId(), -1, true);
-    __os->endWriteSlice();
+    ostr->startSlice(ice_staticId(), -1, true);
+    StreamWriter< Process, OutputStream>::write(ostr, *this);
+    ostr->endSlice();
 }
 
 void
-Ice::Process::__readImpl(::IceInternal::BasicStream* __is)
+Ice::Process::_iceReadImpl(InputStream* istr)
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    istr->startSlice();
+    StreamReader< Process, InputStream>::read(istr, *this);
+    istr->endSlice();
 }
+/// \endcond
 
-void ICE_API 
-Ice::__patch(ProcessPtr& handle, const ::Ice::ObjectPtr& v)
+/// \cond INTERNAL
+void
+Ice::_icePatchObjectPtr(ProcessPtr& handle, const ObjectPtr& v)
 {
-    handle = ::Ice::ProcessPtr::dynamicCast(v);
+    handle = ProcessPtr::dynamicCast(v);
     if(v && !handle)
     {
-        IceInternal::Ex::throwUOE(::Ice::Process::ice_staticId(), v);
+        IceInternal::Ex::throwUOE(Process::ice_staticId(), v);
     }
 }
+/// \endcond
+
+namespace Ice
+{
+}
+
+#endif