zeroc-ice 3.7.0 → 3.7.1

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.
@@ -30,10 +30,10 @@ public:
     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:

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.7.0
+// Ice version 3.7.1
 //
 // <auto-generated>
 //
@@ -45,7 +45,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -75,19 +75,19 @@ const ::std::string iceC_Ice_Process_writeMessage_name = "writeMessage";
 }
 
 bool
-Ice::Process::ice_isA(::std::string s, const ::Ice::Current&) const
+Ice::Process::ice_isA(::std::string s, const Current&) const
 {
     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>(&iceC_Ice_Process_ids[0], &iceC_Ice_Process_ids[2]);
 }
 
 ::std::string
-Ice::Process::ice_id(const ::Ice::Current&) const
+Ice::Process::ice_id(const Current&) const
 {
     return ice_staticId();
 }
@@ -99,20 +99,23 @@ Ice::Process::ice_staticId()
     return typeId;
 }
 
+/// \cond INTERNAL
 bool
-Ice::Process::_iceD_shutdown(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::Process::_iceD_shutdown(::IceInternal::Incoming& inS, const Current& current)
 {
-    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    _iceCheckMode(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 ::Ice::Current& current)
+Ice::Process::_iceD_writeMessage(::IceInternal::Incoming& inS, const Current& current)
 {
-    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    _iceCheckMode(OperationMode::Normal, current.mode);
     auto istr = inS.startReadParams();
     ::std::string iceP_message;
     int iceP_fd;
@@ -122,14 +125,16 @@ Ice::Process::_iceD_writeMessage(::IceInternal::Incoming& inS, const ::Ice::Curr
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::Process::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+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)
     {
-        throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
 
     switch(r.first - iceC_Ice_Process_ops)
@@ -161,40 +166,47 @@ Ice::Process::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& cu
         default:
         {
             assert(false);
-            throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
         }
     }
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::ProcessPrx::_iceI_shutdown(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::Ice::Context& context)
+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,
+    outAsync->invoke(iceC_Ice_Process_shutdown_name, OperationMode::Normal, FormatType::DefaultFormat, context,
         nullptr,
         nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::ProcessPrx::_iceI_writeMessage(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_message, int iceP_fd, const ::Ice::Context& context)
+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,
-        [&](::Ice::OutputStream* ostr)
+    outAsync->invoke(iceC_Ice_Process_writeMessage_name, OperationMode::Normal, 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 Ice::Process::ice_staticId();
+    return Process::ice_staticId();
 }
 
 #else // C++98 mapping
@@ -207,10 +219,12 @@ const ::std::string iceC_Ice_Process_shutdown_name = "shutdown";
 const ::std::string iceC_Ice_Process_writeMessage_name = "writeMessage";
 
 }
-ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::Process* p) { return p; }
+
+/// \cond INTERNAL
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(Process* p) { return p; }
 
 void
-::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Process>& v)
+::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< Process>& v)
 {
     ::Ice::ObjectPrx proxy;
     istr->read(proxy);
@@ -220,10 +234,11 @@ void
     }
     else
     {
-        v = new ::IceProxy::Ice::Process;
+        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)
@@ -274,11 +289,13 @@ 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
 {
     return new Process;
 }
+/// \endcond
 
 const ::std::string&
 IceProxy::Ice::Process::ice_staticId()
@@ -290,8 +307,10 @@ Ice::Process::~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
 {
@@ -304,19 +323,19 @@ const ::std::string iceC_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(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>(&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_staticId();
 }
@@ -332,8 +351,9 @@ Ice::Process::ice_staticId()
 #endif
 }
 
+/// \cond INTERNAL
 bool
-Ice::Process::_iceD_shutdown(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::Process::_iceD_shutdown(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::Normal, current.mode);
     inS.readEmptyParams();
@@ -341,14 +361,16 @@ Ice::Process::_iceD_shutdown(::IceInternal::Incoming& inS, const ::Ice::Current&
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::Process::_iceD_writeMessage(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::Process::_iceD_writeMessage(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::Normal, current.mode);
-    ::Ice::InputStream* istr = inS.startReadParams();
+    InputStream* istr = inS.startReadParams();
     ::std::string iceP_message;
-    ::Ice::Int iceP_fd;
+    Int iceP_fd;
     istr->read(iceP_message);
     istr->read(iceP_fd);
     inS.endReadParams();
@@ -356,6 +378,7 @@ Ice::Process::_iceD_writeMessage(::IceInternal::Incoming& inS, const ::Ice::Curr
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
 namespace
 {
@@ -371,13 +394,14 @@ const ::std::string iceC_Ice_Process_all[] =
 
 }
 
+/// \cond INTERNAL
 bool
-Ice::Process::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+Ice::Process::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
     ::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 - iceC_Ice_Process_all)
@@ -409,36 +433,41 @@ Ice::Process::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& cu
         default:
         {
             assert(false);
-            throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
         }
     }
 }
+/// \endcond
 
+/// \cond STREAM
 void
-Ice::Process::_iceWriteImpl(::Ice::OutputStream* ostr) const
+Ice::Process::_iceWriteImpl(OutputStream* ostr) const
 {
     ostr->startSlice(ice_staticId(), -1, true);
-    Ice::StreamWriter< ::Ice::Process, ::Ice::OutputStream>::write(ostr, *this);
+    StreamWriter< Process, OutputStream>::write(ostr, *this);
     ostr->endSlice();
 }
 
 void
-Ice::Process::_iceReadImpl(::Ice::InputStream* istr)
+Ice::Process::_iceReadImpl(InputStream* istr)
 {
     istr->startSlice();
-    Ice::StreamReader< ::Ice::Process, ::Ice::InputStream>::read(istr, *this);
+    StreamReader< Process, InputStream>::read(istr, *this);
     istr->endSlice();
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::_icePatchObjectPtr(ProcessPtr& handle, const ::Ice::ObjectPtr& v)
+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
 {

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.7.0
+// Ice version 3.7.1
 //
 // <auto-generated>
 //
@@ -42,7 +42,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.7.0
+// Ice version 3.7.1
 //
 // <auto-generated>
 //
@@ -45,7 +45,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -72,7 +72,9 @@ Ice::Properties::~Properties()
 {
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::Properties* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(Properties* p) { return p; }
+/// \endcond
 
 namespace Ice
 {

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.7.0
+// Ice version 3.7.1
 //
 // <auto-generated>
 //
@@ -45,7 +45,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -77,19 +77,19 @@ const ::std::string iceC_Ice_PropertiesAdmin_setProperties_name = "setProperties
 }
 
 bool
-Ice::PropertiesAdmin::ice_isA(::std::string s, const ::Ice::Current&) const
+Ice::PropertiesAdmin::ice_isA(::std::string s, const Current&) const
 {
     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>(&iceC_Ice_PropertiesAdmin_ids[0], &iceC_Ice_PropertiesAdmin_ids[2]);
 }
 
 ::std::string
-Ice::PropertiesAdmin::ice_id(const ::Ice::Current&) const
+Ice::PropertiesAdmin::ice_id(const Current&) const
 {
     return ice_staticId();
 }
@@ -101,10 +101,11 @@ Ice::PropertiesAdmin::ice_staticId()
     return typeId;
 }
 
+/// \cond INTERNAL
 bool
-Ice::PropertiesAdmin::_iceD_getProperty(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::PropertiesAdmin::_iceD_getProperty(::IceInternal::Incoming& inS, const Current& current)
 {
-    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    _iceCheckMode(OperationMode::Normal, current.mode);
     auto istr = inS.startReadParams();
     ::std::string iceP_key;
     istr->readAll(iceP_key);
@@ -115,42 +116,48 @@ Ice::PropertiesAdmin::_iceD_getProperty(::IceInternal::Incoming& inS, const ::Ic
     inS.endWriteParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::PropertiesAdmin::_iceD_getPropertiesForPrefix(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::PropertiesAdmin::_iceD_getPropertiesForPrefix(::IceInternal::Incoming& inS, const Current& current)
 {
-    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    _iceCheckMode(OperationMode::Normal, current.mode);
     auto istr = inS.startReadParams();
     ::std::string iceP_prefix;
     istr->readAll(iceP_prefix);
     inS.endReadParams();
-    ::Ice::PropertyDict ret = this->getPropertiesForPrefix(::std::move(iceP_prefix), current);
+    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 ::Ice::Current& current)
+Ice::PropertiesAdmin::_iceD_setProperties(::IceInternal::Incoming& inS, const Current& current)
 {
-    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    _iceCheckMode(OperationMode::Normal, current.mode);
     auto istr = inS.startReadParams();
-    ::Ice::PropertyDict iceP_newProperties;
+    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 ::Ice::Current& current)
+Ice::PropertiesAdmin::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
     ::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)
     {
-        throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
 
     switch(r.first - iceC_Ice_PropertiesAdmin_ops)
@@ -186,56 +193,65 @@ Ice::PropertiesAdmin::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Cur
         default:
         {
             assert(false);
-            throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
         }
     }
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::PropertiesAdminPrx::_iceI_getProperty(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::string>>& outAsync, const ::std::string& iceP_key, const ::Ice::Context& context)
+Ice::PropertiesAdminPrx::_iceI_getProperty(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::string>>& outAsync, const ::std::string& iceP_key, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_PropertiesAdmin_getProperty_name);
-    outAsync->invoke(iceC_Ice_PropertiesAdmin_getProperty_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
-        [&](::Ice::OutputStream* ostr)
+    outAsync->invoke(iceC_Ice_PropertiesAdmin_getProperty_name, OperationMode::Normal, FormatType::DefaultFormat, context,
+        [&](OutputStream* ostr)
         {
             ostr->writeAll(iceP_key);
         },
         nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::PropertiesAdminPrx::_iceI_getPropertiesForPrefix(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::PropertyDict>>& outAsync, const ::std::string& iceP_prefix, const ::Ice::Context& context)
+Ice::PropertiesAdminPrx::_iceI_getPropertiesForPrefix(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<PropertyDict>>& outAsync, const ::std::string& iceP_prefix, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_PropertiesAdmin_getPropertiesForPrefix_name);
-    outAsync->invoke(iceC_Ice_PropertiesAdmin_getPropertiesForPrefix_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
-        [&](::Ice::OutputStream* ostr)
+    outAsync->invoke(iceC_Ice_PropertiesAdmin_getPropertiesForPrefix_name, OperationMode::Normal, FormatType::DefaultFormat, context,
+        [&](OutputStream* ostr)
         {
             ostr->writeAll(iceP_prefix);
         },
         nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::PropertiesAdminPrx::_iceI_setProperties(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::Ice::PropertyDict& iceP_newProperties, const ::Ice::Context& context)
+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,
-        [&](::Ice::OutputStream* ostr)
+    outAsync->invoke(iceC_Ice_PropertiesAdmin_setProperties_name, OperationMode::Normal, FormatType::DefaultFormat, context,
+        [&](OutputStream* ostr)
         {
             ostr->writeAll(iceP_newProperties);
         },
         nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 ::std::shared_ptr<::Ice::ObjectPrx>
 Ice::PropertiesAdminPrx::_newInstance() const
 {
     return ::IceInternal::createProxy<PropertiesAdminPrx>();
 }
+/// \endcond
 
 const ::std::string&
 Ice::PropertiesAdminPrx::ice_staticId()
 {
-    return Ice::PropertiesAdmin::ice_staticId();
+    return PropertiesAdmin::ice_staticId();
 }
 
 #else // C++98 mapping
@@ -250,10 +266,12 @@ const ::std::string iceC_Ice_PropertiesAdmin_getPropertiesForPrefix_name = "getP
 const ::std::string iceC_Ice_PropertiesAdmin_setProperties_name = "setProperties";
 
 }
-ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::PropertiesAdmin* p) { return p; }
+
+/// \cond INTERNAL
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(PropertiesAdmin* p) { return p; }
 
 void
-::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::Ice::PropertiesAdmin>& v)
+::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< PropertiesAdmin>& v)
 {
     ::Ice::ObjectPrx proxy;
     istr->read(proxy);
@@ -263,10 +281,11 @@ void
     }
     else
     {
-        v = new ::IceProxy::Ice::PropertiesAdmin;
+        v = new PropertiesAdmin;
         v->_copyFrom(proxy);
     }
 }
+/// \endcond
 
 ::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)
@@ -377,11 +396,13 @@ IceProxy::Ice::PropertiesAdmin::end_setProperties(const ::Ice::AsyncResultPtr& r
     _end(result, iceC_Ice_PropertiesAdmin_setProperties_name);
 }
 
+/// \cond INTERNAL
 ::IceProxy::Ice::Object*
 IceProxy::Ice::PropertiesAdmin::_newInstance() const
 {
     return new PropertiesAdmin;
 }
+/// \endcond
 
 const ::std::string&
 IceProxy::Ice::PropertiesAdmin::ice_staticId()
@@ -393,8 +414,10 @@ Ice::PropertiesAdmin::~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
 {
@@ -407,19 +430,19 @@ const ::std::string iceC_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(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>(&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_staticId();
 }
@@ -435,48 +458,54 @@ Ice::PropertiesAdmin::ice_staticId()
 #endif
 }
 
+/// \cond INTERNAL
 bool
-Ice::PropertiesAdmin::_iceD_getProperty(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::PropertiesAdmin::_iceD_getProperty(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::Normal, current.mode);
-    ::Ice::InputStream* istr = inS.startReadParams();
+    InputStream* istr = inS.startReadParams();
     ::std::string iceP_key;
     istr->read(iceP_key);
     inS.endReadParams();
     ::std::string ret = this->getProperty(iceP_key, current);
-    ::Ice::OutputStream* ostr = inS.startWriteParams();
+    OutputStream* ostr = inS.startWriteParams();
     ostr->write(ret);
     inS.endWriteParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::PropertiesAdmin::_iceD_getPropertiesForPrefix(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::PropertiesAdmin::_iceD_getPropertiesForPrefix(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::Normal, current.mode);
-    ::Ice::InputStream* istr = inS.startReadParams();
+    InputStream* istr = inS.startReadParams();
     ::std::string iceP_prefix;
     istr->read(iceP_prefix);
     inS.endReadParams();
-    ::Ice::PropertyDict ret = this->getPropertiesForPrefix(iceP_prefix, current);
-    ::Ice::OutputStream* ostr = inS.startWriteParams();
+    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 ::Ice::Current& current)
+Ice::PropertiesAdmin::_iceD_setProperties(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::Normal, current.mode);
-    ::Ice::InputStream* istr = inS.startReadParams();
-    ::Ice::PropertyDict iceP_newProperties;
+    InputStream* istr = inS.startReadParams();
+    PropertyDict iceP_newProperties;
     istr->read(iceP_newProperties);
     inS.endReadParams();
     this->setProperties(iceP_newProperties, current);
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
 namespace
 {
@@ -493,13 +522,14 @@ const ::std::string iceC_Ice_PropertiesAdmin_all[] =
 
 }
 
+/// \cond INTERNAL
 bool
-Ice::PropertiesAdmin::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+Ice::PropertiesAdmin::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
     ::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 - iceC_Ice_PropertiesAdmin_all)
@@ -535,36 +565,41 @@ Ice::PropertiesAdmin::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Cur
         default:
         {
             assert(false);
-            throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
         }
     }
 }
+/// \endcond
 
+/// \cond STREAM
 void
-Ice::PropertiesAdmin::_iceWriteImpl(::Ice::OutputStream* ostr) const
+Ice::PropertiesAdmin::_iceWriteImpl(OutputStream* ostr) const
 {
     ostr->startSlice(ice_staticId(), -1, true);
-    Ice::StreamWriter< ::Ice::PropertiesAdmin, ::Ice::OutputStream>::write(ostr, *this);
+    StreamWriter< PropertiesAdmin, OutputStream>::write(ostr, *this);
     ostr->endSlice();
 }
 
 void
-Ice::PropertiesAdmin::_iceReadImpl(::Ice::InputStream* istr)
+Ice::PropertiesAdmin::_iceReadImpl(InputStream* istr)
 {
     istr->startSlice();
-    Ice::StreamReader< ::Ice::PropertiesAdmin, ::Ice::InputStream>::read(istr, *this);
+    StreamReader< PropertiesAdmin, InputStream>::read(istr, *this);
     istr->endSlice();
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::_icePatchObjectPtr(PropertiesAdminPtr& handle, const ::Ice::ObjectPtr& v)
+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
 {