zeroc-ice 3.6b1 → 3.6.0

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

@@ -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/LoggerAdminI.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/LoggerF.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/LoggerI.cpp

@@ -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.
@@ -48,7 +48,7 @@ Init init;
 
 }
 
-Ice::LoggerI::LoggerI(const string& prefix, const string& file, 
+Ice::LoggerI::LoggerI(const string& prefix, const string& file,
                       bool convert, const IceUtil::StringConverterPtr& converter) :
     _prefix(prefix),
     _convert(convert),
@@ -148,12 +148,12 @@ Ice::LoggerI::write(const string& message, bool indent)
     }
     else
     {
-#if !defined(_WIN32) || defined(ICE_OS_WINRT)
-        cerr << s << endl;
-#else
+#if defined(ICE_OS_WINRT)
+        OutputDebugString(IceUtil::stringToWstring(s).c_str());
+#elif defined(_WIN32)
         //
         // Convert the message from the native narrow string encoding to the console
-        // code page encoding for printing. If the _convert member is set to false 
+        // code page encoding for printing. If the _convert member is set to false
         // we don't do any conversion.
         //
         if(!_convert)
@@ -172,11 +172,11 @@ Ice::LoggerI::write(const string& message, bool indent)
             {
                 // Convert message to UTF-8
                 string u8s = IceUtil::nativeToUTF8(s, _converter);
-                
+
                 // Then from UTF-8 to console CP
                 string consoleString;
                 _consoleConverter->fromUTF8(reinterpret_cast<const Byte*>(u8s.data()),
-                                            reinterpret_cast<const Byte*>(u8s.data() + u8s.size()), 
+                                            reinterpret_cast<const Byte*>(u8s.data() + u8s.size()),
                                             consoleString);
 
                 // We cannot use cerr here as writing to console using cerr
@@ -194,6 +194,8 @@ Ice::LoggerI::write(const string& message, bool indent)
             }
             fflush(stderr);
         }
+#else
+        cerr << s << endl;
 #endif
     }
 }

data/ext/ice/cpp/src/Ice/LoggerI.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/LoggerUtil.cpp

@@ -1,7 +1,7 @@
 
 // **********************************************************************
 //
-// 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.
@@ -19,7 +19,7 @@ using namespace std;
 namespace IceUtilInternal
 {
 
-extern bool ICE_DECLSPEC_IMPORT printStackTraces;
+extern bool ICE_UTIL_API printStackTraces;
 
 }
 

data/ext/ice/cpp/src/Ice/Metrics.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
 
@@ -99,15 +105,15 @@ IceMX::UnknownMetricsView::__readImpl(::IceInternal::BasicStream* __is)
 
 namespace Ice
 {
-#ifdef ICE_HAS_DECLSPEC_IMPORT_EXPORT
+#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_STATIC_LIBS)
 template struct ICE_API StreamWriter< ::IceMX::MetricsFailures, ::IceInternal::BasicStream>;
 template struct ICE_API StreamReader< ::IceMX::MetricsFailures, ::IceInternal::BasicStream>;
 #endif
 }
 #ifdef __SUNPRO_CC
-class ICE_DECLSPEC_EXPORT IceProxy::IceMX::Metrics;
+class ICE_API IceProxy::IceMX::Metrics;
 #endif
-ICE_DECLSPEC_EXPORT ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::Metrics* p) { return p; }
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::Metrics* p) { return p; }
 
 void
 ::IceProxy::IceMX::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::Metrics>& v)
@@ -137,9 +143,9 @@ IceProxy::IceMX::Metrics::__newInstance() const
     return new Metrics;
 }
 #ifdef __SUNPRO_CC
-class ICE_DECLSPEC_EXPORT IceProxy::IceMX::MetricsAdmin;
+class ICE_API IceProxy::IceMX::MetricsAdmin;
 #endif
-ICE_DECLSPEC_EXPORT ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::MetricsAdmin* p) { return p; }
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::MetricsAdmin* p) { return p; }
 
 void
 ::IceProxy::IceMX::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::MetricsAdmin>& v)
@@ -158,7 +164,7 @@ void
 }
 
 ::Ice::StringSeq
-IceProxy::IceMX::MetricsAdmin::getMetricsViewNames(::Ice::StringSeq& disabledViews, const ::Ice::Context* __ctx)
+IceProxy::IceMX::MetricsAdmin::getMetricsViewNames(::Ice::StringSeq& __p_disabledViews, const ::Ice::Context* __ctx)
 {
     __checkTwowayOnly(__IceMX__MetricsAdmin__getMetricsViewNames_name);
     ::IceInternal::Outgoing __og(this, __IceMX__MetricsAdmin__getMetricsViewNames_name, ::Ice::Normal, __ctx);
@@ -177,7 +183,7 @@ IceProxy::IceMX::MetricsAdmin::getMetricsViewNames(::Ice::StringSeq& disabledVie
     }
     ::Ice::StringSeq __ret;
     ::IceInternal::BasicStream* __is = __og.startReadParams();
-    __is->read(disabledViews);
+    __is->read(__p_disabledViews);
     __is->read(__ret);
     __og.endReadParams();
     return __ret;
@@ -220,11 +226,11 @@ IceProxy::IceMX::MetricsAdmin::__begin_getMetricsViewNames(const ::Ice::Context*
         virtual void completed(const ::Ice::AsyncResultPtr& __result) const
         {
             ::IceMX::MetricsAdminPrx __proxy = ::IceMX::MetricsAdminPrx::uncheckedCast(__result->getProxy());
-            ::Ice::StringSeq disabledViews;
+            ::Ice::StringSeq __p_disabledViews;
             ::Ice::StringSeq __ret;
             try
             {
-                __ret = __proxy->end_getMetricsViewNames(disabledViews, __result);
+                __ret = __proxy->end_getMetricsViewNames(__p_disabledViews, __result);
             }
             catch(const ::Ice::Exception& ex)
             {
@@ -233,7 +239,7 @@ IceProxy::IceMX::MetricsAdmin::__begin_getMetricsViewNames(const ::Ice::Context*
             }
             if(_response != nullptr)
             {
-                _response(__ret, disabledViews);
+                _response(__ret, __p_disabledViews);
             }
         }
     
@@ -246,7 +252,7 @@ IceProxy::IceMX::MetricsAdmin::__begin_getMetricsViewNames(const ::Ice::Context*
 #endif
 
 ::Ice::StringSeq
-IceProxy::IceMX::MetricsAdmin::end_getMetricsViewNames(::Ice::StringSeq& disabledViews, const ::Ice::AsyncResultPtr& __result)
+IceProxy::IceMX::MetricsAdmin::end_getMetricsViewNames(::Ice::StringSeq& __p_disabledViews, const ::Ice::AsyncResultPtr& __result)
 {
     ::Ice::AsyncResult::__check(__result, this, __IceMX__MetricsAdmin__getMetricsViewNames_name);
     ::Ice::StringSeq __ret;
@@ -262,21 +268,21 @@ IceProxy::IceMX::MetricsAdmin::end_getMetricsViewNames(::Ice::StringSeq& disable
         }
     }
     ::IceInternal::BasicStream* __is = __result->__startReadParams();
-    __is->read(disabledViews);
+    __is->read(__p_disabledViews);
     __is->read(__ret);
     __result->__endReadParams();
     return __ret;
 }
 
 void
-IceProxy::IceMX::MetricsAdmin::enableMetricsView(const ::std::string& name, const ::Ice::Context* __ctx)
+IceProxy::IceMX::MetricsAdmin::enableMetricsView(const ::std::string& __p_name, const ::Ice::Context* __ctx)
 {
     __checkTwowayOnly(__IceMX__MetricsAdmin__enableMetricsView_name);
     ::IceInternal::Outgoing __og(this, __IceMX__MetricsAdmin__enableMetricsView_name, ::Ice::Normal, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::SlicedFormat);
-        __os->write(name);
+        __os->write(__p_name);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -302,7 +308,7 @@ IceProxy::IceMX::MetricsAdmin::enableMetricsView(const ::std::string& name, cons
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::IceMX::MetricsAdmin::begin_enableMetricsView(const ::std::string& name, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::IceMX::MetricsAdmin::begin_enableMetricsView(const ::std::string& __p_name, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     __checkAsyncTwowayOnly(__IceMX__MetricsAdmin__enableMetricsView_name);
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __IceMX__MetricsAdmin__enableMetricsView_name, __del, __cookie);
@@ -310,7 +316,7 @@ IceProxy::IceMX::MetricsAdmin::begin_enableMetricsView(const ::std::string& name
     {
         __result->prepare(__IceMX__MetricsAdmin__enableMetricsView_name, ::Ice::Normal, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::SlicedFormat);
-        __os->write(name);
+        __os->write(__p_name);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -324,7 +330,7 @@ IceProxy::IceMX::MetricsAdmin::begin_enableMetricsView(const ::std::string& name
 #ifdef ICE_CPP11
 
 ::Ice::AsyncResultPtr
-IceProxy::IceMX::MetricsAdmin::__begin_enableMetricsView(const ::std::string& name, const ::Ice::Context* __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+IceProxy::IceMX::MetricsAdmin::__begin_enableMetricsView(const ::std::string& __p_name, 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
     {
@@ -359,7 +365,7 @@ IceProxy::IceMX::MetricsAdmin::__begin_enableMetricsView(const ::std::string& na
         
         ::std::function<void ()> _response;
     };
-    return begin_enableMetricsView(name, __ctx, new Cpp11CB(__response, __exception, __sent));
+    return begin_enableMetricsView(__p_name, __ctx, new Cpp11CB(__response, __exception, __sent));
 }
 #endif
 
@@ -386,14 +392,14 @@ IceProxy::IceMX::MetricsAdmin::end_enableMetricsView(const ::Ice::AsyncResultPtr
 }
 
 void
-IceProxy::IceMX::MetricsAdmin::disableMetricsView(const ::std::string& name, const ::Ice::Context* __ctx)
+IceProxy::IceMX::MetricsAdmin::disableMetricsView(const ::std::string& __p_name, const ::Ice::Context* __ctx)
 {
     __checkTwowayOnly(__IceMX__MetricsAdmin__disableMetricsView_name);
     ::IceInternal::Outgoing __og(this, __IceMX__MetricsAdmin__disableMetricsView_name, ::Ice::Normal, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::SlicedFormat);
-        __os->write(name);
+        __os->write(__p_name);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -419,7 +425,7 @@ IceProxy::IceMX::MetricsAdmin::disableMetricsView(const ::std::string& name, con
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::IceMX::MetricsAdmin::begin_disableMetricsView(const ::std::string& name, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::IceMX::MetricsAdmin::begin_disableMetricsView(const ::std::string& __p_name, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     __checkAsyncTwowayOnly(__IceMX__MetricsAdmin__disableMetricsView_name);
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __IceMX__MetricsAdmin__disableMetricsView_name, __del, __cookie);
@@ -427,7 +433,7 @@ IceProxy::IceMX::MetricsAdmin::begin_disableMetricsView(const ::std::string& nam
     {
         __result->prepare(__IceMX__MetricsAdmin__disableMetricsView_name, ::Ice::Normal, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::SlicedFormat);
-        __os->write(name);
+        __os->write(__p_name);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -441,7 +447,7 @@ IceProxy::IceMX::MetricsAdmin::begin_disableMetricsView(const ::std::string& nam
 #ifdef ICE_CPP11
 
 ::Ice::AsyncResultPtr
-IceProxy::IceMX::MetricsAdmin::__begin_disableMetricsView(const ::std::string& name, const ::Ice::Context* __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+IceProxy::IceMX::MetricsAdmin::__begin_disableMetricsView(const ::std::string& __p_name, 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
     {
@@ -476,7 +482,7 @@ IceProxy::IceMX::MetricsAdmin::__begin_disableMetricsView(const ::std::string& n
         
         ::std::function<void ()> _response;
     };
-    return begin_disableMetricsView(name, __ctx, new Cpp11CB(__response, __exception, __sent));
+    return begin_disableMetricsView(__p_name, __ctx, new Cpp11CB(__response, __exception, __sent));
 }
 #endif
 
@@ -503,14 +509,14 @@ IceProxy::IceMX::MetricsAdmin::end_disableMetricsView(const ::Ice::AsyncResultPt
 }
 
 ::IceMX::MetricsView
-IceProxy::IceMX::MetricsAdmin::getMetricsView(const ::std::string& view, ::Ice::Long& timestamp, const ::Ice::Context* __ctx)
+IceProxy::IceMX::MetricsAdmin::getMetricsView(const ::std::string& __p_view, ::Ice::Long& __p_timestamp, const ::Ice::Context* __ctx)
 {
     __checkTwowayOnly(__IceMX__MetricsAdmin__getMetricsView_name);
     ::IceInternal::Outgoing __og(this, __IceMX__MetricsAdmin__getMetricsView_name, ::Ice::Normal, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::SlicedFormat);
-        __os->write(view);
+        __os->write(__p_view);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -535,7 +541,7 @@ IceProxy::IceMX::MetricsAdmin::getMetricsView(const ::std::string& view, ::Ice::
     }
     ::IceMX::MetricsView __ret;
     ::IceInternal::BasicStream* __is = __og.startReadParams();
-    __is->read(timestamp);
+    __is->read(__p_timestamp);
     __is->read(__ret);
     __is->readPendingObjects();
     __og.endReadParams();
@@ -543,7 +549,7 @@ IceProxy::IceMX::MetricsAdmin::getMetricsView(const ::std::string& view, ::Ice::
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::IceMX::MetricsAdmin::begin_getMetricsView(const ::std::string& view, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::IceMX::MetricsAdmin::begin_getMetricsView(const ::std::string& __p_view, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     __checkAsyncTwowayOnly(__IceMX__MetricsAdmin__getMetricsView_name);
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __IceMX__MetricsAdmin__getMetricsView_name, __del, __cookie);
@@ -551,7 +557,7 @@ IceProxy::IceMX::MetricsAdmin::begin_getMetricsView(const ::std::string& view, c
     {
         __result->prepare(__IceMX__MetricsAdmin__getMetricsView_name, ::Ice::Normal, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::SlicedFormat);
-        __os->write(view);
+        __os->write(__p_view);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -565,7 +571,7 @@ IceProxy::IceMX::MetricsAdmin::begin_getMetricsView(const ::std::string& view, c
 #ifdef ICE_CPP11
 
 ::Ice::AsyncResultPtr
-IceProxy::IceMX::MetricsAdmin::__begin_getMetricsView(const ::std::string& view, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::IceMX::MetricsView&, ::Ice::Long)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+IceProxy::IceMX::MetricsAdmin::__begin_getMetricsView(const ::std::string& __p_view, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::IceMX::MetricsView&, ::Ice::Long)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
 {
     class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
     {
@@ -581,11 +587,11 @@ IceProxy::IceMX::MetricsAdmin::__begin_getMetricsView(const ::std::string& view,
         virtual void completed(const ::Ice::AsyncResultPtr& __result) const
         {
             ::IceMX::MetricsAdminPrx __proxy = ::IceMX::MetricsAdminPrx::uncheckedCast(__result->getProxy());
-            ::Ice::Long timestamp;
+            ::Ice::Long __p_timestamp;
             ::IceMX::MetricsView __ret;
             try
             {
-                __ret = __proxy->end_getMetricsView(timestamp, __result);
+                __ret = __proxy->end_getMetricsView(__p_timestamp, __result);
             }
             catch(const ::Ice::Exception& ex)
             {
@@ -594,7 +600,7 @@ IceProxy::IceMX::MetricsAdmin::__begin_getMetricsView(const ::std::string& view,
             }
             if(_response != nullptr)
             {
-                _response(__ret, timestamp);
+                _response(__ret, __p_timestamp);
             }
         }
     
@@ -602,12 +608,12 @@ IceProxy::IceMX::MetricsAdmin::__begin_getMetricsView(const ::std::string& view,
         
         ::std::function<void (const ::IceMX::MetricsView&, ::Ice::Long)> _response;
     };
-    return begin_getMetricsView(view, __ctx, new Cpp11CB(__response, __exception, __sent));
+    return begin_getMetricsView(__p_view, __ctx, new Cpp11CB(__response, __exception, __sent));
 }
 #endif
 
 ::IceMX::MetricsView
-IceProxy::IceMX::MetricsAdmin::end_getMetricsView(::Ice::Long& timestamp, const ::Ice::AsyncResultPtr& __result)
+IceProxy::IceMX::MetricsAdmin::end_getMetricsView(::Ice::Long& __p_timestamp, const ::Ice::AsyncResultPtr& __result)
 {
     ::Ice::AsyncResult::__check(__result, this, __IceMX__MetricsAdmin__getMetricsView_name);
     ::IceMX::MetricsView __ret;
@@ -627,7 +633,7 @@ IceProxy::IceMX::MetricsAdmin::end_getMetricsView(::Ice::Long& timestamp, const
         }
     }
     ::IceInternal::BasicStream* __is = __result->__startReadParams();
-    __is->read(timestamp);
+    __is->read(__p_timestamp);
     __is->read(__ret);
     __is->readPendingObjects();
     __result->__endReadParams();
@@ -635,15 +641,15 @@ IceProxy::IceMX::MetricsAdmin::end_getMetricsView(::Ice::Long& timestamp, const
 }
 
 ::IceMX::MetricsFailuresSeq
-IceProxy::IceMX::MetricsAdmin::getMapMetricsFailures(const ::std::string& view, const ::std::string& map, const ::Ice::Context* __ctx)
+IceProxy::IceMX::MetricsAdmin::getMapMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::Ice::Context* __ctx)
 {
     __checkTwowayOnly(__IceMX__MetricsAdmin__getMapMetricsFailures_name);
     ::IceInternal::Outgoing __og(this, __IceMX__MetricsAdmin__getMapMetricsFailures_name, ::Ice::Normal, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::SlicedFormat);
-        __os->write(view);
-        __os->write(map);
+        __os->write(__p_view);
+        __os->write(__p_map);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -674,7 +680,7 @@ IceProxy::IceMX::MetricsAdmin::getMapMetricsFailures(const ::std::string& view,
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::IceMX::MetricsAdmin::begin_getMapMetricsFailures(const ::std::string& view, const ::std::string& map, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::IceMX::MetricsAdmin::begin_getMapMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     __checkAsyncTwowayOnly(__IceMX__MetricsAdmin__getMapMetricsFailures_name);
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __IceMX__MetricsAdmin__getMapMetricsFailures_name, __del, __cookie);
@@ -682,8 +688,8 @@ IceProxy::IceMX::MetricsAdmin::begin_getMapMetricsFailures(const ::std::string&
     {
         __result->prepare(__IceMX__MetricsAdmin__getMapMetricsFailures_name, ::Ice::Normal, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::SlicedFormat);
-        __os->write(view);
-        __os->write(map);
+        __os->write(__p_view);
+        __os->write(__p_map);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -697,7 +703,7 @@ IceProxy::IceMX::MetricsAdmin::begin_getMapMetricsFailures(const ::std::string&
 #ifdef ICE_CPP11
 
 ::Ice::AsyncResultPtr
-IceProxy::IceMX::MetricsAdmin::__begin_getMapMetricsFailures(const ::std::string& view, const ::std::string& map, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::IceMX::MetricsFailuresSeq&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+IceProxy::IceMX::MetricsAdmin::__begin_getMapMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::IceMX::MetricsFailuresSeq&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
 {
     class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
     {
@@ -733,7 +739,7 @@ IceProxy::IceMX::MetricsAdmin::__begin_getMapMetricsFailures(const ::std::string
         
         ::std::function<void (const ::IceMX::MetricsFailuresSeq&)> _response;
     };
-    return begin_getMapMetricsFailures(view, map, __ctx, new Cpp11CB(__response, __exception, __sent));
+    return begin_getMapMetricsFailures(__p_view, __p_map, __ctx, new Cpp11CB(__response, __exception, __sent));
 }
 #endif
 
@@ -764,16 +770,16 @@ IceProxy::IceMX::MetricsAdmin::end_getMapMetricsFailures(const ::Ice::AsyncResul
 }
 
 ::IceMX::MetricsFailures
-IceProxy::IceMX::MetricsAdmin::getMetricsFailures(const ::std::string& view, const ::std::string& map, const ::std::string& id, const ::Ice::Context* __ctx)
+IceProxy::IceMX::MetricsAdmin::getMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::std::string& __p_id, const ::Ice::Context* __ctx)
 {
     __checkTwowayOnly(__IceMX__MetricsAdmin__getMetricsFailures_name);
     ::IceInternal::Outgoing __og(this, __IceMX__MetricsAdmin__getMetricsFailures_name, ::Ice::Normal, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::SlicedFormat);
-        __os->write(view);
-        __os->write(map);
-        __os->write(id);
+        __os->write(__p_view);
+        __os->write(__p_map);
+        __os->write(__p_id);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -804,7 +810,7 @@ IceProxy::IceMX::MetricsAdmin::getMetricsFailures(const ::std::string& view, con
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::IceMX::MetricsAdmin::begin_getMetricsFailures(const ::std::string& view, const ::std::string& map, const ::std::string& id, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::IceMX::MetricsAdmin::begin_getMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::std::string& __p_id, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     __checkAsyncTwowayOnly(__IceMX__MetricsAdmin__getMetricsFailures_name);
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __IceMX__MetricsAdmin__getMetricsFailures_name, __del, __cookie);
@@ -812,9 +818,9 @@ IceProxy::IceMX::MetricsAdmin::begin_getMetricsFailures(const ::std::string& vie
     {
         __result->prepare(__IceMX__MetricsAdmin__getMetricsFailures_name, ::Ice::Normal, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::SlicedFormat);
-        __os->write(view);
-        __os->write(map);
-        __os->write(id);
+        __os->write(__p_view);
+        __os->write(__p_map);
+        __os->write(__p_id);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -828,7 +834,7 @@ IceProxy::IceMX::MetricsAdmin::begin_getMetricsFailures(const ::std::string& vie
 #ifdef ICE_CPP11
 
 ::Ice::AsyncResultPtr
-IceProxy::IceMX::MetricsAdmin::__begin_getMetricsFailures(const ::std::string& view, const ::std::string& map, const ::std::string& id, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::IceMX::MetricsFailures&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+IceProxy::IceMX::MetricsAdmin::__begin_getMetricsFailures(const ::std::string& __p_view, const ::std::string& __p_map, const ::std::string& __p_id, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::IceMX::MetricsFailures&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
 {
     class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
     {
@@ -864,7 +870,7 @@ IceProxy::IceMX::MetricsAdmin::__begin_getMetricsFailures(const ::std::string& v
         
         ::std::function<void (const ::IceMX::MetricsFailures&)> _response;
     };
-    return begin_getMetricsFailures(view, map, id, __ctx, new Cpp11CB(__response, __exception, __sent));
+    return begin_getMetricsFailures(__p_view, __p_map, __p_id, __ctx, new Cpp11CB(__response, __exception, __sent));
 }
 #endif
 
@@ -906,9 +912,9 @@ IceProxy::IceMX::MetricsAdmin::__newInstance() const
     return new MetricsAdmin;
 }
 #ifdef __SUNPRO_CC
-class ICE_DECLSPEC_EXPORT IceProxy::IceMX::ThreadMetrics;
+class ICE_API IceProxy::IceMX::ThreadMetrics;
 #endif
-ICE_DECLSPEC_EXPORT ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::ThreadMetrics* p) { return p; }
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::ThreadMetrics* p) { return p; }
 
 void
 ::IceProxy::IceMX::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::ThreadMetrics>& v)
@@ -938,9 +944,9 @@ IceProxy::IceMX::ThreadMetrics::__newInstance() const
     return new ThreadMetrics;
 }
 #ifdef __SUNPRO_CC
-class ICE_DECLSPEC_EXPORT IceProxy::IceMX::DispatchMetrics;
+class ICE_API IceProxy::IceMX::DispatchMetrics;
 #endif
-ICE_DECLSPEC_EXPORT ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::DispatchMetrics* p) { return p; }
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::DispatchMetrics* p) { return p; }
 
 void
 ::IceProxy::IceMX::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::DispatchMetrics>& v)
@@ -970,9 +976,9 @@ IceProxy::IceMX::DispatchMetrics::__newInstance() const
     return new DispatchMetrics;
 }
 #ifdef __SUNPRO_CC
-class ICE_DECLSPEC_EXPORT IceProxy::IceMX::ChildInvocationMetrics;
+class ICE_API IceProxy::IceMX::ChildInvocationMetrics;
 #endif
-ICE_DECLSPEC_EXPORT ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::ChildInvocationMetrics* p) { return p; }
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::ChildInvocationMetrics* p) { return p; }
 
 void
 ::IceProxy::IceMX::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::ChildInvocationMetrics>& v)
@@ -1002,9 +1008,9 @@ IceProxy::IceMX::ChildInvocationMetrics::__newInstance() const
     return new ChildInvocationMetrics;
 }
 #ifdef __SUNPRO_CC
-class ICE_DECLSPEC_EXPORT IceProxy::IceMX::CollocatedMetrics;
+class ICE_API IceProxy::IceMX::CollocatedMetrics;
 #endif
-ICE_DECLSPEC_EXPORT ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::CollocatedMetrics* p) { return p; }
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::CollocatedMetrics* p) { return p; }
 
 void
 ::IceProxy::IceMX::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::CollocatedMetrics>& v)
@@ -1034,9 +1040,9 @@ IceProxy::IceMX::CollocatedMetrics::__newInstance() const
     return new CollocatedMetrics;
 }
 #ifdef __SUNPRO_CC
-class ICE_DECLSPEC_EXPORT IceProxy::IceMX::RemoteMetrics;
+class ICE_API IceProxy::IceMX::RemoteMetrics;
 #endif
-ICE_DECLSPEC_EXPORT ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::RemoteMetrics* p) { return p; }
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::RemoteMetrics* p) { return p; }
 
 void
 ::IceProxy::IceMX::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::RemoteMetrics>& v)
@@ -1066,9 +1072,9 @@ IceProxy::IceMX::RemoteMetrics::__newInstance() const
     return new RemoteMetrics;
 }
 #ifdef __SUNPRO_CC
-class ICE_DECLSPEC_EXPORT IceProxy::IceMX::InvocationMetrics;
+class ICE_API IceProxy::IceMX::InvocationMetrics;
 #endif
-ICE_DECLSPEC_EXPORT ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::InvocationMetrics* p) { return p; }
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::InvocationMetrics* p) { return p; }
 
 void
 ::IceProxy::IceMX::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::InvocationMetrics>& v)
@@ -1098,9 +1104,9 @@ IceProxy::IceMX::InvocationMetrics::__newInstance() const
     return new InvocationMetrics;
 }
 #ifdef __SUNPRO_CC
-class ICE_DECLSPEC_EXPORT IceProxy::IceMX::ConnectionMetrics;
+class ICE_API IceProxy::IceMX::ConnectionMetrics;
 #endif
-ICE_DECLSPEC_EXPORT ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::ConnectionMetrics* p) { return p; }
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::IceMX::upCast(::IceProxy::IceMX::ConnectionMetrics* p) { return p; }
 
 void
 ::IceProxy::IceMX::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::ConnectionMetrics>& v)
@@ -1130,7 +1136,7 @@ IceProxy::IceMX::ConnectionMetrics::__newInstance() const
     return new ConnectionMetrics;
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::Object* IceMX::upCast(::IceMX::Metrics* p) { return p; }
+ICE_API ::Ice::Object* IceMX::upCast(::IceMX::Metrics* p) { return p; }
 ::Ice::ObjectPtr
 IceMX::Metrics::ice_clone() const
 {
@@ -1213,7 +1219,7 @@ IceMX::Metrics::ice_factory()
     return ::IceInternal::factoryTable->getObjectFactory(::IceMX::Metrics::ice_staticId());
 }
 
-void ICE_DECLSPEC_EXPORT 
+void ICE_API 
 IceMX::__patch(MetricsPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::IceMX::MetricsPtr::dynamicCast(v);
@@ -1223,7 +1229,7 @@ IceMX::__patch(MetricsPtr& handle, const ::Ice::ObjectPtr& v)
     }
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::Object* IceMX::upCast(::IceMX::MetricsAdmin* p) { return p; }
+ICE_API ::Ice::Object* IceMX::upCast(::IceMX::MetricsAdmin* p) { return p; }
 
 namespace
 {
@@ -1269,10 +1275,10 @@ IceMX::MetricsAdmin::___getMetricsViewNames(::IceInternal::Incoming& __inS, cons
 {
     __checkMode(::Ice::Normal, __current.mode);
     __inS.readEmptyParams();
-    ::Ice::StringSeq disabledViews;
-    ::Ice::StringSeq __ret = getMetricsViewNames(disabledViews, __current);
+    ::Ice::StringSeq __p_disabledViews;
+    ::Ice::StringSeq __ret = getMetricsViewNames(__p_disabledViews, __current);
     ::IceInternal::BasicStream* __os = __inS.__startWriteParams(::Ice::SlicedFormat);
-    __os->write(disabledViews);
+    __os->write(__p_disabledViews);
     __os->write(__ret);
     __inS.__endWriteParams(true);
     return ::Ice::DispatchOK;
@@ -1283,12 +1289,12 @@ IceMX::MetricsAdmin::___enableMetricsView(::IceInternal::Incoming& __inS, const
 {
     __checkMode(::Ice::Normal, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string name;
-    __is->read(name);
+    ::std::string __p_name;
+    __is->read(__p_name);
     __inS.endReadParams();
     try
     {
-        enableMetricsView(name, __current);
+        enableMetricsView(__p_name, __current);
         __inS.__writeEmptyParams();
         return ::Ice::DispatchOK;
     }
@@ -1304,12 +1310,12 @@ IceMX::MetricsAdmin::___disableMetricsView(::IceInternal::Incoming& __inS, const
 {
     __checkMode(::Ice::Normal, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string name;
-    __is->read(name);
+    ::std::string __p_name;
+    __is->read(__p_name);
     __inS.endReadParams();
     try
     {
-        disableMetricsView(name, __current);
+        disableMetricsView(__p_name, __current);
         __inS.__writeEmptyParams();
         return ::Ice::DispatchOK;
     }
@@ -1325,15 +1331,15 @@ IceMX::MetricsAdmin::___getMetricsView(::IceInternal::Incoming& __inS, const ::I
 {
     __checkMode(::Ice::Normal, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string view;
-    __is->read(view);
+    ::std::string __p_view;
+    __is->read(__p_view);
     __inS.endReadParams();
-    ::Ice::Long timestamp;
+    ::Ice::Long __p_timestamp;
     try
     {
-        ::IceMX::MetricsView __ret = getMetricsView(view, timestamp, __current);
+        ::IceMX::MetricsView __ret = getMetricsView(__p_view, __p_timestamp, __current);
         ::IceInternal::BasicStream* __os = __inS.__startWriteParams(::Ice::SlicedFormat);
-        __os->write(timestamp);
+        __os->write(__p_timestamp);
         __os->write(__ret);
         __os->writePendingObjects();
         __inS.__endWriteParams(true);
@@ -1351,14 +1357,14 @@ IceMX::MetricsAdmin::___getMapMetricsFailures(::IceInternal::Incoming& __inS, co
 {
     __checkMode(::Ice::Normal, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string view;
-    ::std::string map;
-    __is->read(view);
-    __is->read(map);
+    ::std::string __p_view;
+    ::std::string __p_map;
+    __is->read(__p_view);
+    __is->read(__p_map);
     __inS.endReadParams();
     try
     {
-        ::IceMX::MetricsFailuresSeq __ret = getMapMetricsFailures(view, map, __current);
+        ::IceMX::MetricsFailuresSeq __ret = getMapMetricsFailures(__p_view, __p_map, __current);
         ::IceInternal::BasicStream* __os = __inS.__startWriteParams(::Ice::SlicedFormat);
         __os->write(__ret);
         __inS.__endWriteParams(true);
@@ -1376,16 +1382,16 @@ IceMX::MetricsAdmin::___getMetricsFailures(::IceInternal::Incoming& __inS, const
 {
     __checkMode(::Ice::Normal, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string view;
-    ::std::string map;
-    ::std::string id;
-    __is->read(view);
-    __is->read(map);
-    __is->read(id);
+    ::std::string __p_view;
+    ::std::string __p_map;
+    ::std::string __p_id;
+    __is->read(__p_view);
+    __is->read(__p_map);
+    __is->read(__p_id);
     __inS.endReadParams();
     try
     {
-        ::IceMX::MetricsFailures __ret = getMetricsFailures(view, map, id, __current);
+        ::IceMX::MetricsFailures __ret = getMetricsFailures(__p_view, __p_map, __p_id, __current);
         ::IceInternal::BasicStream* __os = __inS.__startWriteParams(::Ice::SlicedFormat);
         __os->write(__ret);
         __inS.__endWriteParams(true);
@@ -1487,7 +1493,7 @@ IceMX::MetricsAdmin::__readImpl(::IceInternal::BasicStream* __is)
     __is->endReadSlice();
 }
 
-void ICE_DECLSPEC_EXPORT 
+void ICE_API 
 IceMX::__patch(MetricsAdminPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::IceMX::MetricsAdminPtr::dynamicCast(v);
@@ -1497,7 +1503,7 @@ IceMX::__patch(MetricsAdminPtr& handle, const ::Ice::ObjectPtr& v)
     }
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::Object* IceMX::upCast(::IceMX::ThreadMetrics* p) { return p; }
+ICE_API ::Ice::Object* IceMX::upCast(::IceMX::ThreadMetrics* p) { return p; }
 ::Ice::ObjectPtr
 IceMX::ThreadMetrics::ice_clone() const
 {
@@ -1579,7 +1585,7 @@ IceMX::ThreadMetrics::ice_factory()
     return ::IceInternal::factoryTable->getObjectFactory(::IceMX::ThreadMetrics::ice_staticId());
 }
 
-void ICE_DECLSPEC_EXPORT 
+void ICE_API 
 IceMX::__patch(ThreadMetricsPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::IceMX::ThreadMetricsPtr::dynamicCast(v);
@@ -1589,7 +1595,7 @@ IceMX::__patch(ThreadMetricsPtr& handle, const ::Ice::ObjectPtr& v)
     }
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::Object* IceMX::upCast(::IceMX::DispatchMetrics* p) { return p; }
+ICE_API ::Ice::Object* IceMX::upCast(::IceMX::DispatchMetrics* p) { return p; }
 ::Ice::ObjectPtr
 IceMX::DispatchMetrics::ice_clone() const
 {
@@ -1671,7 +1677,7 @@ IceMX::DispatchMetrics::ice_factory()
     return ::IceInternal::factoryTable->getObjectFactory(::IceMX::DispatchMetrics::ice_staticId());
 }
 
-void ICE_DECLSPEC_EXPORT 
+void ICE_API 
 IceMX::__patch(DispatchMetricsPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::IceMX::DispatchMetricsPtr::dynamicCast(v);
@@ -1681,7 +1687,7 @@ IceMX::__patch(DispatchMetricsPtr& handle, const ::Ice::ObjectPtr& v)
     }
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::Object* IceMX::upCast(::IceMX::ChildInvocationMetrics* p) { return p; }
+ICE_API ::Ice::Object* IceMX::upCast(::IceMX::ChildInvocationMetrics* p) { return p; }
 ::Ice::ObjectPtr
 IceMX::ChildInvocationMetrics::ice_clone() const
 {
@@ -1761,7 +1767,7 @@ IceMX::ChildInvocationMetrics::ice_factory()
     return ::IceInternal::factoryTable->getObjectFactory(::IceMX::ChildInvocationMetrics::ice_staticId());
 }
 
-void ICE_DECLSPEC_EXPORT 
+void ICE_API 
 IceMX::__patch(ChildInvocationMetricsPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::IceMX::ChildInvocationMetricsPtr::dynamicCast(v);
@@ -1771,7 +1777,7 @@ IceMX::__patch(ChildInvocationMetricsPtr& handle, const ::Ice::ObjectPtr& v)
     }
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::Object* IceMX::upCast(::IceMX::CollocatedMetrics* p) { return p; }
+ICE_API ::Ice::Object* IceMX::upCast(::IceMX::CollocatedMetrics* p) { return p; }
 ::Ice::ObjectPtr
 IceMX::CollocatedMetrics::ice_clone() const
 {
@@ -1848,7 +1854,7 @@ IceMX::CollocatedMetrics::ice_factory()
     return ::IceInternal::factoryTable->getObjectFactory(::IceMX::CollocatedMetrics::ice_staticId());
 }
 
-void ICE_DECLSPEC_EXPORT 
+void ICE_API 
 IceMX::__patch(CollocatedMetricsPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::IceMX::CollocatedMetricsPtr::dynamicCast(v);
@@ -1858,7 +1864,7 @@ IceMX::__patch(CollocatedMetricsPtr& handle, const ::Ice::ObjectPtr& v)
     }
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::Object* IceMX::upCast(::IceMX::RemoteMetrics* p) { return p; }
+ICE_API ::Ice::Object* IceMX::upCast(::IceMX::RemoteMetrics* p) { return p; }
 ::Ice::ObjectPtr
 IceMX::RemoteMetrics::ice_clone() const
 {
@@ -1935,7 +1941,7 @@ IceMX::RemoteMetrics::ice_factory()
     return ::IceInternal::factoryTable->getObjectFactory(::IceMX::RemoteMetrics::ice_staticId());
 }
 
-void ICE_DECLSPEC_EXPORT 
+void ICE_API 
 IceMX::__patch(RemoteMetricsPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::IceMX::RemoteMetricsPtr::dynamicCast(v);
@@ -1945,7 +1951,7 @@ IceMX::__patch(RemoteMetricsPtr& handle, const ::Ice::ObjectPtr& v)
     }
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::Object* IceMX::upCast(::IceMX::InvocationMetrics* p) { return p; }
+ICE_API ::Ice::Object* IceMX::upCast(::IceMX::InvocationMetrics* p) { return p; }
 ::Ice::ObjectPtr
 IceMX::InvocationMetrics::ice_clone() const
 {
@@ -2058,7 +2064,7 @@ IceMX::InvocationMetrics::ice_factory()
     return ::IceInternal::factoryTable->getObjectFactory(::IceMX::InvocationMetrics::ice_staticId());
 }
 
-void ICE_DECLSPEC_EXPORT 
+void ICE_API 
 IceMX::__patch(InvocationMetricsPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::IceMX::InvocationMetricsPtr::dynamicCast(v);
@@ -2068,7 +2074,7 @@ IceMX::__patch(InvocationMetricsPtr& handle, const ::Ice::ObjectPtr& v)
     }
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::Object* IceMX::upCast(::IceMX::ConnectionMetrics* p) { return p; }
+ICE_API ::Ice::Object* IceMX::upCast(::IceMX::ConnectionMetrics* p) { return p; }
 ::Ice::ObjectPtr
 IceMX::ConnectionMetrics::ice_clone() const
 {
@@ -2148,7 +2154,7 @@ IceMX::ConnectionMetrics::ice_factory()
     return ::IceInternal::factoryTable->getObjectFactory(::IceMX::ConnectionMetrics::ice_staticId());
 }
 
-void ICE_DECLSPEC_EXPORT 
+void ICE_API 
 IceMX::__patch(ConnectionMetricsPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::IceMX::ConnectionMetricsPtr::dynamicCast(v);