zeroc-ice 3.6.5 → 3.7.4

data/ext/ice/cpp/src/Ice/ProcessF.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,23 +18,46 @@
 #endif
 #include <Ice/ProcessF.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
 {
 
 }
+
+#else // C++98 mapping
+
+namespace
+{
+
+}
+
+namespace Ice
+{
+}
+
+#endif

data/ext/ice/cpp/src/Ice/Properties.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,28 +19,60 @@
 #include <Ice/Properties.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
 {
 
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::Properties* p) { return p; }
+Ice::Properties::~Properties()
+{
+}
+
+#else // C++98 mapping
+
+namespace
+{
+
+}
+
+Ice::Properties::~Properties()
+{
+}
+
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(Properties* p) { return p; }
+/// \endcond
+
+namespace Ice
+{
+}
+
+#endif

data/ext/ice/cpp/src/Ice/PropertiesAdmin.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,350 +19,385 @@
 #include <Ice/PropertiesAdmin.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__PropertiesAdmin__getProperty_name = "getProperty";
-
-const ::std::string __Ice__PropertiesAdmin__getPropertiesForPrefix_name = "getPropertiesForPrefix";
+const ::std::string iceC_Ice_PropertiesAdmin_ids[2] =
+{
+    "::Ice::Object",
+    "::Ice::PropertiesAdmin"
+};
+const ::std::string iceC_Ice_PropertiesAdmin_ops[] =
+{
+    "getPropertiesForPrefix",
+    "getProperty",
+    "ice_id",
+    "ice_ids",
+    "ice_isA",
+    "ice_ping",
+    "setProperties"
+};
+const ::std::string iceC_Ice_PropertiesAdmin_getProperty_name = "getProperty";
+const ::std::string iceC_Ice_PropertiesAdmin_getPropertiesForPrefix_name = "getPropertiesForPrefix";
+const ::std::string iceC_Ice_PropertiesAdmin_setProperties_name = "setProperties";
 
-const ::std::string __Ice__PropertiesAdmin__setProperties_name = "setProperties";
+}
 
+bool
+Ice::PropertiesAdmin::ice_isA(::std::string s, const Current&) const
+{
+    return ::std::binary_search(iceC_Ice_PropertiesAdmin_ids, iceC_Ice_PropertiesAdmin_ids + 2, s);
 }
 
-IceAsync::Ice::AMD_PropertiesAdmin_setProperties::AMD_PropertiesAdmin_setProperties(::IceInternal::Incoming& in) :
-    ::IceInternal::IncomingAsync(in)
+::std::vector<::std::string>
+Ice::PropertiesAdmin::ice_ids(const Current&) const
 {
+    return ::std::vector<::std::string>(&iceC_Ice_PropertiesAdmin_ids[0], &iceC_Ice_PropertiesAdmin_ids[2]);
 }
 
-void
-IceAsync::Ice::AMD_PropertiesAdmin_setProperties::ice_response()
+::std::string
+Ice::PropertiesAdmin::ice_id(const Current&) const
 {
-    if(__validateResponse(true))
-    {
-        __writeEmptyParams();
-        __response();
-    }
+    return ice_staticId();
 }
-#ifdef __SUNPRO_CC
-class ICE_API IceProxy::Ice::PropertiesAdmin;
-#endif
-ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::PropertiesAdmin* p) { return p; }
 
-void
-::IceProxy::Ice::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::Ice::PropertiesAdmin>& v)
+const ::std::string&
+Ice::PropertiesAdmin::ice_staticId()
 {
-    ::Ice::ObjectPrx proxy;
-    __is->read(proxy);
-    if(!proxy)
-    {
-        v = 0;
-    }
-    else
-    {
-        v = new ::IceProxy::Ice::PropertiesAdmin;
-        v->__copyFrom(proxy);
-    }
+    static const ::std::string typeId = "::Ice::PropertiesAdmin";
+    return typeId;
 }
 
-::std::string
-IceProxy::Ice::PropertiesAdmin::getProperty(const ::std::string& __p_key, const ::Ice::Context* __ctx)
+/// \cond INTERNAL
+bool
+Ice::PropertiesAdmin::_iceD_getProperty(::IceInternal::Incoming& inS, const Current& current)
+{
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    auto istr = inS.startReadParams();
+    ::std::string iceP_key;
+    istr->readAll(iceP_key);
+    inS.endReadParams();
+    ::std::string ret = this->getProperty(::std::move(iceP_key), current);
+    auto ostr = inS.startWriteParams();
+    ostr->writeAll(ret);
+    inS.endWriteParams();
+    return true;
+}
+/// \endcond
+
+/// \cond INTERNAL
+bool
+Ice::PropertiesAdmin::_iceD_getPropertiesForPrefix(::IceInternal::Incoming& inS, const Current& current)
+{
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    auto istr = inS.startReadParams();
+    ::std::string iceP_prefix;
+    istr->readAll(iceP_prefix);
+    inS.endReadParams();
+    PropertyDict ret = this->getPropertiesForPrefix(::std::move(iceP_prefix), current);
+    auto ostr = inS.startWriteParams();
+    ostr->writeAll(ret);
+    inS.endWriteParams();
+    return true;
+}
+/// \endcond
+
+/// \cond INTERNAL
+bool
+Ice::PropertiesAdmin::_iceD_setProperties(::IceInternal::Incoming& inS, const Current& current)
+{
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    auto istr = inS.startReadParams();
+    PropertyDict iceP_newProperties;
+    istr->readAll(iceP_newProperties);
+    inS.endReadParams();
+    this->setProperties(::std::move(iceP_newProperties), current);
+    inS.writeEmptyParams();
+    return true;
+}
+/// \endcond
+
+/// \cond INTERNAL
+bool
+Ice::PropertiesAdmin::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
-    __checkTwowayOnly(__Ice__PropertiesAdmin__getProperty_name);
-    ::IceInternal::Outgoing __og(this, __Ice__PropertiesAdmin__getProperty_name, ::Ice::Normal, __ctx);
-    try
-    {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_key);
-        __og.endWriteParams();
-    }
-    catch(const ::Ice::LocalException& __ex)
+    ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_PropertiesAdmin_ops, iceC_Ice_PropertiesAdmin_ops + 7, current.operation);
+    if(r.first == r.second)
     {
-        __og.abort(__ex);
+        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
-    if(!__og.invoke())
+
+    switch(r.first - iceC_Ice_PropertiesAdmin_ops)
     {
-        try
+        case 0:
         {
-            __og.throwUserException();
+            return _iceD_getPropertiesForPrefix(in, current);
         }
-        catch(const ::Ice::UserException& __ex)
+        case 1:
         {
-            ::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());
-            throw __uue;
+            return _iceD_getProperty(in, current);
+        }
+        case 2:
+        {
+            return _iceD_ice_id(in, current);
+        }
+        case 3:
+        {
+            return _iceD_ice_ids(in, current);
+        }
+        case 4:
+        {
+            return _iceD_ice_isA(in, current);
+        }
+        case 5:
+        {
+            return _iceD_ice_ping(in, current);
+        }
+        case 6:
+        {
+            return _iceD_setProperties(in, current);
+        }
+        default:
+        {
+            assert(false);
+            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
         }
     }
-    ::std::string __ret;
-    ::IceInternal::BasicStream* __is = __og.startReadParams();
-    __is->read(__ret);
-    __og.endReadParams();
-    return __ret;
 }
+/// \endcond
 
-::Ice::AsyncResultPtr
-IceProxy::Ice::PropertiesAdmin::begin_getProperty(const ::std::string& __p_key, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+/// \cond INTERNAL
+void
+Ice::PropertiesAdminPrx::_iceI_getProperty(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::string>>& outAsync, const ::std::string& iceP_key, const Context& context)
 {
-    __checkAsyncTwowayOnly(__Ice__PropertiesAdmin__getProperty_name);
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__PropertiesAdmin__getProperty_name, __del, __cookie);
-    try
-    {
-        __result->prepare(__Ice__PropertiesAdmin__getProperty_name, ::Ice::Normal, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_key);
-        __result->endWriteParams();
-        __result->invoke();
-    }
-    catch(const ::Ice::Exception& __ex)
-    {
-        __result->abort(__ex);
-    }
-    return __result;
+    _checkTwowayOnly(iceC_Ice_PropertiesAdmin_getProperty_name);
+    outAsync->invoke(iceC_Ice_PropertiesAdmin_getProperty_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        [&](OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_key);
+        },
+        nullptr);
 }
+/// \endcond
 
-#ifdef ICE_CPP11
-
-::Ice::AsyncResultPtr
-IceProxy::Ice::PropertiesAdmin::__begin_getProperty(const ::std::string& __p_key, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::std::string&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+/// \cond INTERNAL
+void
+Ice::PropertiesAdminPrx::_iceI_getPropertiesForPrefix(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::PropertyDict>>& outAsync, const ::std::string& iceP_prefix, const Context& context)
 {
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
-    {
-    public:
-
-        Cpp11CB(const ::std::function<void (const ::std::string&)>& responseFunc, const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc, const ::std::function<void (bool)>& sentFunc) :
-            ::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
-            _response(responseFunc)
+    _checkTwowayOnly(iceC_Ice_PropertiesAdmin_getPropertiesForPrefix_name);
+    outAsync->invoke(iceC_Ice_PropertiesAdmin_getPropertiesForPrefix_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        [&](OutputStream* ostr)
         {
-            CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
-        }
+            ostr->writeAll(iceP_prefix);
+        },
+        nullptr);
+}
+/// \endcond
 
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
+/// \cond INTERNAL
+void
+Ice::PropertiesAdminPrx::_iceI_setProperties(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const PropertyDict& iceP_newProperties, const Context& context)
+{
+    outAsync->invoke(iceC_Ice_PropertiesAdmin_setProperties_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        [&](OutputStream* ostr)
         {
-            ::Ice::PropertiesAdminPrx __proxy = ::Ice::PropertiesAdminPrx::uncheckedCast(__result->getProxy());
-            ::std::string __ret;
-            try
-            {
-                __ret = __proxy->end_getProperty(__result);
-            }
-            catch(const ::Ice::Exception& ex)
-            {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
-            }
-            if(_response != nullptr)
-            {
-                _response(__ret);
-            }
-        }
-    
-    private:
-        
-        ::std::function<void (const ::std::string&)> _response;
-    };
-    return begin_getProperty(__p_key, __ctx, new Cpp11CB(__response, __exception, __sent));
+            ostr->writeAll(iceP_newProperties);
+        },
+        nullptr);
 }
-#endif
+/// \endcond
 
-::std::string
-IceProxy::Ice::PropertiesAdmin::end_getProperty(const ::Ice::AsyncResultPtr& __result)
+/// \cond INTERNAL
+::std::shared_ptr<::Ice::ObjectPrx>
+Ice::PropertiesAdminPrx::_newInstance() const
+{
+    return ::IceInternal::createProxy<PropertiesAdminPrx>();
+}
+/// \endcond
+
+const ::std::string&
+Ice::PropertiesAdminPrx::ice_staticId()
 {
-    ::Ice::AsyncResult::__check(__result, this, __Ice__PropertiesAdmin__getProperty_name);
-    ::std::string __ret;
-    if(!__result->__wait())
+    return PropertiesAdmin::ice_staticId();
+}
+
+#else // C++98 mapping
+
+namespace
+{
+
+const ::std::string iceC_Ice_PropertiesAdmin_getProperty_name = "getProperty";
+
+const ::std::string iceC_Ice_PropertiesAdmin_getPropertiesForPrefix_name = "getPropertiesForPrefix";
+
+const ::std::string iceC_Ice_PropertiesAdmin_setProperties_name = "setProperties";
+
+}
+
+/// \cond INTERNAL
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(PropertiesAdmin* p) { return p; }
+
+void
+::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< PropertiesAdmin>& v)
+{
+    ::Ice::ObjectPrx proxy;
+    istr->read(proxy);
+    if(!proxy)
     {
-        try
-        {
-            __result->__throwUserException();
-        }
-        catch(const ::Ice::UserException& __ex)
-        {
-            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
-        }
+        v = 0;
+    }
+    else
+    {
+        v = new PropertiesAdmin;
+        v->_copyFrom(proxy);
     }
-    ::IceInternal::BasicStream* __is = __result->__startReadParams();
-    __is->read(__ret);
-    __result->__endReadParams();
-    return __ret;
 }
+/// \endcond
 
-::Ice::PropertyDict
-IceProxy::Ice::PropertiesAdmin::getPropertiesForPrefix(const ::std::string& __p_prefix, const ::Ice::Context* __ctx)
+::Ice::AsyncResultPtr
+IceProxy::Ice::PropertiesAdmin::_iceI_begin_getProperty(const ::std::string& iceP_key, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
-    __checkTwowayOnly(__Ice__PropertiesAdmin__getPropertiesForPrefix_name);
-    ::IceInternal::Outgoing __og(this, __Ice__PropertiesAdmin__getPropertiesForPrefix_name, ::Ice::Normal, __ctx);
+    _checkTwowayOnly(iceC_Ice_PropertiesAdmin_getProperty_name, sync);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_PropertiesAdmin_getProperty_name, del, cookie, sync);
     try
     {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_prefix);
-        __og.endWriteParams();
+        result->prepare(iceC_Ice_PropertiesAdmin_getProperty_name, ::Ice::Normal, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_key);
+        result->endWriteParams();
+        result->invoke(iceC_Ice_PropertiesAdmin_getProperty_name);
     }
-    catch(const ::Ice::LocalException& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __og.abort(__ex);
+        result->abort(ex);
     }
-    if(!__og.invoke())
+    return result;
+}
+
+::std::string
+IceProxy::Ice::PropertiesAdmin::end_getProperty(const ::Ice::AsyncResultPtr& result)
+{
+    ::Ice::AsyncResult::_check(result, this, iceC_Ice_PropertiesAdmin_getProperty_name);
+    ::std::string ret;
+    if(!result->_waitForResponse())
     {
         try
         {
-            __og.throwUserException();
+            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::PropertyDict __ret;
-    ::IceInternal::BasicStream* __is = __og.startReadParams();
-    __is->read(__ret);
-    __og.endReadParams();
-    return __ret;
+    ::Ice::InputStream* istr = result->_startReadParams();
+    istr->read(ret);
+    result->_endReadParams();
+    return ret;
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::PropertiesAdmin::begin_getPropertiesForPrefix(const ::std::string& __p_prefix, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::PropertiesAdmin::_iceI_begin_getPropertiesForPrefix(const ::std::string& iceP_prefix, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
-    __checkAsyncTwowayOnly(__Ice__PropertiesAdmin__getPropertiesForPrefix_name);
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__PropertiesAdmin__getPropertiesForPrefix_name, __del, __cookie);
+    _checkTwowayOnly(iceC_Ice_PropertiesAdmin_getPropertiesForPrefix_name, sync);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_PropertiesAdmin_getPropertiesForPrefix_name, del, cookie, sync);
     try
     {
-        __result->prepare(__Ice__PropertiesAdmin__getPropertiesForPrefix_name, ::Ice::Normal, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_prefix);
-        __result->endWriteParams();
-        __result->invoke();
+        result->prepare(iceC_Ice_PropertiesAdmin_getPropertiesForPrefix_name, ::Ice::Normal, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_prefix);
+        result->endWriteParams();
+        result->invoke(iceC_Ice_PropertiesAdmin_getPropertiesForPrefix_name);
     }
-    catch(const ::Ice::Exception& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __result->abort(__ex);
+        result->abort(ex);
     }
-    return __result;
+    return result;
 }
 
-#ifdef ICE_CPP11
-
-::Ice::AsyncResultPtr
-IceProxy::Ice::PropertiesAdmin::__begin_getPropertiesForPrefix(const ::std::string& __p_prefix, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::PropertyDict&)>& __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::PropertyDict&)>& 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::PropertiesAdminPrx __proxy = ::Ice::PropertiesAdminPrx::uncheckedCast(__result->getProxy());
-            ::Ice::PropertyDict __ret;
-            try
-            {
-                __ret = __proxy->end_getPropertiesForPrefix(__result);
-            }
-            catch(const ::Ice::Exception& ex)
-            {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
-            }
-            if(_response != nullptr)
-            {
-                _response(__ret);
-            }
-        }
-    
-    private:
-        
-        ::std::function<void (const ::Ice::PropertyDict&)> _response;
-    };
-    return begin_getPropertiesForPrefix(__p_prefix, __ctx, new Cpp11CB(__response, __exception, __sent));
-}
-#endif
-
 ::Ice::PropertyDict
-IceProxy::Ice::PropertiesAdmin::end_getPropertiesForPrefix(const ::Ice::AsyncResultPtr& __result)
+IceProxy::Ice::PropertiesAdmin::end_getPropertiesForPrefix(const ::Ice::AsyncResultPtr& result)
 {
-    ::Ice::AsyncResult::__check(__result, this, __Ice__PropertiesAdmin__getPropertiesForPrefix_name);
-    ::Ice::PropertyDict __ret;
-    if(!__result->__wait())
+    ::Ice::AsyncResult::_check(result, this, iceC_Ice_PropertiesAdmin_getPropertiesForPrefix_name);
+    ::Ice::PropertyDict 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;
 }
 
-void
-IceProxy::Ice::PropertiesAdmin::setProperties(const ::Ice::PropertyDict& __p_newProperties, const ::Ice::Context* __ctx)
+::Ice::AsyncResultPtr
+IceProxy::Ice::PropertiesAdmin::_iceI_begin_setProperties(const ::Ice::PropertyDict& iceP_newProperties, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
-    ::IceInternal::Outgoing __og(this, __Ice__PropertiesAdmin__setProperties_name, ::Ice::Normal, __ctx);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_PropertiesAdmin_setProperties_name, del, cookie, sync);
     try
     {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_newProperties);
-        __og.endWriteParams();
+        result->prepare(iceC_Ice_PropertiesAdmin_setProperties_name, ::Ice::Normal, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_newProperties);
+        result->endWriteParams();
+        result->invoke(iceC_Ice_PropertiesAdmin_setProperties_name);
     }
-    catch(const ::Ice::LocalException& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __og.abort(__ex);
+        result->abort(ex);
     }
-    __invoke(__og);
+    return result;
 }
 
-::Ice::AsyncResultPtr
-IceProxy::Ice::PropertiesAdmin::begin_setProperties(const ::Ice::PropertyDict& __p_newProperties, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+void
+IceProxy::Ice::PropertiesAdmin::end_setProperties(const ::Ice::AsyncResultPtr& result)
 {
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__PropertiesAdmin__setProperties_name, __del, __cookie);
-    try
-    {
-        __result->prepare(__Ice__PropertiesAdmin__setProperties_name, ::Ice::Normal, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_newProperties);
-        __result->endWriteParams();
-        __result->invoke();
-    }
-    catch(const ::Ice::Exception& __ex)
-    {
-        __result->abort(__ex);
-    }
-    return __result;
+    _end(result, iceC_Ice_PropertiesAdmin_setProperties_name);
 }
 
-void
-IceProxy::Ice::PropertiesAdmin::end_setProperties(const ::Ice::AsyncResultPtr& __result)
+/// \cond INTERNAL
+::IceProxy::Ice::Object*
+IceProxy::Ice::PropertiesAdmin::_newInstance() const
 {
-    __end(__result, __Ice__PropertiesAdmin__setProperties_name);
+    return new PropertiesAdmin;
 }
+/// \endcond
 
 const ::std::string&
 IceProxy::Ice::PropertiesAdmin::ice_staticId()
@@ -375,17 +405,18 @@ IceProxy::Ice::PropertiesAdmin::ice_staticId()
     return ::Ice::PropertiesAdmin::ice_staticId();
 }
 
-::IceProxy::Ice::Object*
-IceProxy::Ice::PropertiesAdmin::__newInstance() const
+Ice::PropertiesAdmin::~PropertiesAdmin()
 {
-    return new PropertiesAdmin;
 }
 
-ICE_API ::Ice::Object* Ice::upCast(::Ice::PropertiesAdmin* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::Object* Ice::upCast(PropertiesAdmin* p) { return p; }
+
+/// \endcond
 
 namespace
 {
-const ::std::string __Ice__PropertiesAdmin_ids[2] =
+const ::std::string iceC_Ice_PropertiesAdmin_ids[2] =
 {
     "::Ice::Object",
     "::Ice::PropertiesAdmin"
@@ -394,21 +425,21 @@ const ::std::string __Ice__PropertiesAdmin_ids[2] =
 }
 
 bool
-Ice::PropertiesAdmin::ice_isA(const ::std::string& _s, const ::Ice::Current&) const
+Ice::PropertiesAdmin::ice_isA(const ::std::string& s, const Current&) const
 {
-    return ::std::binary_search(__Ice__PropertiesAdmin_ids, __Ice__PropertiesAdmin_ids + 2, _s);
+    return ::std::binary_search(iceC_Ice_PropertiesAdmin_ids, iceC_Ice_PropertiesAdmin_ids + 2, s);
 }
 
 ::std::vector< ::std::string>
-Ice::PropertiesAdmin::ice_ids(const ::Ice::Current&) const
+Ice::PropertiesAdmin::ice_ids(const Current&) const
 {
-    return ::std::vector< ::std::string>(&__Ice__PropertiesAdmin_ids[0], &__Ice__PropertiesAdmin_ids[2]);
+    return ::std::vector< ::std::string>(&iceC_Ice_PropertiesAdmin_ids[0], &iceC_Ice_PropertiesAdmin_ids[2]);
 }
 
 const ::std::string&
-Ice::PropertiesAdmin::ice_id(const ::Ice::Current&) const
+Ice::PropertiesAdmin::ice_id(const Current&) const
 {
-    return __Ice__PropertiesAdmin_ids[1];
+    return ice_staticId();
 }
 
 const ::std::string&
@@ -418,67 +449,62 @@ Ice::PropertiesAdmin::ice_staticId()
     static const ::std::string typeId = "::Ice::PropertiesAdmin";
     return typeId;
 #else
-    return __Ice__PropertiesAdmin_ids[1];
+    return iceC_Ice_PropertiesAdmin_ids[1];
 #endif
 }
 
-::Ice::DispatchStatus
-Ice::PropertiesAdmin::___getProperty(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
-    __checkMode(::Ice::Normal, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string __p_key;
-    __is->read(__p_key);
-    __inS.endReadParams();
-    ::std::string __ret = getProperty(__p_key, __current);
-    ::IceInternal::BasicStream* __os = __inS.__startWriteParams(::Ice::DefaultFormat);
-    __os->write(__ret);
-    __inS.__endWriteParams(true);
-    return ::Ice::DispatchOK;
-}
-
-::Ice::DispatchStatus
-Ice::PropertiesAdmin::___getPropertiesForPrefix(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
-    __checkMode(::Ice::Normal, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string __p_prefix;
-    __is->read(__p_prefix);
-    __inS.endReadParams();
-    ::Ice::PropertyDict __ret = getPropertiesForPrefix(__p_prefix, __current);
-    ::IceInternal::BasicStream* __os = __inS.__startWriteParams(::Ice::DefaultFormat);
-    __os->write(__ret);
-    __inS.__endWriteParams(true);
-    return ::Ice::DispatchOK;
-}
-
-::Ice::DispatchStatus
-Ice::PropertiesAdmin::___setProperties(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
-    __checkMode(::Ice::Normal, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::Ice::PropertyDict __p_newProperties;
-    __is->read(__p_newProperties);
-    __inS.endReadParams();
-    ::Ice::AMD_PropertiesAdmin_setPropertiesPtr __cb = new IceAsync::Ice::AMD_PropertiesAdmin_setProperties(__inS);
-    try
-    {
-        setProperties_async(__cb, __p_newProperties, __current);
-    }
-    catch(const ::std::exception& __ex)
-    {
-        __cb->ice_exception(__ex);
-    }
-    catch(...)
-    {
-        __cb->ice_exception();
-    }
-    return ::Ice::DispatchAsync;
+/// \cond INTERNAL
+bool
+Ice::PropertiesAdmin::_iceD_getProperty(::IceInternal::Incoming& inS, const Current& current)
+{
+    _iceCheckMode(::Ice::Normal, current.mode);
+    InputStream* istr = inS.startReadParams();
+    ::std::string iceP_key;
+    istr->read(iceP_key);
+    inS.endReadParams();
+    ::std::string ret = this->getProperty(iceP_key, current);
+    OutputStream* ostr = inS.startWriteParams();
+    ostr->write(ret);
+    inS.endWriteParams();
+    return true;
+}
+/// \endcond
+
+/// \cond INTERNAL
+bool
+Ice::PropertiesAdmin::_iceD_getPropertiesForPrefix(::IceInternal::Incoming& inS, const Current& current)
+{
+    _iceCheckMode(::Ice::Normal, current.mode);
+    InputStream* istr = inS.startReadParams();
+    ::std::string iceP_prefix;
+    istr->read(iceP_prefix);
+    inS.endReadParams();
+    PropertyDict ret = this->getPropertiesForPrefix(iceP_prefix, current);
+    OutputStream* ostr = inS.startWriteParams();
+    ostr->write(ret);
+    inS.endWriteParams();
+    return true;
+}
+/// \endcond
+
+/// \cond INTERNAL
+bool
+Ice::PropertiesAdmin::_iceD_setProperties(::IceInternal::Incoming& inS, const Current& current)
+{
+    _iceCheckMode(::Ice::Normal, current.mode);
+    InputStream* istr = inS.startReadParams();
+    PropertyDict iceP_newProperties;
+    istr->read(iceP_newProperties);
+    inS.endReadParams();
+    this->setProperties(iceP_newProperties, current);
+    inS.writeEmptyParams();
+    return true;
 }
+/// \endcond
 
 namespace
 {
-const ::std::string __Ice__PropertiesAdmin_all[] =
+const ::std::string iceC_Ice_PropertiesAdmin_all[] =
 {
     "getPropertiesForPrefix",
     "getProperty",
@@ -491,71 +517,87 @@ const ::std::string __Ice__PropertiesAdmin_all[] =
 
 }
 
-::Ice::DispatchStatus
-Ice::PropertiesAdmin::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+/// \cond INTERNAL
+bool
+Ice::PropertiesAdmin::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
-    ::std::pair< const ::std::string*, const ::std::string*> r = ::std::equal_range(__Ice__PropertiesAdmin_all, __Ice__PropertiesAdmin_all + 7, current.operation);
+    ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_PropertiesAdmin_all, iceC_Ice_PropertiesAdmin_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__PropertiesAdmin_all)
+    switch(r.first - iceC_Ice_PropertiesAdmin_all)
     {
         case 0:
         {
-            return ___getPropertiesForPrefix(in, current);
+            return _iceD_getPropertiesForPrefix(in, current);
         }
         case 1:
         {
-            return ___getProperty(in, current);
+            return _iceD_getProperty(in, current);
         }
         case 2:
         {
-            return ___ice_id(in, current);
+            return _iceD_ice_id(in, current);
         }
         case 3:
         {
-            return ___ice_ids(in, current);
+            return _iceD_ice_ids(in, current);
         }
         case 4:
         {
-            return ___ice_isA(in, current);
+            return _iceD_ice_isA(in, current);
         }
         case 5:
         {
-            return ___ice_ping(in, current);
+            return _iceD_ice_ping(in, current);
         }
         case 6:
         {
-            return ___setProperties(in, current);
+            return _iceD_setProperties(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::PropertiesAdmin::__writeImpl(::IceInternal::BasicStream* __os) const
+Ice::PropertiesAdmin::_iceWriteImpl(OutputStream* ostr) const
 {
-    __os->startWriteSlice(ice_staticId(), -1, true);
-    __os->endWriteSlice();
+    ostr->startSlice(ice_staticId(), -1, true);
+    StreamWriter< PropertiesAdmin, OutputStream>::write(ostr, *this);
+    ostr->endSlice();
 }
 
 void
-Ice::PropertiesAdmin::__readImpl(::IceInternal::BasicStream* __is)
+Ice::PropertiesAdmin::_iceReadImpl(InputStream* istr)
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    istr->startSlice();
+    StreamReader< PropertiesAdmin, InputStream>::read(istr, *this);
+    istr->endSlice();
 }
+/// \endcond
 
-void ICE_API 
-Ice::__patch(PropertiesAdminPtr& handle, const ::Ice::ObjectPtr& v)
+/// \cond INTERNAL
+void
+Ice::_icePatchObjectPtr(PropertiesAdminPtr& handle, const ObjectPtr& v)
 {
-    handle = ::Ice::PropertiesAdminPtr::dynamicCast(v);
+    handle = PropertiesAdminPtr::dynamicCast(v);
     if(v && !handle)
     {
-        IceInternal::Ex::throwUOE(::Ice::PropertiesAdmin::ice_staticId(), v);
+        IceInternal::Ex::throwUOE(PropertiesAdmin::ice_staticId(), v);
     }
 }
+/// \endcond
+
+namespace Ice
+{
+}
+
+#endif