zeroc-ice 3.6b1 → 3.6.0

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

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

@@ -0,0 +1,28 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Ice/RegisterPlugins.h>
+#include <Ice/CommunicatorF.h>
+#include <Ice/Initialize.h>
+
+extern "C"
+{
+
+Ice::Plugin* createIceUDP(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&);
+Ice::Plugin* createIceTCP(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&);
+Ice::Plugin* createStringConverter(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&);
+
+};
+
+IceInternal::RegisterPluginsInit::RegisterPluginsInit()
+{
+    Ice::registerPluginFactory("IceUDP", createIceUDP, true);
+    Ice::registerPluginFactory("IceTCP", createIceTCP, true);
+    Ice::registerPluginFactory("IceStringConverter", createStringConverter, false);
+}

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

@@ -0,0 +1,25 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 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_REGISTER_PLUGINS_H
+#define ICE_REGISTER_PLUGINS_H
+
+namespace IceInternal
+{
+
+class RegisterPluginsInit
+{
+public:
+
+    RegisterPluginsInit();
+};
+
+}
+
+#endif

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -32,8 +32,14 @@
 #include <IceUtil/PopDisableWarnings.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif
 
@@ -97,15 +103,15 @@ Ice::RemoteLoggerAlreadyAttachedException::__readImpl(::IceInternal::BasicStream
 
 namespace Ice
 {
-#ifdef ICE_HAS_DECLSPEC_IMPORT_EXPORT
+#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_STATIC_LIBS)
 template struct ICE_API StreamWriter< ::Ice::LogMessage, ::IceInternal::BasicStream>;
 template struct ICE_API StreamReader< ::Ice::LogMessage, ::IceInternal::BasicStream>;
 #endif
 }
 #ifdef __SUNPRO_CC
-class ICE_DECLSPEC_EXPORT IceProxy::Ice::RemoteLogger;
+class ICE_API IceProxy::Ice::RemoteLogger;
 #endif
-ICE_DECLSPEC_EXPORT ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::RemoteLogger* p) { return p; }
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::RemoteLogger* p) { return p; }
 
 void
 ::IceProxy::Ice::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::Ice::RemoteLogger>& v)
@@ -124,14 +130,14 @@ void
 }
 
 void
-IceProxy::Ice::RemoteLogger::init(const ::std::string& prefix, const ::Ice::LogMessageSeq& logMessages, const ::Ice::Context* __ctx)
+IceProxy::Ice::RemoteLogger::init(const ::std::string& __p_prefix, const ::Ice::LogMessageSeq& __p_logMessages, const ::Ice::Context* __ctx)
 {
     ::IceInternal::Outgoing __og(this, __Ice__RemoteLogger__init_name, ::Ice::Normal, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(prefix);
-        __os->write(logMessages);
+        __os->write(__p_prefix);
+        __os->write(__p_logMessages);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -142,15 +148,15 @@ IceProxy::Ice::RemoteLogger::init(const ::std::string& prefix, const ::Ice::LogM
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::RemoteLogger::begin_init(const ::std::string& prefix, const ::Ice::LogMessageSeq& logMessages, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::RemoteLogger::begin_init(const ::std::string& __p_prefix, const ::Ice::LogMessageSeq& __p_logMessages, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__RemoteLogger__init_name, __del, __cookie);
     try
     {
         __result->prepare(__Ice__RemoteLogger__init_name, ::Ice::Normal, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(prefix);
-        __os->write(logMessages);
+        __os->write(__p_prefix);
+        __os->write(__p_logMessages);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -168,13 +174,13 @@ IceProxy::Ice::RemoteLogger::end_init(const ::Ice::AsyncResultPtr& __result)
 }
 
 void
-IceProxy::Ice::RemoteLogger::log(const ::Ice::LogMessage& message, const ::Ice::Context* __ctx)
+IceProxy::Ice::RemoteLogger::log(const ::Ice::LogMessage& __p_message, const ::Ice::Context* __ctx)
 {
     ::IceInternal::Outgoing __og(this, __Ice__RemoteLogger__log_name, ::Ice::Normal, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(message);
+        __os->write(__p_message);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -185,14 +191,14 @@ IceProxy::Ice::RemoteLogger::log(const ::Ice::LogMessage& message, const ::Ice::
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::RemoteLogger::begin_log(const ::Ice::LogMessage& message, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::RemoteLogger::begin_log(const ::Ice::LogMessage& __p_message, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__RemoteLogger__log_name, __del, __cookie);
     try
     {
         __result->prepare(__Ice__RemoteLogger__log_name, ::Ice::Normal, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(message);
+        __os->write(__p_message);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -221,9 +227,9 @@ IceProxy::Ice::RemoteLogger::__newInstance() const
     return new RemoteLogger;
 }
 #ifdef __SUNPRO_CC
-class ICE_DECLSPEC_EXPORT IceProxy::Ice::LoggerAdmin;
+class ICE_API IceProxy::Ice::LoggerAdmin;
 #endif
-ICE_DECLSPEC_EXPORT ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::LoggerAdmin* p) { return p; }
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::LoggerAdmin* p) { return p; }
 
 void
 ::IceProxy::Ice::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::Ice::LoggerAdmin>& v)
@@ -242,17 +248,17 @@ void
 }
 
 void
-IceProxy::Ice::LoggerAdmin::attachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx, const ::Ice::LogMessageTypeSeq& messageTypes, const ::Ice::StringSeq& traceCategories, ::Ice::Int messageMax, const ::Ice::Context* __ctx)
+IceProxy::Ice::LoggerAdmin::attachRemoteLogger(const ::Ice::RemoteLoggerPrx& __p_prx, const ::Ice::LogMessageTypeSeq& __p_messageTypes, const ::Ice::StringSeq& __p_traceCategories, ::Ice::Int __p_messageMax, const ::Ice::Context* __ctx)
 {
     __checkTwowayOnly(__Ice__LoggerAdmin__attachRemoteLogger_name);
     ::IceInternal::Outgoing __og(this, __Ice__LoggerAdmin__attachRemoteLogger_name, ::Ice::Normal, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(prx);
-        __os->write(messageTypes);
-        __os->write(traceCategories);
-        __os->write(messageMax);
+        __os->write(__p_prx);
+        __os->write(__p_messageTypes);
+        __os->write(__p_traceCategories);
+        __os->write(__p_messageMax);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -278,7 +284,7 @@ IceProxy::Ice::LoggerAdmin::attachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LoggerAdmin::begin_attachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx, const ::Ice::LogMessageTypeSeq& messageTypes, const ::Ice::StringSeq& traceCategories, ::Ice::Int messageMax, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::LoggerAdmin::begin_attachRemoteLogger(const ::Ice::RemoteLoggerPrx& __p_prx, const ::Ice::LogMessageTypeSeq& __p_messageTypes, const ::Ice::StringSeq& __p_traceCategories, ::Ice::Int __p_messageMax, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     __checkAsyncTwowayOnly(__Ice__LoggerAdmin__attachRemoteLogger_name);
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__LoggerAdmin__attachRemoteLogger_name, __del, __cookie);
@@ -286,10 +292,10 @@ IceProxy::Ice::LoggerAdmin::begin_attachRemoteLogger(const ::Ice::RemoteLoggerPr
     {
         __result->prepare(__Ice__LoggerAdmin__attachRemoteLogger_name, ::Ice::Normal, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(prx);
-        __os->write(messageTypes);
-        __os->write(traceCategories);
-        __os->write(messageMax);
+        __os->write(__p_prx);
+        __os->write(__p_messageTypes);
+        __os->write(__p_traceCategories);
+        __os->write(__p_messageMax);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -303,7 +309,7 @@ IceProxy::Ice::LoggerAdmin::begin_attachRemoteLogger(const ::Ice::RemoteLoggerPr
 #ifdef ICE_CPP11
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LoggerAdmin::__begin_attachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx, const ::Ice::LogMessageTypeSeq& messageTypes, const ::Ice::StringSeq& traceCategories, ::Ice::Int messageMax, const ::Ice::Context* __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+IceProxy::Ice::LoggerAdmin::__begin_attachRemoteLogger(const ::Ice::RemoteLoggerPrx& __p_prx, const ::Ice::LogMessageTypeSeq& __p_messageTypes, const ::Ice::StringSeq& __p_traceCategories, ::Ice::Int __p_messageMax, const ::Ice::Context* __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
 {
     class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
     {
@@ -338,7 +344,7 @@ IceProxy::Ice::LoggerAdmin::__begin_attachRemoteLogger(const ::Ice::RemoteLogger
         
         ::std::function<void ()> _response;
     };
-    return begin_attachRemoteLogger(prx, messageTypes, traceCategories, messageMax, __ctx, new Cpp11CB(__response, __exception, __sent));
+    return begin_attachRemoteLogger(__p_prx, __p_messageTypes, __p_traceCategories, __p_messageMax, __ctx, new Cpp11CB(__response, __exception, __sent));
 }
 #endif
 
@@ -365,14 +371,14 @@ IceProxy::Ice::LoggerAdmin::end_attachRemoteLogger(const ::Ice::AsyncResultPtr&
 }
 
 bool
-IceProxy::Ice::LoggerAdmin::detachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx, const ::Ice::Context* __ctx)
+IceProxy::Ice::LoggerAdmin::detachRemoteLogger(const ::Ice::RemoteLoggerPrx& __p_prx, const ::Ice::Context* __ctx)
 {
     __checkTwowayOnly(__Ice__LoggerAdmin__detachRemoteLogger_name);
     ::IceInternal::Outgoing __og(this, __Ice__LoggerAdmin__detachRemoteLogger_name, ::Ice::Normal, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(prx);
+        __os->write(__p_prx);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -399,7 +405,7 @@ IceProxy::Ice::LoggerAdmin::detachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LoggerAdmin::begin_detachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::LoggerAdmin::begin_detachRemoteLogger(const ::Ice::RemoteLoggerPrx& __p_prx, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     __checkAsyncTwowayOnly(__Ice__LoggerAdmin__detachRemoteLogger_name);
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__LoggerAdmin__detachRemoteLogger_name, __del, __cookie);
@@ -407,7 +413,7 @@ IceProxy::Ice::LoggerAdmin::begin_detachRemoteLogger(const ::Ice::RemoteLoggerPr
     {
         __result->prepare(__Ice__LoggerAdmin__detachRemoteLogger_name, ::Ice::Normal, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(prx);
+        __os->write(__p_prx);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -421,7 +427,7 @@ IceProxy::Ice::LoggerAdmin::begin_detachRemoteLogger(const ::Ice::RemoteLoggerPr
 #ifdef ICE_CPP11
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LoggerAdmin::__begin_detachRemoteLogger(const ::Ice::RemoteLoggerPrx& prx, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (bool)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+IceProxy::Ice::LoggerAdmin::__begin_detachRemoteLogger(const ::Ice::RemoteLoggerPrx& __p_prx, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (bool)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
 {
     class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
     {
@@ -457,7 +463,7 @@ IceProxy::Ice::LoggerAdmin::__begin_detachRemoteLogger(const ::Ice::RemoteLogger
         
         ::std::function<void (bool)> _response;
     };
-    return begin_detachRemoteLogger(prx, __ctx, new Cpp11CB(__response, __exception, __sent));
+    return begin_detachRemoteLogger(__p_prx, __ctx, new Cpp11CB(__response, __exception, __sent));
 }
 #endif
 
@@ -484,16 +490,16 @@ IceProxy::Ice::LoggerAdmin::end_detachRemoteLogger(const ::Ice::AsyncResultPtr&
 }
 
 ::Ice::LogMessageSeq
-IceProxy::Ice::LoggerAdmin::getLog(const ::Ice::LogMessageTypeSeq& messageTypes, const ::Ice::StringSeq& traceCategories, ::Ice::Int messageMax, ::std::string& prefix, const ::Ice::Context* __ctx)
+IceProxy::Ice::LoggerAdmin::getLog(const ::Ice::LogMessageTypeSeq& __p_messageTypes, const ::Ice::StringSeq& __p_traceCategories, ::Ice::Int __p_messageMax, ::std::string& __p_prefix, const ::Ice::Context* __ctx)
 {
     __checkTwowayOnly(__Ice__LoggerAdmin__getLog_name);
     ::IceInternal::Outgoing __og(this, __Ice__LoggerAdmin__getLog_name, ::Ice::Normal, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(messageTypes);
-        __os->write(traceCategories);
-        __os->write(messageMax);
+        __os->write(__p_messageTypes);
+        __os->write(__p_traceCategories);
+        __os->write(__p_messageMax);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -514,14 +520,14 @@ IceProxy::Ice::LoggerAdmin::getLog(const ::Ice::LogMessageTypeSeq& messageTypes,
     }
     ::Ice::LogMessageSeq __ret;
     ::IceInternal::BasicStream* __is = __og.startReadParams();
-    __is->read(prefix);
+    __is->read(__p_prefix);
     __is->read(__ret);
     __og.endReadParams();
     return __ret;
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LoggerAdmin::begin_getLog(const ::Ice::LogMessageTypeSeq& messageTypes, const ::Ice::StringSeq& traceCategories, ::Ice::Int messageMax, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::LoggerAdmin::begin_getLog(const ::Ice::LogMessageTypeSeq& __p_messageTypes, const ::Ice::StringSeq& __p_traceCategories, ::Ice::Int __p_messageMax, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     __checkAsyncTwowayOnly(__Ice__LoggerAdmin__getLog_name);
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__LoggerAdmin__getLog_name, __del, __cookie);
@@ -529,9 +535,9 @@ IceProxy::Ice::LoggerAdmin::begin_getLog(const ::Ice::LogMessageTypeSeq& message
     {
         __result->prepare(__Ice__LoggerAdmin__getLog_name, ::Ice::Normal, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(messageTypes);
-        __os->write(traceCategories);
-        __os->write(messageMax);
+        __os->write(__p_messageTypes);
+        __os->write(__p_traceCategories);
+        __os->write(__p_messageMax);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -545,7 +551,7 @@ IceProxy::Ice::LoggerAdmin::begin_getLog(const ::Ice::LogMessageTypeSeq& message
 #ifdef ICE_CPP11
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LoggerAdmin::__begin_getLog(const ::Ice::LogMessageTypeSeq& messageTypes, const ::Ice::StringSeq& traceCategories, ::Ice::Int messageMax, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::LogMessageSeq&, const ::std::string&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+IceProxy::Ice::LoggerAdmin::__begin_getLog(const ::Ice::LogMessageTypeSeq& __p_messageTypes, const ::Ice::StringSeq& __p_traceCategories, ::Ice::Int __p_messageMax, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::LogMessageSeq&, const ::std::string&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
 {
     class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
     {
@@ -561,11 +567,11 @@ IceProxy::Ice::LoggerAdmin::__begin_getLog(const ::Ice::LogMessageTypeSeq& messa
         virtual void completed(const ::Ice::AsyncResultPtr& __result) const
         {
             ::Ice::LoggerAdminPrx __proxy = ::Ice::LoggerAdminPrx::uncheckedCast(__result->getProxy());
-            ::std::string prefix;
+            ::std::string __p_prefix;
             ::Ice::LogMessageSeq __ret;
             try
             {
-                __ret = __proxy->end_getLog(prefix, __result);
+                __ret = __proxy->end_getLog(__p_prefix, __result);
             }
             catch(const ::Ice::Exception& ex)
             {
@@ -574,7 +580,7 @@ IceProxy::Ice::LoggerAdmin::__begin_getLog(const ::Ice::LogMessageTypeSeq& messa
             }
             if(_response != nullptr)
             {
-                _response(__ret, prefix);
+                _response(__ret, __p_prefix);
             }
         }
     
@@ -582,12 +588,12 @@ IceProxy::Ice::LoggerAdmin::__begin_getLog(const ::Ice::LogMessageTypeSeq& messa
         
         ::std::function<void (const ::Ice::LogMessageSeq&, const ::std::string&)> _response;
     };
-    return begin_getLog(messageTypes, traceCategories, messageMax, __ctx, new Cpp11CB(__response, __exception, __sent));
+    return begin_getLog(__p_messageTypes, __p_traceCategories, __p_messageMax, __ctx, new Cpp11CB(__response, __exception, __sent));
 }
 #endif
 
 ::Ice::LogMessageSeq
-IceProxy::Ice::LoggerAdmin::end_getLog(::std::string& prefix, const ::Ice::AsyncResultPtr& __result)
+IceProxy::Ice::LoggerAdmin::end_getLog(::std::string& __p_prefix, const ::Ice::AsyncResultPtr& __result)
 {
     ::Ice::AsyncResult::__check(__result, this, __Ice__LoggerAdmin__getLog_name);
     ::Ice::LogMessageSeq __ret;
@@ -603,7 +609,7 @@ IceProxy::Ice::LoggerAdmin::end_getLog(::std::string& prefix, const ::Ice::Async
         }
     }
     ::IceInternal::BasicStream* __is = __result->__startReadParams();
-    __is->read(prefix);
+    __is->read(__p_prefix);
     __is->read(__ret);
     __result->__endReadParams();
     return __ret;
@@ -621,7 +627,7 @@ IceProxy::Ice::LoggerAdmin::__newInstance() const
     return new LoggerAdmin;
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::Object* Ice::upCast(::Ice::RemoteLogger* p) { return p; }
+ICE_API ::Ice::Object* Ice::upCast(::Ice::RemoteLogger* p) { return p; }
 
 namespace
 {
@@ -667,12 +673,12 @@ Ice::RemoteLogger::___init(::IceInternal::Incoming& __inS, const ::Ice::Current&
 {
     __checkMode(::Ice::Normal, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string prefix;
-    ::Ice::LogMessageSeq logMessages;
-    __is->read(prefix);
-    __is->read(logMessages);
+    ::std::string __p_prefix;
+    ::Ice::LogMessageSeq __p_logMessages;
+    __is->read(__p_prefix);
+    __is->read(__p_logMessages);
     __inS.endReadParams();
-    init(prefix, logMessages, __current);
+    init(__p_prefix, __p_logMessages, __current);
     __inS.__writeEmptyParams();
     return ::Ice::DispatchOK;
 }
@@ -682,10 +688,10 @@ Ice::RemoteLogger::___log(::IceInternal::Incoming& __inS, const ::Ice::Current&
 {
     __checkMode(::Ice::Normal, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::Ice::LogMessage message;
-    __is->read(message);
+    ::Ice::LogMessage __p_message;
+    __is->read(__p_message);
     __inS.endReadParams();
-    log(message, __current);
+    log(__p_message, __current);
     __inS.__writeEmptyParams();
     return ::Ice::DispatchOK;
 }
@@ -759,7 +765,7 @@ Ice::RemoteLogger::__readImpl(::IceInternal::BasicStream* __is)
     __is->endReadSlice();
 }
 
-void ICE_DECLSPEC_EXPORT 
+void ICE_API 
 Ice::__patch(RemoteLoggerPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::Ice::RemoteLoggerPtr::dynamicCast(v);
@@ -769,7 +775,7 @@ Ice::__patch(RemoteLoggerPtr& handle, const ::Ice::ObjectPtr& v)
     }
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::Object* Ice::upCast(::Ice::LoggerAdmin* p) { return p; }
+ICE_API ::Ice::Object* Ice::upCast(::Ice::LoggerAdmin* p) { return p; }
 
 namespace
 {
@@ -815,18 +821,18 @@ Ice::LoggerAdmin::___attachRemoteLogger(::IceInternal::Incoming& __inS, const ::
 {
     __checkMode(::Ice::Normal, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::Ice::RemoteLoggerPrx prx;
-    ::Ice::LogMessageTypeSeq messageTypes;
-    ::Ice::StringSeq traceCategories;
-    ::Ice::Int messageMax;
-    __is->read(prx);
-    __is->read(messageTypes);
-    __is->read(traceCategories);
-    __is->read(messageMax);
+    ::Ice::RemoteLoggerPrx __p_prx;
+    ::Ice::LogMessageTypeSeq __p_messageTypes;
+    ::Ice::StringSeq __p_traceCategories;
+    ::Ice::Int __p_messageMax;
+    __is->read(__p_prx);
+    __is->read(__p_messageTypes);
+    __is->read(__p_traceCategories);
+    __is->read(__p_messageMax);
     __inS.endReadParams();
     try
     {
-        attachRemoteLogger(prx, messageTypes, traceCategories, messageMax, __current);
+        attachRemoteLogger(__p_prx, __p_messageTypes, __p_traceCategories, __p_messageMax, __current);
         __inS.__writeEmptyParams();
         return ::Ice::DispatchOK;
     }
@@ -842,10 +848,10 @@ Ice::LoggerAdmin::___detachRemoteLogger(::IceInternal::Incoming& __inS, const ::
 {
     __checkMode(::Ice::Normal, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::Ice::RemoteLoggerPrx prx;
-    __is->read(prx);
+    ::Ice::RemoteLoggerPrx __p_prx;
+    __is->read(__p_prx);
     __inS.endReadParams();
-    bool __ret = detachRemoteLogger(prx, __current);
+    bool __ret = detachRemoteLogger(__p_prx, __current);
     ::IceInternal::BasicStream* __os = __inS.__startWriteParams(::Ice::DefaultFormat);
     __os->write(__ret);
     __inS.__endWriteParams(true);
@@ -857,17 +863,17 @@ Ice::LoggerAdmin::___getLog(::IceInternal::Incoming& __inS, const ::Ice::Current
 {
     __checkMode(::Ice::Normal, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::Ice::LogMessageTypeSeq messageTypes;
-    ::Ice::StringSeq traceCategories;
-    ::Ice::Int messageMax;
-    __is->read(messageTypes);
-    __is->read(traceCategories);
-    __is->read(messageMax);
+    ::Ice::LogMessageTypeSeq __p_messageTypes;
+    ::Ice::StringSeq __p_traceCategories;
+    ::Ice::Int __p_messageMax;
+    __is->read(__p_messageTypes);
+    __is->read(__p_traceCategories);
+    __is->read(__p_messageMax);
     __inS.endReadParams();
-    ::std::string prefix;
-    ::Ice::LogMessageSeq __ret = getLog(messageTypes, traceCategories, messageMax, prefix, __current);
+    ::std::string __p_prefix;
+    ::Ice::LogMessageSeq __ret = getLog(__p_messageTypes, __p_traceCategories, __p_messageMax, __p_prefix, __current);
     ::IceInternal::BasicStream* __os = __inS.__startWriteParams(::Ice::DefaultFormat);
-    __os->write(prefix);
+    __os->write(__p_prefix);
     __os->write(__ret);
     __inS.__endWriteParams(true);
     return ::Ice::DispatchOK;
@@ -947,7 +953,7 @@ Ice::LoggerAdmin::__readImpl(::IceInternal::BasicStream* __is)
     __is->endReadSlice();
 }
 
-void ICE_DECLSPEC_EXPORT 
+void ICE_API 
 Ice::__patch(LoggerAdminPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::Ice::LoggerAdminPtr::dynamicCast(v);