zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/cpp/src/Ice/PluginF.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>
 //
@@ -27,8 +27,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
 

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

@@ -86,7 +86,26 @@ Ice::PluginManagerI::initializePlugins()
     {
         for(PluginInfoList::iterator p = _plugins.begin(); p != _plugins.end(); ++p)
         {
-            p->plugin->initialize();
+            try
+            {
+                p->plugin->initialize();
+            }
+            catch(const Ice::PluginInitializationException&)
+            {
+                throw;
+            }
+            catch(const std::exception& ex)
+            {
+                ostringstream os;
+                os << "plugin `" << p->name << "' initialization failed:\n" << ex.what();
+                throw PluginInitializationException(__FILE__, __LINE__, os.str());
+            }
+            catch(...)
+            {
+                ostringstream os;
+                os << "plugin `" << p->name << "' initialization failed:\nunknown exception";
+                throw PluginInitializationException(__FILE__, __LINE__, os.str());
+            }
             initializedPlugins.push_back(p->plugin);
         }
     }
@@ -420,7 +439,7 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St
         args = properties->parseCommandLineOptions(name, args);
         cmdArgs = properties->parseCommandLineOptions(name, cmdArgs);
     }
-    
+
     PluginPtr plugin;
     PLUGIN_FACTORY factory = 0;
     DynamicLibraryPtr library;

data/ext/ice/cpp/src/Ice/Process.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
 
@@ -46,9 +52,9 @@ const ::std::string __Ice__Process__writeMessage_name = "writeMessage";
 
 }
 #ifdef __SUNPRO_CC
-class ICE_DECLSPEC_EXPORT IceProxy::Ice::Process;
+class ICE_API IceProxy::Ice::Process;
 #endif
-ICE_DECLSPEC_EXPORT ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::Process* p) { return p; }
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::Process* p) { return p; }
 
 void
 ::IceProxy::Ice::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Process>& v)
@@ -98,14 +104,14 @@ IceProxy::Ice::Process::end_shutdown(const ::Ice::AsyncResultPtr& __result)
 }
 
 void
-IceProxy::Ice::Process::writeMessage(const ::std::string& message, ::Ice::Int fd, const ::Ice::Context* __ctx)
+IceProxy::Ice::Process::writeMessage(const ::std::string& __p_message, ::Ice::Int __p_fd, const ::Ice::Context* __ctx)
 {
     ::IceInternal::Outgoing __og(this, __Ice__Process__writeMessage_name, ::Ice::Normal, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(message);
-        __os->write(fd);
+        __os->write(__p_message);
+        __os->write(__p_fd);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -116,15 +122,15 @@ IceProxy::Ice::Process::writeMessage(const ::std::string& message, ::Ice::Int fd
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::Process::begin_writeMessage(const ::std::string& message, ::Ice::Int fd, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::Process::begin_writeMessage(const ::std::string& __p_message, ::Ice::Int __p_fd, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__Process__writeMessage_name, __del, __cookie);
     try
     {
         __result->prepare(__Ice__Process__writeMessage_name, ::Ice::Normal, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(message);
-        __os->write(fd);
+        __os->write(__p_message);
+        __os->write(__p_fd);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -153,7 +159,7 @@ IceProxy::Ice::Process::__newInstance() const
     return new Process;
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::Object* Ice::upCast(::Ice::Process* p) { return p; }
+ICE_API ::Ice::Object* Ice::upCast(::Ice::Process* p) { return p; }
 
 namespace
 {
@@ -209,12 +215,12 @@ Ice::Process::___writeMessage(::IceInternal::Incoming& __inS, const ::Ice::Curre
 {
     __checkMode(::Ice::Normal, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string message;
-    ::Ice::Int fd;
-    __is->read(message);
-    __is->read(fd);
+    ::std::string __p_message;
+    ::Ice::Int __p_fd;
+    __is->read(__p_message);
+    __is->read(__p_fd);
     __inS.endReadParams();
-    writeMessage(message, fd, __current);
+    writeMessage(__p_message, __p_fd, __current);
     __inS.__writeEmptyParams();
     return ::Ice::DispatchOK;
 }
@@ -288,7 +294,7 @@ Ice::Process::__readImpl(::IceInternal::BasicStream* __is)
     __is->endReadSlice();
 }
 
-void ICE_DECLSPEC_EXPORT 
+void ICE_API 
 Ice::__patch(ProcessPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::Ice::ProcessPtr::dynamicCast(v);

data/ext/ice/cpp/src/Ice/ProcessF.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>
 //
@@ -28,8 +28,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
 

data/ext/ice/cpp/src/Ice/Properties.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
 
@@ -42,4 +48,4 @@ namespace
 
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::upCast(::Ice::Properties* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::Properties* p) { return p; }

data/ext/ice/cpp/src/Ice/PropertiesAdmin.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
 
@@ -63,9 +69,9 @@ IceAsync::Ice::AMD_PropertiesAdmin_setProperties::ice_response()
     }
 }
 #ifdef __SUNPRO_CC
-class ICE_DECLSPEC_EXPORT IceProxy::Ice::PropertiesAdmin;
+class ICE_API IceProxy::Ice::PropertiesAdmin;
 #endif
-ICE_DECLSPEC_EXPORT ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::PropertiesAdmin* p) { return p; }
+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)
@@ -84,14 +90,14 @@ void
 }
 
 ::std::string
-IceProxy::Ice::PropertiesAdmin::getProperty(const ::std::string& key, const ::Ice::Context* __ctx)
+IceProxy::Ice::PropertiesAdmin::getProperty(const ::std::string& __p_key, const ::Ice::Context* __ctx)
 {
     __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(key);
+        __os->write(__p_key);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -118,7 +124,7 @@ IceProxy::Ice::PropertiesAdmin::getProperty(const ::std::string& key, const ::Ic
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::PropertiesAdmin::begin_getProperty(const ::std::string& key, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::PropertiesAdmin::begin_getProperty(const ::std::string& __p_key, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     __checkAsyncTwowayOnly(__Ice__PropertiesAdmin__getProperty_name);
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__PropertiesAdmin__getProperty_name, __del, __cookie);
@@ -126,7 +132,7 @@ IceProxy::Ice::PropertiesAdmin::begin_getProperty(const ::std::string& key, cons
     {
         __result->prepare(__Ice__PropertiesAdmin__getProperty_name, ::Ice::Normal, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(key);
+        __os->write(__p_key);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -140,7 +146,7 @@ IceProxy::Ice::PropertiesAdmin::begin_getProperty(const ::std::string& key, cons
 #ifdef ICE_CPP11
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::PropertiesAdmin::__begin_getProperty(const ::std::string& 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)
+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)
 {
     class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
     {
@@ -176,7 +182,7 @@ IceProxy::Ice::PropertiesAdmin::__begin_getProperty(const ::std::string& key, co
         
         ::std::function<void (const ::std::string&)> _response;
     };
-    return begin_getProperty(key, __ctx, new Cpp11CB(__response, __exception, __sent));
+    return begin_getProperty(__p_key, __ctx, new Cpp11CB(__response, __exception, __sent));
 }
 #endif
 
@@ -203,14 +209,14 @@ IceProxy::Ice::PropertiesAdmin::end_getProperty(const ::Ice::AsyncResultPtr& __r
 }
 
 ::Ice::PropertyDict
-IceProxy::Ice::PropertiesAdmin::getPropertiesForPrefix(const ::std::string& prefix, const ::Ice::Context* __ctx)
+IceProxy::Ice::PropertiesAdmin::getPropertiesForPrefix(const ::std::string& __p_prefix, const ::Ice::Context* __ctx)
 {
     __checkTwowayOnly(__Ice__PropertiesAdmin__getPropertiesForPrefix_name);
     ::IceInternal::Outgoing __og(this, __Ice__PropertiesAdmin__getPropertiesForPrefix_name, ::Ice::Normal, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(prefix);
+        __os->write(__p_prefix);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -237,7 +243,7 @@ IceProxy::Ice::PropertiesAdmin::getPropertiesForPrefix(const ::std::string& pref
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::PropertiesAdmin::begin_getPropertiesForPrefix(const ::std::string& prefix, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::PropertiesAdmin::begin_getPropertiesForPrefix(const ::std::string& __p_prefix, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     __checkAsyncTwowayOnly(__Ice__PropertiesAdmin__getPropertiesForPrefix_name);
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__PropertiesAdmin__getPropertiesForPrefix_name, __del, __cookie);
@@ -245,7 +251,7 @@ IceProxy::Ice::PropertiesAdmin::begin_getPropertiesForPrefix(const ::std::string
     {
         __result->prepare(__Ice__PropertiesAdmin__getPropertiesForPrefix_name, ::Ice::Normal, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(prefix);
+        __os->write(__p_prefix);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -259,7 +265,7 @@ IceProxy::Ice::PropertiesAdmin::begin_getPropertiesForPrefix(const ::std::string
 #ifdef ICE_CPP11
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::PropertiesAdmin::__begin_getPropertiesForPrefix(const ::std::string& 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)
+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
     {
@@ -295,7 +301,7 @@ IceProxy::Ice::PropertiesAdmin::__begin_getPropertiesForPrefix(const ::std::stri
         
         ::std::function<void (const ::Ice::PropertyDict&)> _response;
     };
-    return begin_getPropertiesForPrefix(prefix, __ctx, new Cpp11CB(__response, __exception, __sent));
+    return begin_getPropertiesForPrefix(__p_prefix, __ctx, new Cpp11CB(__response, __exception, __sent));
 }
 #endif
 
@@ -322,13 +328,13 @@ IceProxy::Ice::PropertiesAdmin::end_getPropertiesForPrefix(const ::Ice::AsyncRes
 }
 
 void
-IceProxy::Ice::PropertiesAdmin::setProperties(const ::Ice::PropertyDict& newProperties, const ::Ice::Context* __ctx)
+IceProxy::Ice::PropertiesAdmin::setProperties(const ::Ice::PropertyDict& __p_newProperties, const ::Ice::Context* __ctx)
 {
     ::IceInternal::Outgoing __og(this, __Ice__PropertiesAdmin__setProperties_name, ::Ice::Normal, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(newProperties);
+        __os->write(__p_newProperties);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -339,14 +345,14 @@ IceProxy::Ice::PropertiesAdmin::setProperties(const ::Ice::PropertyDict& newProp
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::PropertiesAdmin::begin_setProperties(const ::Ice::PropertyDict& newProperties, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::PropertiesAdmin::begin_setProperties(const ::Ice::PropertyDict& __p_newProperties, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     ::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(newProperties);
+        __os->write(__p_newProperties);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -375,7 +381,7 @@ IceProxy::Ice::PropertiesAdmin::__newInstance() const
     return new PropertiesAdmin;
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::Object* Ice::upCast(::Ice::PropertiesAdmin* p) { return p; }
+ICE_API ::Ice::Object* Ice::upCast(::Ice::PropertiesAdmin* p) { return p; }
 
 namespace
 {
@@ -421,10 +427,10 @@ Ice::PropertiesAdmin::___getProperty(::IceInternal::Incoming& __inS, const ::Ice
 {
     __checkMode(::Ice::Normal, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string key;
-    __is->read(key);
+    ::std::string __p_key;
+    __is->read(__p_key);
     __inS.endReadParams();
-    ::std::string __ret = getProperty(key, __current);
+    ::std::string __ret = getProperty(__p_key, __current);
     ::IceInternal::BasicStream* __os = __inS.__startWriteParams(::Ice::DefaultFormat);
     __os->write(__ret);
     __inS.__endWriteParams(true);
@@ -436,10 +442,10 @@ Ice::PropertiesAdmin::___getPropertiesForPrefix(::IceInternal::Incoming& __inS,
 {
     __checkMode(::Ice::Normal, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string prefix;
-    __is->read(prefix);
+    ::std::string __p_prefix;
+    __is->read(__p_prefix);
     __inS.endReadParams();
-    ::Ice::PropertyDict __ret = getPropertiesForPrefix(prefix, __current);
+    ::Ice::PropertyDict __ret = getPropertiesForPrefix(__p_prefix, __current);
     ::IceInternal::BasicStream* __os = __inS.__startWriteParams(::Ice::DefaultFormat);
     __os->write(__ret);
     __inS.__endWriteParams(true);
@@ -451,13 +457,13 @@ Ice::PropertiesAdmin::___setProperties(::IceInternal::Incoming& __inS, const ::I
 {
     __checkMode(::Ice::Normal, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::Ice::PropertyDict newProperties;
-    __is->read(newProperties);
+    ::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, newProperties, __current);
+        setProperties_async(__cb, __p_newProperties, __current);
     }
     catch(const ::std::exception& __ex)
     {
@@ -544,7 +550,7 @@ Ice::PropertiesAdmin::__readImpl(::IceInternal::BasicStream* __is)
     __is->endReadSlice();
 }
 
-void ICE_DECLSPEC_EXPORT 
+void ICE_API 
 Ice::__patch(PropertiesAdminPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::Ice::PropertiesAdminPtr::dynamicCast(v);