zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/cpp/include/Ice/Identity.h

@@ -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,14 +32,22 @@
 #include <IceUtil/UndefSysMacros.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
 
 #ifndef ICE_API
 #   ifdef ICE_API_EXPORTS
 #       define ICE_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_API /**/
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif
@@ -149,7 +157,7 @@ struct StreamReader< ::Ice::Identity, S>
     }
 };
 
-#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_API_EXPORTS)
+#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_API_EXPORTS) && !defined(ICE_STATIC_LIBS)
 template struct ICE_API StreamWriter< ::Ice::Identity, ::IceInternal::BasicStream>;
 template struct ICE_API StreamReader< ::Ice::Identity, ::IceInternal::BasicStream>;
 #endif

data/ext/ice/cpp/include/Ice/ImplicitContext.h

@@ -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>
 //
@@ -34,14 +34,22 @@
 #include <IceUtil/UndefSysMacros.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
 
 #ifndef ICE_API
 #   ifdef ICE_API_EXPORTS
 #       define ICE_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_API /**/
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif

data/ext/ice/cpp/include/Ice/ImplicitContextF.h

@@ -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,14 +32,22 @@
 #include <IceUtil/UndefSysMacros.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
 
 #ifndef ICE_API
 #   ifdef ICE_API_EXPORTS
 #       define ICE_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_API /**/
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif

data/ext/ice/cpp/include/Ice/Incoming.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/include/Ice/IncomingAsync.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/include/Ice/IncomingAsyncF.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/include/Ice/Initialize.h

@@ -22,6 +22,7 @@
 #include <Ice/BuiltinSequences.h>
 #include <Ice/Version.h>
 #include <Ice/Plugin.h>
+#include <Ice/BatchRequestInterceptor.h>
 
 namespace Ice
 {
@@ -86,6 +87,7 @@ struct InitializationData
     ThreadNotificationPtr threadHook;
     DispatcherPtr dispatcher;
     CompactIdResolverPtr compactIdResolver;
+    BatchRequestInterceptorPtr batchRequestInterceptor;
 };
 
 ICE_API CommunicatorPtr initialize(int&, char*[], const InitializationData& = InitializationData(),
@@ -94,7 +96,7 @@ ICE_API CommunicatorPtr initialize(int&, char*[], const InitializationData& = In
 ICE_API CommunicatorPtr initialize(Ice::StringSeq&, const InitializationData& = InitializationData(),
                                    Int = ICE_INT_VERSION);
 
-ICE_API CommunicatorPtr initialize(const InitializationData& = InitializationData(), 
+ICE_API CommunicatorPtr initialize(const InitializationData& = InitializationData(),
                                    Int = ICE_INT_VERSION);
 
 
@@ -111,7 +113,7 @@ ICE_API InputStreamPtr createInputStream(const CommunicatorPtr&,
 ICE_API InputStreamPtr wrapInputStream(const CommunicatorPtr&,
                                        const ::std::pair< const Ice::Byte*, const Ice::Byte*>&);
 ICE_API InputStreamPtr wrapInputStream(const CommunicatorPtr&,
-                                       const ::std::pair< const Ice::Byte*, const Ice::Byte*>&, 
+                                       const ::std::pair< const Ice::Byte*, const Ice::Byte*>&,
                                        const EncodingVersion&);
 
 ICE_API OutputStreamPtr createOutputStream(const CommunicatorPtr&);

data/ext/ice/cpp/include/Ice/InstanceF.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/include/Ice/Instrumentation.h

@@ -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>
 //
@@ -35,14 +35,22 @@
 #include <IceUtil/UndefSysMacros.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
 
 #ifndef ICE_API
 #   ifdef ICE_API_EXPORTS
 #       define ICE_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_API /**/
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif

data/ext/ice/cpp/include/Ice/InstrumentationF.h

@@ -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,14 +32,22 @@
 #include <IceUtil/UndefSysMacros.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
 
 #ifndef ICE_API
 #   ifdef ICE_API_EXPORTS
 #       define ICE_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_API /**/
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif

data/ext/ice/cpp/include/Ice/LocalException.h

@@ -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>
 //
@@ -35,14 +35,22 @@
 #include <IceUtil/UndefSysMacros.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
 
 #ifndef ICE_API
 #   ifdef ICE_API_EXPORTS
 #       define ICE_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_API /**/
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif

data/ext/ice/cpp/include/Ice/LocalObject.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/include/Ice/LocalObjectF.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/include/Ice/Locator.h

@@ -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>
 //
@@ -41,14 +41,22 @@
 #include <IceUtil/UndefSysMacros.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
 
 #ifndef ICE_API
 #   ifdef ICE_API_EXPORTS
 #       define ICE_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_API /**/
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif
@@ -392,71 +400,71 @@ class ICE_API Locator : virtual public ::IceProxy::Ice::Object
 {
 public:
 
-    ::Ice::ObjectPrx findObjectById(const ::Ice::Identity& id)
+    ::Ice::ObjectPrx findObjectById(const ::Ice::Identity& __p_id)
     {
-        return findObjectById(id, 0);
+        return findObjectById(__p_id, 0);
     }
-    ::Ice::ObjectPrx findObjectById(const ::Ice::Identity& id, const ::Ice::Context& __ctx)
+    ::Ice::ObjectPrx findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Context& __ctx)
     {
-        return findObjectById(id, &__ctx);
+        return findObjectById(__p_id, &__ctx);
     }
 #ifdef ICE_CPP11
     ::Ice::AsyncResultPtr
-    begin_findObjectById(const ::Ice::Identity& id, const ::IceInternal::Function<void (const ::Ice::ObjectPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    begin_findObjectById(const ::Ice::Identity& __p_id, const ::IceInternal::Function<void (const ::Ice::ObjectPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return __begin_findObjectById(id, 0, __response, __exception, __sent);
+        return __begin_findObjectById(__p_id, 0, __response, __exception, __sent);
     }
     ::Ice::AsyncResultPtr
-    begin_findObjectById(const ::Ice::Identity& id, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_findObjectById(const ::Ice::Identity& __p_id, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_findObjectById(id, 0, ::Ice::newCallback(__completed, __sent), 0);
+        return begin_findObjectById(__p_id, 0, ::Ice::newCallback(__completed, __sent), 0);
     }
     ::Ice::AsyncResultPtr
-    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 = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    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 = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return __begin_findObjectById(id, &__ctx, __response, __exception, __sent);
+        return __begin_findObjectById(__p_id, &__ctx, __response, __exception, __sent);
     }
     ::Ice::AsyncResultPtr
-    begin_findObjectById(const ::Ice::Identity& id, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_findObjectById(id, &__ctx, ::Ice::newCallback(__completed, __sent));
+        return begin_findObjectById(__p_id, &__ctx, ::Ice::newCallback(__completed, __sent));
     }
     
 private:
 
-    ::Ice::AsyncResultPtr __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);
+    ::Ice::AsyncResultPtr __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);
     
 public:
 #endif
 
-    ::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity& id)
+    ::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity& __p_id)
     {
-        return begin_findObjectById(id, 0, ::IceInternal::__dummyCallback, 0);
+        return begin_findObjectById(__p_id, 0, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity& id, const ::Ice::Context& __ctx)
+    ::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Context& __ctx)
     {
-        return begin_findObjectById(id, &__ctx, ::IceInternal::__dummyCallback, 0);
+        return begin_findObjectById(__p_id, &__ctx, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity& id, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity& __p_id, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_findObjectById(id, 0, __del, __cookie);
+        return begin_findObjectById(__p_id, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity& id, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_findObjectById(id, &__ctx, __del, __cookie);
+        return begin_findObjectById(__p_id, &__ctx, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity& id, const ::Ice::Callback_Locator_findObjectByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Callback_Locator_findObjectByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_findObjectById(id, 0, __del, __cookie);
+        return begin_findObjectById(__p_id, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity& id, const ::Ice::Context& __ctx, const ::Ice::Callback_Locator_findObjectByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findObjectById(const ::Ice::Identity& __p_id, const ::Ice::Context& __ctx, const ::Ice::Callback_Locator_findObjectByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_findObjectById(id, &__ctx, __del, __cookie);
+        return begin_findObjectById(__p_id, &__ctx, __del, __cookie);
     }
 
     ::Ice::ObjectPrx end_findObjectById(const ::Ice::AsyncResultPtr&);
@@ -468,71 +476,71 @@ private:
     
 public:
 
-    ::Ice::ObjectPrx findAdapterById(const ::std::string& id)
+    ::Ice::ObjectPrx findAdapterById(const ::std::string& __p_id)
     {
-        return findAdapterById(id, 0);
+        return findAdapterById(__p_id, 0);
     }
-    ::Ice::ObjectPrx findAdapterById(const ::std::string& id, const ::Ice::Context& __ctx)
+    ::Ice::ObjectPrx findAdapterById(const ::std::string& __p_id, const ::Ice::Context& __ctx)
     {
-        return findAdapterById(id, &__ctx);
+        return findAdapterById(__p_id, &__ctx);
     }
 #ifdef ICE_CPP11
     ::Ice::AsyncResultPtr
-    begin_findAdapterById(const ::std::string& id, const ::IceInternal::Function<void (const ::Ice::ObjectPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    begin_findAdapterById(const ::std::string& __p_id, const ::IceInternal::Function<void (const ::Ice::ObjectPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return __begin_findAdapterById(id, 0, __response, __exception, __sent);
+        return __begin_findAdapterById(__p_id, 0, __response, __exception, __sent);
     }
     ::Ice::AsyncResultPtr
-    begin_findAdapterById(const ::std::string& id, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_findAdapterById(const ::std::string& __p_id, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_findAdapterById(id, 0, ::Ice::newCallback(__completed, __sent), 0);
+        return begin_findAdapterById(__p_id, 0, ::Ice::newCallback(__completed, __sent), 0);
     }
     ::Ice::AsyncResultPtr
-    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 = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    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 = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return __begin_findAdapterById(id, &__ctx, __response, __exception, __sent);
+        return __begin_findAdapterById(__p_id, &__ctx, __response, __exception, __sent);
     }
     ::Ice::AsyncResultPtr
-    begin_findAdapterById(const ::std::string& id, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_findAdapterById(const ::std::string& __p_id, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_findAdapterById(id, &__ctx, ::Ice::newCallback(__completed, __sent));
+        return begin_findAdapterById(__p_id, &__ctx, ::Ice::newCallback(__completed, __sent));
     }
     
 private:
 
-    ::Ice::AsyncResultPtr __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);
+    ::Ice::AsyncResultPtr __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);
     
 public:
 #endif
 
-    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& id)
+    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& __p_id)
     {
-        return begin_findAdapterById(id, 0, ::IceInternal::__dummyCallback, 0);
+        return begin_findAdapterById(__p_id, 0, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& id, const ::Ice::Context& __ctx)
+    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& __p_id, const ::Ice::Context& __ctx)
     {
-        return begin_findAdapterById(id, &__ctx, ::IceInternal::__dummyCallback, 0);
+        return begin_findAdapterById(__p_id, &__ctx, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& id, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& __p_id, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_findAdapterById(id, 0, __del, __cookie);
+        return begin_findAdapterById(__p_id, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& id, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& __p_id, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_findAdapterById(id, &__ctx, __del, __cookie);
+        return begin_findAdapterById(__p_id, &__ctx, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& id, const ::Ice::Callback_Locator_findAdapterByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& __p_id, const ::Ice::Callback_Locator_findAdapterByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_findAdapterById(id, 0, __del, __cookie);
+        return begin_findAdapterById(__p_id, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& id, const ::Ice::Context& __ctx, const ::Ice::Callback_Locator_findAdapterByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& __p_id, const ::Ice::Context& __ctx, const ::Ice::Callback_Locator_findAdapterByIdPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_findAdapterById(id, &__ctx, __del, __cookie);
+        return begin_findAdapterById(__p_id, &__ctx, __del, __cookie);
     }
 
     ::Ice::ObjectPrx end_findAdapterById(const ::Ice::AsyncResultPtr&);
@@ -735,71 +743,71 @@ class ICE_API LocatorRegistry : virtual public ::IceProxy::Ice::Object
 {
 public:
 
-    void setAdapterDirectProxy(const ::std::string& id, const ::Ice::ObjectPrx& proxy)
+    void setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy)
     {
-        setAdapterDirectProxy(id, proxy, 0);
+        setAdapterDirectProxy(__p_id, __p_proxy, 0);
     }
-    void setAdapterDirectProxy(const ::std::string& id, const ::Ice::ObjectPrx& proxy, const ::Ice::Context& __ctx)
+    void setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Context& __ctx)
     {
-        setAdapterDirectProxy(id, proxy, &__ctx);
+        setAdapterDirectProxy(__p_id, __p_proxy, &__ctx);
     }
 #ifdef ICE_CPP11
     ::Ice::AsyncResultPtr
-    begin_setAdapterDirectProxy(const ::std::string& id, const ::Ice::ObjectPrx& proxy, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return __begin_setAdapterDirectProxy(id, proxy, 0, __response, __exception, __sent);
+        return __begin_setAdapterDirectProxy(__p_id, __p_proxy, 0, __response, __exception, __sent);
     }
     ::Ice::AsyncResultPtr
-    begin_setAdapterDirectProxy(const ::std::string& id, const ::Ice::ObjectPrx& proxy, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_setAdapterDirectProxy(id, proxy, 0, ::Ice::newCallback(__completed, __sent), 0);
+        return begin_setAdapterDirectProxy(__p_id, __p_proxy, 0, ::Ice::newCallback(__completed, __sent), 0);
     }
     ::Ice::AsyncResultPtr
-    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 = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    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 = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return __begin_setAdapterDirectProxy(id, proxy, &__ctx, __response, __exception, __sent);
+        return __begin_setAdapterDirectProxy(__p_id, __p_proxy, &__ctx, __response, __exception, __sent);
     }
     ::Ice::AsyncResultPtr
-    begin_setAdapterDirectProxy(const ::std::string& id, const ::Ice::ObjectPrx& proxy, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_setAdapterDirectProxy(id, proxy, &__ctx, ::Ice::newCallback(__completed, __sent));
+        return begin_setAdapterDirectProxy(__p_id, __p_proxy, &__ctx, ::Ice::newCallback(__completed, __sent));
     }
     
 private:
 
-    ::Ice::AsyncResultPtr __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);
+    ::Ice::AsyncResultPtr __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);
     
 public:
 #endif
 
-    ::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string& id, const ::Ice::ObjectPrx& proxy)
+    ::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy)
     {
-        return begin_setAdapterDirectProxy(id, proxy, 0, ::IceInternal::__dummyCallback, 0);
+        return begin_setAdapterDirectProxy(__p_id, __p_proxy, 0, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string& id, const ::Ice::ObjectPrx& proxy, const ::Ice::Context& __ctx)
+    ::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Context& __ctx)
     {
-        return begin_setAdapterDirectProxy(id, proxy, &__ctx, ::IceInternal::__dummyCallback, 0);
+        return begin_setAdapterDirectProxy(__p_id, __p_proxy, &__ctx, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string& id, const ::Ice::ObjectPrx& proxy, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_setAdapterDirectProxy(id, proxy, 0, __del, __cookie);
+        return begin_setAdapterDirectProxy(__p_id, __p_proxy, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string& id, const ::Ice::ObjectPrx& proxy, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_setAdapterDirectProxy(id, proxy, &__ctx, __del, __cookie);
+        return begin_setAdapterDirectProxy(__p_id, __p_proxy, &__ctx, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string& id, const ::Ice::ObjectPrx& proxy, const ::Ice::Callback_LocatorRegistry_setAdapterDirectProxyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Callback_LocatorRegistry_setAdapterDirectProxyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_setAdapterDirectProxy(id, proxy, 0, __del, __cookie);
+        return begin_setAdapterDirectProxy(__p_id, __p_proxy, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string& id, const ::Ice::ObjectPrx& proxy, const ::Ice::Context& __ctx, const ::Ice::Callback_LocatorRegistry_setAdapterDirectProxyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_setAdapterDirectProxy(const ::std::string& __p_id, const ::Ice::ObjectPrx& __p_proxy, const ::Ice::Context& __ctx, const ::Ice::Callback_LocatorRegistry_setAdapterDirectProxyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_setAdapterDirectProxy(id, proxy, &__ctx, __del, __cookie);
+        return begin_setAdapterDirectProxy(__p_id, __p_proxy, &__ctx, __del, __cookie);
     }
 
     void end_setAdapterDirectProxy(const ::Ice::AsyncResultPtr&);
@@ -811,71 +819,71 @@ private:
     
 public:
 
-    void setReplicatedAdapterDirectProxy(const ::std::string& adapterId, const ::std::string& replicaGroupId, const ::Ice::ObjectPrx& p)
+    void setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p)
     {
-        setReplicatedAdapterDirectProxy(adapterId, replicaGroupId, p, 0);
+        setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, 0);
     }
-    void setReplicatedAdapterDirectProxy(const ::std::string& adapterId, const ::std::string& replicaGroupId, const ::Ice::ObjectPrx& p, const ::Ice::Context& __ctx)
+    void setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::Context& __ctx)
     {
-        setReplicatedAdapterDirectProxy(adapterId, replicaGroupId, p, &__ctx);
+        setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, &__ctx);
     }
 #ifdef ICE_CPP11
     ::Ice::AsyncResultPtr
-    begin_setReplicatedAdapterDirectProxy(const ::std::string& adapterId, const ::std::string& replicaGroupId, const ::Ice::ObjectPrx& p, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return __begin_setReplicatedAdapterDirectProxy(adapterId, replicaGroupId, p, 0, __response, __exception, __sent);
+        return __begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, 0, __response, __exception, __sent);
     }
     ::Ice::AsyncResultPtr
-    begin_setReplicatedAdapterDirectProxy(const ::std::string& adapterId, const ::std::string& replicaGroupId, const ::Ice::ObjectPrx& p, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_setReplicatedAdapterDirectProxy(adapterId, replicaGroupId, p, 0, ::Ice::newCallback(__completed, __sent), 0);
+        return begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, 0, ::Ice::newCallback(__completed, __sent), 0);
     }
     ::Ice::AsyncResultPtr
-    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 = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    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 = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return __begin_setReplicatedAdapterDirectProxy(adapterId, replicaGroupId, p, &__ctx, __response, __exception, __sent);
+        return __begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, &__ctx, __response, __exception, __sent);
     }
     ::Ice::AsyncResultPtr
-    begin_setReplicatedAdapterDirectProxy(const ::std::string& adapterId, const ::std::string& replicaGroupId, const ::Ice::ObjectPrx& p, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    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 (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_setReplicatedAdapterDirectProxy(adapterId, replicaGroupId, p, &__ctx, ::Ice::newCallback(__completed, __sent));
+        return begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, &__ctx, ::Ice::newCallback(__completed, __sent));
     }
     
 private:
 
-    ::Ice::AsyncResultPtr __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);
+    ::Ice::AsyncResultPtr __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);
     
 public:
 #endif
 
-    ::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string& adapterId, const ::std::string& replicaGroupId, const ::Ice::ObjectPrx& p)
+    ::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p)
     {
-        return begin_setReplicatedAdapterDirectProxy(adapterId, replicaGroupId, p, 0, ::IceInternal::__dummyCallback, 0);
+        return begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, 0, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string& adapterId, const ::std::string& replicaGroupId, const ::Ice::ObjectPrx& p, const ::Ice::Context& __ctx)
+    ::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::Context& __ctx)
     {
-        return begin_setReplicatedAdapterDirectProxy(adapterId, replicaGroupId, p, &__ctx, ::IceInternal::__dummyCallback, 0);
+        return begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, &__ctx, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string& adapterId, const ::std::string& replicaGroupId, const ::Ice::ObjectPrx& p, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_setReplicatedAdapterDirectProxy(adapterId, replicaGroupId, p, 0, __del, __cookie);
+        return begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string& adapterId, const ::std::string& replicaGroupId, const ::Ice::ObjectPrx& p, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_setReplicatedAdapterDirectProxy(adapterId, replicaGroupId, p, &__ctx, __del, __cookie);
+        return begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, &__ctx, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string& adapterId, const ::std::string& replicaGroupId, const ::Ice::ObjectPrx& p, const ::Ice::Callback_LocatorRegistry_setReplicatedAdapterDirectProxyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::Callback_LocatorRegistry_setReplicatedAdapterDirectProxyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_setReplicatedAdapterDirectProxy(adapterId, replicaGroupId, p, 0, __del, __cookie);
+        return begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string& adapterId, const ::std::string& replicaGroupId, const ::Ice::ObjectPrx& p, const ::Ice::Context& __ctx, const ::Ice::Callback_LocatorRegistry_setReplicatedAdapterDirectProxyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_setReplicatedAdapterDirectProxy(const ::std::string& __p_adapterId, const ::std::string& __p_replicaGroupId, const ::Ice::ObjectPrx& __p_p, const ::Ice::Context& __ctx, const ::Ice::Callback_LocatorRegistry_setReplicatedAdapterDirectProxyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_setReplicatedAdapterDirectProxy(adapterId, replicaGroupId, p, &__ctx, __del, __cookie);
+        return begin_setReplicatedAdapterDirectProxy(__p_adapterId, __p_replicaGroupId, __p_p, &__ctx, __del, __cookie);
     }
 
     void end_setReplicatedAdapterDirectProxy(const ::Ice::AsyncResultPtr&);
@@ -887,71 +895,71 @@ private:
     
 public:
 
-    void setServerProcessProxy(const ::std::string& id, const ::Ice::ProcessPrx& proxy)
+    void setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy)
     {
-        setServerProcessProxy(id, proxy, 0);
+        setServerProcessProxy(__p_id, __p_proxy, 0);
     }
-    void setServerProcessProxy(const ::std::string& id, const ::Ice::ProcessPrx& proxy, const ::Ice::Context& __ctx)
+    void setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Context& __ctx)
     {
-        setServerProcessProxy(id, proxy, &__ctx);
+        setServerProcessProxy(__p_id, __p_proxy, &__ctx);
     }
 #ifdef ICE_CPP11
     ::Ice::AsyncResultPtr
-    begin_setServerProcessProxy(const ::std::string& id, const ::Ice::ProcessPrx& proxy, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return __begin_setServerProcessProxy(id, proxy, 0, __response, __exception, __sent);
+        return __begin_setServerProcessProxy(__p_id, __p_proxy, 0, __response, __exception, __sent);
     }
     ::Ice::AsyncResultPtr
-    begin_setServerProcessProxy(const ::std::string& id, const ::Ice::ProcessPrx& proxy, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_setServerProcessProxy(id, proxy, 0, ::Ice::newCallback(__completed, __sent), 0);
+        return begin_setServerProcessProxy(__p_id, __p_proxy, 0, ::Ice::newCallback(__completed, __sent), 0);
     }
     ::Ice::AsyncResultPtr
-    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 = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    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 = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return __begin_setServerProcessProxy(id, proxy, &__ctx, __response, __exception, __sent);
+        return __begin_setServerProcessProxy(__p_id, __p_proxy, &__ctx, __response, __exception, __sent);
     }
     ::Ice::AsyncResultPtr
-    begin_setServerProcessProxy(const ::std::string& id, const ::Ice::ProcessPrx& proxy, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_setServerProcessProxy(id, proxy, &__ctx, ::Ice::newCallback(__completed, __sent));
+        return begin_setServerProcessProxy(__p_id, __p_proxy, &__ctx, ::Ice::newCallback(__completed, __sent));
     }
     
 private:
 
-    ::Ice::AsyncResultPtr __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);
+    ::Ice::AsyncResultPtr __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);
     
 public:
 #endif
 
-    ::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string& id, const ::Ice::ProcessPrx& proxy)
+    ::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy)
     {
-        return begin_setServerProcessProxy(id, proxy, 0, ::IceInternal::__dummyCallback, 0);
+        return begin_setServerProcessProxy(__p_id, __p_proxy, 0, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string& id, const ::Ice::ProcessPrx& proxy, const ::Ice::Context& __ctx)
+    ::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Context& __ctx)
     {
-        return begin_setServerProcessProxy(id, proxy, &__ctx, ::IceInternal::__dummyCallback, 0);
+        return begin_setServerProcessProxy(__p_id, __p_proxy, &__ctx, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string& id, const ::Ice::ProcessPrx& proxy, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_setServerProcessProxy(id, proxy, 0, __del, __cookie);
+        return begin_setServerProcessProxy(__p_id, __p_proxy, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string& id, const ::Ice::ProcessPrx& proxy, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_setServerProcessProxy(id, proxy, &__ctx, __del, __cookie);
+        return begin_setServerProcessProxy(__p_id, __p_proxy, &__ctx, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string& id, const ::Ice::ProcessPrx& proxy, const ::Ice::Callback_LocatorRegistry_setServerProcessProxyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Callback_LocatorRegistry_setServerProcessProxyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_setServerProcessProxy(id, proxy, 0, __del, __cookie);
+        return begin_setServerProcessProxy(__p_id, __p_proxy, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string& id, const ::Ice::ProcessPrx& proxy, const ::Ice::Context& __ctx, const ::Ice::Callback_LocatorRegistry_setServerProcessProxyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_setServerProcessProxy(const ::std::string& __p_id, const ::Ice::ProcessPrx& __p_proxy, const ::Ice::Context& __ctx, const ::Ice::Callback_LocatorRegistry_setServerProcessProxyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_setServerProcessProxy(id, proxy, &__ctx, __del, __cookie);
+        return begin_setServerProcessProxy(__p_id, __p_proxy, &__ctx, __del, __cookie);
     }
 
     void end_setServerProcessProxy(const ::Ice::AsyncResultPtr&);