zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/cpp/src/Ice/Instance.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.
@@ -63,6 +63,24 @@ typedef IceUtil::Handle<MetricsAdminI> MetricsAdminIPtr;
 class RequestHandlerFactory;
 typedef IceUtil::Handle<RequestHandlerFactory> RequestHandlerFactoryPtr;
 
+//
+// Structure to track warnings for attempts to set socket buffer sizes
+//
+struct BufSizeWarnInfo
+{
+    // Whether send size warning has been emitted
+    bool sndWarn;
+
+    // The send size for which the warning wwas emitted
+    int sndSize;
+
+    // Whether receive size warning has been emitted
+    bool rcvWarn;
+
+    // The receive size for which the warning wwas emitted
+    int rcvSize;
+};
+
 class Instance : public IceUtil::Shared, public IceUtil::Monitor<IceUtil::RecMutex>
 {
 public:
@@ -118,7 +136,11 @@ public:
 
     IceUtil::StringConverterPtr getStringConverter() const { return _stringConverter; }
     IceUtil::WstringConverterPtr getWstringConverter() const { return _wstringConverter; }
-   
+
+    BufSizeWarnInfo getBufSizeWarn(Ice::Short type);
+    void setSndBufSizeWarn(Ice::Short type, int size);
+    void setRcvBufSizeWarn(Ice::Short type, int size);
+
 private:
 
     Instance(const Ice::CommunicatorPtr&, const Ice::InitializationData&);
@@ -134,6 +156,8 @@ private:
     void addAllAdminFacets();
     void setServerProcessProxy(const Ice::ObjectAdapterPtr&, const Ice::Identity&);
 
+    BufSizeWarnInfo getBufSizeWarnInternal(Ice::Short type);
+
     enum State
     {
         StateActive,
@@ -177,6 +201,8 @@ private:
     Ice::Identity _adminIdentity;
     std::set<std::string> _adminFacetFilter;
     IceInternal::MetricsAdminIPtr _metricsAdmin;
+    std::map<Ice::Short, BufSizeWarnInfo> _setBufSizeWarn;
+    IceUtil::Mutex _setBufSizeWarnMutex;
 };
 
 class ProcessI : public Ice::Process

data/ext/ice/cpp/src/Ice/Instrumentation.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
 
@@ -47,22 +53,22 @@ namespace Ice
 {
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::Observer* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::Observer* p) { return p; }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::ThreadObserver* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::ThreadObserver* p) { return p; }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::ConnectionObserver* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::ConnectionObserver* p) { return p; }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::DispatchObserver* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::DispatchObserver* p) { return p; }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::ChildInvocationObserver* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::ChildInvocationObserver* p) { return p; }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::RemoteObserver* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::RemoteObserver* p) { return p; }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::CollocatedObserver* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::CollocatedObserver* p) { return p; }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::InvocationObserver* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::InvocationObserver* p) { return p; }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::ObserverUpdater* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::ObserverUpdater* p) { return p; }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::CommunicatorObserver* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(::Ice::Instrumentation::CommunicatorObserver* p) { return p; }

data/ext/ice/cpp/src/Ice/InstrumentationF.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/InstrumentationI.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/InstrumentationI.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/LocalException.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/LocalObject.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/Locator.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
 
@@ -479,9 +485,9 @@ IceAsync::Ice::AMD_LocatorRegistry_setServerProcessProxy::ice_exception(const ::
     }
 }
 #ifdef __SUNPRO_CC
-class ICE_DECLSPEC_EXPORT IceProxy::Ice::Locator;
+class ICE_API IceProxy::Ice::Locator;
 #endif
-ICE_DECLSPEC_EXPORT ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::Locator* p) { return p; }
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::Locator* p) { return p; }
 
 void
 ::IceProxy::Ice::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Locator>& v)
@@ -500,14 +506,14 @@ void
 }
 
 ::Ice::ObjectPrx
-IceProxy::Ice::Locator::findObjectById(const ::Ice::Identity& id, const ::Ice::Context* __ctx)
+IceProxy::Ice::Locator::findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Context* __ctx)
 {
     __checkTwowayOnly(__Ice__Locator__findObjectById_name);
     ::IceInternal::Outgoing __og(this, __Ice__Locator__findObjectById_name, ::Ice::Nonmutating, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(id);
+        __os->write(__p_id);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -538,7 +544,7 @@ IceProxy::Ice::Locator::findObjectById(const ::Ice::Identity& id, const ::Ice::C
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::Locator::begin_findObjectById(const ::Ice::Identity& id, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::Locator::begin_findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     __checkAsyncTwowayOnly(__Ice__Locator__findObjectById_name);
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__Locator__findObjectById_name, __del, __cookie);
@@ -546,7 +552,7 @@ IceProxy::Ice::Locator::begin_findObjectById(const ::Ice::Identity& id, const ::
     {
         __result->prepare(__Ice__Locator__findObjectById_name, ::Ice::Nonmutating, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(id);
+        __os->write(__p_id);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -560,7 +566,7 @@ IceProxy::Ice::Locator::begin_findObjectById(const ::Ice::Identity& id, const ::
 #ifdef ICE_CPP11
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::Locator::__begin_findObjectById(const ::Ice::Identity& id, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::ObjectPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+IceProxy::Ice::Locator::__begin_findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::ObjectPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
 {
     class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
     {
@@ -596,7 +602,7 @@ IceProxy::Ice::Locator::__begin_findObjectById(const ::Ice::Identity& id, const
         
         ::std::function<void (const ::Ice::ObjectPrx&)> _response;
     };
-    return begin_findObjectById(id, __ctx, new Cpp11CB(__response, __exception, __sent));
+    return begin_findObjectById(__p_id, __ctx, new Cpp11CB(__response, __exception, __sent));
 }
 #endif
 
@@ -627,14 +633,14 @@ IceProxy::Ice::Locator::end_findObjectById(const ::Ice::AsyncResultPtr& __result
 }
 
 ::Ice::ObjectPrx
-IceProxy::Ice::Locator::findAdapterById(const ::std::string& id, const ::Ice::Context* __ctx)
+IceProxy::Ice::Locator::findAdapterById(const ::std::string& __p_id, const ::Ice::Context* __ctx)
 {
     __checkTwowayOnly(__Ice__Locator__findAdapterById_name);
     ::IceInternal::Outgoing __og(this, __Ice__Locator__findAdapterById_name, ::Ice::Nonmutating, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(id);
+        __os->write(__p_id);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -665,7 +671,7 @@ IceProxy::Ice::Locator::findAdapterById(const ::std::string& id, const ::Ice::Co
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::Locator::begin_findAdapterById(const ::std::string& id, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::Locator::begin_findAdapterById(const ::std::string& __p_id, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     __checkAsyncTwowayOnly(__Ice__Locator__findAdapterById_name);
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__Locator__findAdapterById_name, __del, __cookie);
@@ -673,7 +679,7 @@ IceProxy::Ice::Locator::begin_findAdapterById(const ::std::string& id, const ::I
     {
         __result->prepare(__Ice__Locator__findAdapterById_name, ::Ice::Nonmutating, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(id);
+        __os->write(__p_id);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -687,7 +693,7 @@ IceProxy::Ice::Locator::begin_findAdapterById(const ::std::string& id, const ::I
 #ifdef ICE_CPP11
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::Locator::__begin_findAdapterById(const ::std::string& id, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::ObjectPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+IceProxy::Ice::Locator::__begin_findAdapterById(const ::std::string& __p_id, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::ObjectPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
 {
     class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
     {
@@ -723,7 +729,7 @@ IceProxy::Ice::Locator::__begin_findAdapterById(const ::std::string& id, const :
         
         ::std::function<void (const ::Ice::ObjectPrx&)> _response;
     };
-    return begin_findAdapterById(id, __ctx, new Cpp11CB(__response, __exception, __sent));
+    return begin_findAdapterById(__p_id, __ctx, new Cpp11CB(__response, __exception, __sent));
 }
 #endif
 
@@ -873,9 +879,9 @@ IceProxy::Ice::Locator::__newInstance() const
     return new Locator;
 }
 #ifdef __SUNPRO_CC
-class ICE_DECLSPEC_EXPORT IceProxy::Ice::LocatorRegistry;
+class ICE_API IceProxy::Ice::LocatorRegistry;
 #endif
-ICE_DECLSPEC_EXPORT ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::LocatorRegistry* p) { return p; }
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::LocatorRegistry* p) { return p; }
 
 void
 ::IceProxy::Ice::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::Ice::LocatorRegistry>& v)
@@ -894,15 +900,15 @@ void
 }
 
 void
-IceProxy::Ice::LocatorRegistry::setAdapterDirectProxy(const ::std::string& id, const ::Ice::ObjectPrx& proxy, const ::Ice::Context* __ctx)
+IceProxy::Ice::LocatorRegistry::setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Context* __ctx)
 {
     __checkTwowayOnly(__Ice__LocatorRegistry__setAdapterDirectProxy_name);
     ::IceInternal::Outgoing __og(this, __Ice__LocatorRegistry__setAdapterDirectProxy_name, ::Ice::Idempotent, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(id);
-        __os->write(proxy);
+        __os->write(__p_id);
+        __os->write(__p_proxy);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -932,7 +938,7 @@ IceProxy::Ice::LocatorRegistry::setAdapterDirectProxy(const ::std::string& id, c
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LocatorRegistry::begin_setAdapterDirectProxy(const ::std::string& id, const ::Ice::ObjectPrx& proxy, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::LocatorRegistry::begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     __checkAsyncTwowayOnly(__Ice__LocatorRegistry__setAdapterDirectProxy_name);
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__LocatorRegistry__setAdapterDirectProxy_name, __del, __cookie);
@@ -940,8 +946,8 @@ IceProxy::Ice::LocatorRegistry::begin_setAdapterDirectProxy(const ::std::string&
     {
         __result->prepare(__Ice__LocatorRegistry__setAdapterDirectProxy_name, ::Ice::Idempotent, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(id);
-        __os->write(proxy);
+        __os->write(__p_id);
+        __os->write(__p_proxy);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -955,7 +961,7 @@ IceProxy::Ice::LocatorRegistry::begin_setAdapterDirectProxy(const ::std::string&
 #ifdef ICE_CPP11
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LocatorRegistry::__begin_setAdapterDirectProxy(const ::std::string& id, const ::Ice::ObjectPrx& proxy, 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::LocatorRegistry::__begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, 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
     {
@@ -990,7 +996,7 @@ IceProxy::Ice::LocatorRegistry::__begin_setAdapterDirectProxy(const ::std::strin
         
         ::std::function<void ()> _response;
     };
-    return begin_setAdapterDirectProxy(id, proxy, __ctx, new Cpp11CB(__response, __exception, __sent));
+    return begin_setAdapterDirectProxy(__p_id, __p_proxy, __ctx, new Cpp11CB(__response, __exception, __sent));
 }
 #endif
 
@@ -1021,16 +1027,16 @@ IceProxy::Ice::LocatorRegistry::end_setAdapterDirectProxy(const ::Ice::AsyncResu
 }
 
 void
-IceProxy::Ice::LocatorRegistry::setReplicatedAdapterDirectProxy(const ::std::string& adapterId, const ::std::string& replicaGroupId, const ::Ice::ObjectPrx& p, const ::Ice::Context* __ctx)
+IceProxy::Ice::LocatorRegistry::setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::Context* __ctx)
 {
     __checkTwowayOnly(__Ice__LocatorRegistry__setReplicatedAdapterDirectProxy_name);
     ::IceInternal::Outgoing __og(this, __Ice__LocatorRegistry__setReplicatedAdapterDirectProxy_name, ::Ice::Idempotent, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(adapterId);
-        __os->write(replicaGroupId);
-        __os->write(p);
+        __os->write(__p_adapterId);
+        __os->write(__p_replicaGroupId);
+        __os->write(__p_p);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -1064,7 +1070,7 @@ IceProxy::Ice::LocatorRegistry::setReplicatedAdapterDirectProxy(const ::std::str
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LocatorRegistry::begin_setReplicatedAdapterDirectProxy(const ::std::string& adapterId, const ::std::string& replicaGroupId, const ::Ice::ObjectPrx& p, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::LocatorRegistry::begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     __checkAsyncTwowayOnly(__Ice__LocatorRegistry__setReplicatedAdapterDirectProxy_name);
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__LocatorRegistry__setReplicatedAdapterDirectProxy_name, __del, __cookie);
@@ -1072,9 +1078,9 @@ IceProxy::Ice::LocatorRegistry::begin_setReplicatedAdapterDirectProxy(const ::st
     {
         __result->prepare(__Ice__LocatorRegistry__setReplicatedAdapterDirectProxy_name, ::Ice::Idempotent, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(adapterId);
-        __os->write(replicaGroupId);
-        __os->write(p);
+        __os->write(__p_adapterId);
+        __os->write(__p_replicaGroupId);
+        __os->write(__p_p);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -1088,7 +1094,7 @@ IceProxy::Ice::LocatorRegistry::begin_setReplicatedAdapterDirectProxy(const ::st
 #ifdef ICE_CPP11
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LocatorRegistry::__begin_setReplicatedAdapterDirectProxy(const ::std::string& adapterId, const ::std::string& replicaGroupId, const ::Ice::ObjectPrx& p, 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::LocatorRegistry::__begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, 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
     {
@@ -1123,7 +1129,7 @@ IceProxy::Ice::LocatorRegistry::__begin_setReplicatedAdapterDirectProxy(const ::
         
         ::std::function<void ()> _response;
     };
-    return begin_setReplicatedAdapterDirectProxy(adapterId, replicaGroupId, p, __ctx, new Cpp11CB(__response, __exception, __sent));
+    return begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, __ctx, new Cpp11CB(__response, __exception, __sent));
 }
 #endif
 
@@ -1158,15 +1164,15 @@ IceProxy::Ice::LocatorRegistry::end_setReplicatedAdapterDirectProxy(const ::Ice:
 }
 
 void
-IceProxy::Ice::LocatorRegistry::setServerProcessProxy(const ::std::string& id, const ::Ice::ProcessPrx& proxy, const ::Ice::Context* __ctx)
+IceProxy::Ice::LocatorRegistry::setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Context* __ctx)
 {
     __checkTwowayOnly(__Ice__LocatorRegistry__setServerProcessProxy_name);
     ::IceInternal::Outgoing __og(this, __Ice__LocatorRegistry__setServerProcessProxy_name, ::Ice::Idempotent, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(id);
-        __os->write(proxy);
+        __os->write(__p_id);
+        __os->write(__p_proxy);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -1192,7 +1198,7 @@ IceProxy::Ice::LocatorRegistry::setServerProcessProxy(const ::std::string& id, c
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LocatorRegistry::begin_setServerProcessProxy(const ::std::string& id, const ::Ice::ProcessPrx& proxy, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::LocatorRegistry::begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     __checkAsyncTwowayOnly(__Ice__LocatorRegistry__setServerProcessProxy_name);
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__LocatorRegistry__setServerProcessProxy_name, __del, __cookie);
@@ -1200,8 +1206,8 @@ IceProxy::Ice::LocatorRegistry::begin_setServerProcessProxy(const ::std::string&
     {
         __result->prepare(__Ice__LocatorRegistry__setServerProcessProxy_name, ::Ice::Idempotent, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(id);
-        __os->write(proxy);
+        __os->write(__p_id);
+        __os->write(__p_proxy);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -1215,7 +1221,7 @@ IceProxy::Ice::LocatorRegistry::begin_setServerProcessProxy(const ::std::string&
 #ifdef ICE_CPP11
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LocatorRegistry::__begin_setServerProcessProxy(const ::std::string& id, const ::Ice::ProcessPrx& proxy, 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::LocatorRegistry::__begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, 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
     {
@@ -1250,7 +1256,7 @@ IceProxy::Ice::LocatorRegistry::__begin_setServerProcessProxy(const ::std::strin
         
         ::std::function<void ()> _response;
     };
-    return begin_setServerProcessProxy(id, proxy, __ctx, new Cpp11CB(__response, __exception, __sent));
+    return begin_setServerProcessProxy(__p_id, __p_proxy, __ctx, new Cpp11CB(__response, __exception, __sent));
 }
 #endif
 
@@ -1288,9 +1294,9 @@ IceProxy::Ice::LocatorRegistry::__newInstance() const
     return new LocatorRegistry;
 }
 #ifdef __SUNPRO_CC
-class ICE_DECLSPEC_EXPORT IceProxy::Ice::LocatorFinder;
+class ICE_API IceProxy::Ice::LocatorFinder;
 #endif
-ICE_DECLSPEC_EXPORT ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::LocatorFinder* p) { return p; }
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::LocatorFinder* p) { return p; }
 
 void
 ::IceProxy::Ice::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::Ice::LocatorFinder>& v)
@@ -1428,7 +1434,7 @@ IceProxy::Ice::LocatorFinder::__newInstance() const
     return new LocatorFinder;
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::Object* Ice::upCast(::Ice::Locator* p) { return p; }
+ICE_API ::Ice::Object* Ice::upCast(::Ice::Locator* p) { return p; }
 
 namespace
 {
@@ -1474,13 +1480,13 @@ Ice::Locator::___findObjectById(::IceInternal::Incoming& __inS, const ::Ice::Cur
 {
     __checkMode(::Ice::Idempotent, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::Ice::Identity id;
-    __is->read(id);
+    ::Ice::Identity __p_id;
+    __is->read(__p_id);
     __inS.endReadParams();
     ::Ice::AMD_Locator_findObjectByIdPtr __cb = new IceAsync::Ice::AMD_Locator_findObjectById(__inS);
     try
     {
-        findObjectById_async(__cb, id, __current);
+        findObjectById_async(__cb, __p_id, __current);
     }
     catch(const ::std::exception& __ex)
     {
@@ -1498,13 +1504,13 @@ Ice::Locator::___findAdapterById(::IceInternal::Incoming& __inS, const ::Ice::Cu
 {
     __checkMode(::Ice::Idempotent, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string id;
-    __is->read(id);
+    ::std::string __p_id;
+    __is->read(__p_id);
     __inS.endReadParams();
     ::Ice::AMD_Locator_findAdapterByIdPtr __cb = new IceAsync::Ice::AMD_Locator_findAdapterById(__inS);
     try
     {
-        findAdapterById_async(__cb, id, __current);
+        findAdapterById_async(__cb, __p_id, __current);
     }
     catch(const ::std::exception& __ex)
     {
@@ -1603,7 +1609,7 @@ Ice::Locator::__readImpl(::IceInternal::BasicStream* __is)
     __is->endReadSlice();
 }
 
-void ICE_DECLSPEC_EXPORT 
+void ICE_API 
 Ice::__patch(LocatorPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::Ice::LocatorPtr::dynamicCast(v);
@@ -1613,7 +1619,7 @@ Ice::__patch(LocatorPtr& handle, const ::Ice::ObjectPtr& v)
     }
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::Object* Ice::upCast(::Ice::LocatorRegistry* p) { return p; }
+ICE_API ::Ice::Object* Ice::upCast(::Ice::LocatorRegistry* p) { return p; }
 
 namespace
 {
@@ -1659,15 +1665,15 @@ Ice::LocatorRegistry::___setAdapterDirectProxy(::IceInternal::Incoming& __inS, c
 {
     __checkMode(::Ice::Idempotent, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string id;
-    ::Ice::ObjectPrx proxy;
-    __is->read(id);
-    __is->read(proxy);
+    ::std::string __p_id;
+    ::Ice::ObjectPrx __p_proxy;
+    __is->read(__p_id);
+    __is->read(__p_proxy);
     __inS.endReadParams();
     ::Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr __cb = new IceAsync::Ice::AMD_LocatorRegistry_setAdapterDirectProxy(__inS);
     try
     {
-        setAdapterDirectProxy_async(__cb, id, proxy, __current);
+        setAdapterDirectProxy_async(__cb, __p_id, __p_proxy, __current);
     }
     catch(const ::std::exception& __ex)
     {
@@ -1685,17 +1691,17 @@ Ice::LocatorRegistry::___setReplicatedAdapterDirectProxy(::IceInternal::Incoming
 {
     __checkMode(::Ice::Idempotent, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string adapterId;
-    ::std::string replicaGroupId;
-    ::Ice::ObjectPrx p;
-    __is->read(adapterId);
-    __is->read(replicaGroupId);
-    __is->read(p);
+    ::std::string __p_adapterId;
+    ::std::string __p_replicaGroupId;
+    ::Ice::ObjectPrx __p_p;
+    __is->read(__p_adapterId);
+    __is->read(__p_replicaGroupId);
+    __is->read(__p_p);
     __inS.endReadParams();
     ::Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxyPtr __cb = new IceAsync::Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxy(__inS);
     try
     {
-        setReplicatedAdapterDirectProxy_async(__cb, adapterId, replicaGroupId, p, __current);
+        setReplicatedAdapterDirectProxy_async(__cb, __p_adapterId, __p_replicaGroupId, __p_p, __current);
     }
     catch(const ::std::exception& __ex)
     {
@@ -1713,15 +1719,15 @@ Ice::LocatorRegistry::___setServerProcessProxy(::IceInternal::Incoming& __inS, c
 {
     __checkMode(::Ice::Idempotent, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string id;
-    ::Ice::ProcessPrx proxy;
-    __is->read(id);
-    __is->read(proxy);
+    ::std::string __p_id;
+    ::Ice::ProcessPrx __p_proxy;
+    __is->read(__p_id);
+    __is->read(__p_proxy);
     __inS.endReadParams();
     ::Ice::AMD_LocatorRegistry_setServerProcessProxyPtr __cb = new IceAsync::Ice::AMD_LocatorRegistry_setServerProcessProxy(__inS);
     try
     {
-        setServerProcessProxy_async(__cb, id, proxy, __current);
+        setServerProcessProxy_async(__cb, __p_id, __p_proxy, __current);
     }
     catch(const ::std::exception& __ex)
     {
@@ -1808,7 +1814,7 @@ Ice::LocatorRegistry::__readImpl(::IceInternal::BasicStream* __is)
     __is->endReadSlice();
 }
 
-void ICE_DECLSPEC_EXPORT 
+void ICE_API 
 Ice::__patch(LocatorRegistryPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::Ice::LocatorRegistryPtr::dynamicCast(v);
@@ -1818,7 +1824,7 @@ Ice::__patch(LocatorRegistryPtr& handle, const ::Ice::ObjectPtr& v)
     }
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::Object* Ice::upCast(::Ice::LocatorFinder* p) { return p; }
+ICE_API ::Ice::Object* Ice::upCast(::Ice::LocatorFinder* p) { return p; }
 
 namespace
 {
@@ -1935,7 +1941,7 @@ Ice::LocatorFinder::__readImpl(::IceInternal::BasicStream* __is)
     __is->endReadSlice();
 }
 
-void ICE_DECLSPEC_EXPORT 
+void ICE_API 
 Ice::__patch(LocatorFinderPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::Ice::LocatorFinderPtr::dynamicCast(v);