zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/cpp/include/Ice/Properties.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>
 //
@@ -39,14 +39,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/PropertiesAdmin.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>
 //
@@ -39,14 +39,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
@@ -143,71 +151,71 @@ class ICE_API PropertiesAdmin : virtual public ::IceProxy::Ice::Object
 {
 public:
 
-    ::std::string getProperty(const ::std::string& key)
+    ::std::string getProperty(const ::std::string& __p_key)
     {
-        return getProperty(key, 0);
+        return getProperty(__p_key, 0);
     }
-    ::std::string getProperty(const ::std::string& key, const ::Ice::Context& __ctx)
+    ::std::string getProperty(const ::std::string& __p_key, const ::Ice::Context& __ctx)
     {
-        return getProperty(key, &__ctx);
+        return getProperty(__p_key, &__ctx);
     }
 #ifdef ICE_CPP11
     ::Ice::AsyncResultPtr
-    begin_getProperty(const ::std::string& key, const ::IceInternal::Function<void (const ::std::string&)>& __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_getProperty(const ::std::string& __p_key, const ::IceInternal::Function<void (const ::std::string&)>& __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_getProperty(key, 0, __response, __exception, __sent);
+        return __begin_getProperty(__p_key, 0, __response, __exception, __sent);
     }
     ::Ice::AsyncResultPtr
-    begin_getProperty(const ::std::string& key, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_getProperty(const ::std::string& __p_key, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_getProperty(key, 0, ::Ice::newCallback(__completed, __sent), 0);
+        return begin_getProperty(__p_key, 0, ::Ice::newCallback(__completed, __sent), 0);
     }
     ::Ice::AsyncResultPtr
-    begin_getProperty(const ::std::string& key, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::std::string&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    begin_getProperty(const ::std::string& __p_key, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::std::string&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return __begin_getProperty(key, &__ctx, __response, __exception, __sent);
+        return __begin_getProperty(__p_key, &__ctx, __response, __exception, __sent);
     }
     ::Ice::AsyncResultPtr
-    begin_getProperty(const ::std::string& key, 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_getProperty(const ::std::string& __p_key, 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_getProperty(key, &__ctx, ::Ice::newCallback(__completed, __sent));
+        return begin_getProperty(__p_key, &__ctx, ::Ice::newCallback(__completed, __sent));
     }
     
 private:
 
-    ::Ice::AsyncResultPtr __begin_getProperty(const ::std::string& key, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::std::string&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent);
+    ::Ice::AsyncResultPtr __begin_getProperty(const ::std::string& __p_key, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::std::string&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent);
     
 public:
 #endif
 
-    ::Ice::AsyncResultPtr begin_getProperty(const ::std::string& key)
+    ::Ice::AsyncResultPtr begin_getProperty(const ::std::string& __p_key)
     {
-        return begin_getProperty(key, 0, ::IceInternal::__dummyCallback, 0);
+        return begin_getProperty(__p_key, 0, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_getProperty(const ::std::string& key, const ::Ice::Context& __ctx)
+    ::Ice::AsyncResultPtr begin_getProperty(const ::std::string& __p_key, const ::Ice::Context& __ctx)
     {
-        return begin_getProperty(key, &__ctx, ::IceInternal::__dummyCallback, 0);
+        return begin_getProperty(__p_key, &__ctx, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_getProperty(const ::std::string& key, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_getProperty(const ::std::string& __p_key, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_getProperty(key, 0, __del, __cookie);
+        return begin_getProperty(__p_key, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_getProperty(const ::std::string& key, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_getProperty(const ::std::string& __p_key, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_getProperty(key, &__ctx, __del, __cookie);
+        return begin_getProperty(__p_key, &__ctx, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_getProperty(const ::std::string& key, const ::Ice::Callback_PropertiesAdmin_getPropertyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_getProperty(const ::std::string& __p_key, const ::Ice::Callback_PropertiesAdmin_getPropertyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_getProperty(key, 0, __del, __cookie);
+        return begin_getProperty(__p_key, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_getProperty(const ::std::string& key, const ::Ice::Context& __ctx, const ::Ice::Callback_PropertiesAdmin_getPropertyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_getProperty(const ::std::string& __p_key, const ::Ice::Context& __ctx, const ::Ice::Callback_PropertiesAdmin_getPropertyPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_getProperty(key, &__ctx, __del, __cookie);
+        return begin_getProperty(__p_key, &__ctx, __del, __cookie);
     }
 
     ::std::string end_getProperty(const ::Ice::AsyncResultPtr&);
@@ -219,71 +227,71 @@ private:
     
 public:
 
-    ::Ice::PropertyDict getPropertiesForPrefix(const ::std::string& prefix)
+    ::Ice::PropertyDict getPropertiesForPrefix(const ::std::string& __p_prefix)
     {
-        return getPropertiesForPrefix(prefix, 0);
+        return getPropertiesForPrefix(__p_prefix, 0);
     }
-    ::Ice::PropertyDict getPropertiesForPrefix(const ::std::string& prefix, const ::Ice::Context& __ctx)
+    ::Ice::PropertyDict getPropertiesForPrefix(const ::std::string& __p_prefix, const ::Ice::Context& __ctx)
     {
-        return getPropertiesForPrefix(prefix, &__ctx);
+        return getPropertiesForPrefix(__p_prefix, &__ctx);
     }
 #ifdef ICE_CPP11
     ::Ice::AsyncResultPtr
-    begin_getPropertiesForPrefix(const ::std::string& prefix, const ::IceInternal::Function<void (const ::Ice::PropertyDict&)>& __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_getPropertiesForPrefix(const ::std::string& __p_prefix, const ::IceInternal::Function<void (const ::Ice::PropertyDict&)>& __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_getPropertiesForPrefix(prefix, 0, __response, __exception, __sent);
+        return __begin_getPropertiesForPrefix(__p_prefix, 0, __response, __exception, __sent);
     }
     ::Ice::AsyncResultPtr
-    begin_getPropertiesForPrefix(const ::std::string& prefix, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_getPropertiesForPrefix(const ::std::string& __p_prefix, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_getPropertiesForPrefix(prefix, 0, ::Ice::newCallback(__completed, __sent), 0);
+        return begin_getPropertiesForPrefix(__p_prefix, 0, ::Ice::newCallback(__completed, __sent), 0);
     }
     ::Ice::AsyncResultPtr
-    begin_getPropertiesForPrefix(const ::std::string& prefix, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::PropertyDict&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
+    begin_getPropertiesForPrefix(const ::std::string& __p_prefix, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::PropertyDict&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
     {
-        return __begin_getPropertiesForPrefix(prefix, &__ctx, __response, __exception, __sent);
+        return __begin_getPropertiesForPrefix(__p_prefix, &__ctx, __response, __exception, __sent);
     }
     ::Ice::AsyncResultPtr
-    begin_getPropertiesForPrefix(const ::std::string& prefix, 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_getPropertiesForPrefix(const ::std::string& __p_prefix, 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_getPropertiesForPrefix(prefix, &__ctx, ::Ice::newCallback(__completed, __sent));
+        return begin_getPropertiesForPrefix(__p_prefix, &__ctx, ::Ice::newCallback(__completed, __sent));
     }
     
 private:
 
-    ::Ice::AsyncResultPtr __begin_getPropertiesForPrefix(const ::std::string& prefix, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::PropertyDict&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent);
+    ::Ice::AsyncResultPtr __begin_getPropertiesForPrefix(const ::std::string& __p_prefix, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::PropertyDict&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent);
     
 public:
 #endif
 
-    ::Ice::AsyncResultPtr begin_getPropertiesForPrefix(const ::std::string& prefix)
+    ::Ice::AsyncResultPtr begin_getPropertiesForPrefix(const ::std::string& __p_prefix)
     {
-        return begin_getPropertiesForPrefix(prefix, 0, ::IceInternal::__dummyCallback, 0);
+        return begin_getPropertiesForPrefix(__p_prefix, 0, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_getPropertiesForPrefix(const ::std::string& prefix, const ::Ice::Context& __ctx)
+    ::Ice::AsyncResultPtr begin_getPropertiesForPrefix(const ::std::string& __p_prefix, const ::Ice::Context& __ctx)
     {
-        return begin_getPropertiesForPrefix(prefix, &__ctx, ::IceInternal::__dummyCallback, 0);
+        return begin_getPropertiesForPrefix(__p_prefix, &__ctx, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_getPropertiesForPrefix(const ::std::string& prefix, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_getPropertiesForPrefix(const ::std::string& __p_prefix, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_getPropertiesForPrefix(prefix, 0, __del, __cookie);
+        return begin_getPropertiesForPrefix(__p_prefix, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_getPropertiesForPrefix(const ::std::string& prefix, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_getPropertiesForPrefix(const ::std::string& __p_prefix, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_getPropertiesForPrefix(prefix, &__ctx, __del, __cookie);
+        return begin_getPropertiesForPrefix(__p_prefix, &__ctx, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_getPropertiesForPrefix(const ::std::string& prefix, const ::Ice::Callback_PropertiesAdmin_getPropertiesForPrefixPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_getPropertiesForPrefix(const ::std::string& __p_prefix, const ::Ice::Callback_PropertiesAdmin_getPropertiesForPrefixPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_getPropertiesForPrefix(prefix, 0, __del, __cookie);
+        return begin_getPropertiesForPrefix(__p_prefix, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_getPropertiesForPrefix(const ::std::string& prefix, const ::Ice::Context& __ctx, const ::Ice::Callback_PropertiesAdmin_getPropertiesForPrefixPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_getPropertiesForPrefix(const ::std::string& __p_prefix, const ::Ice::Context& __ctx, const ::Ice::Callback_PropertiesAdmin_getPropertiesForPrefixPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_getPropertiesForPrefix(prefix, &__ctx, __del, __cookie);
+        return begin_getPropertiesForPrefix(__p_prefix, &__ctx, __del, __cookie);
     }
 
     ::Ice::PropertyDict end_getPropertiesForPrefix(const ::Ice::AsyncResultPtr&);
@@ -295,65 +303,65 @@ private:
     
 public:
 
-    void setProperties(const ::Ice::PropertyDict& newProperties)
+    void setProperties(const ::Ice::PropertyDict& __p_newProperties)
     {
-        setProperties(newProperties, 0);
+        setProperties(__p_newProperties, 0);
     }
-    void setProperties(const ::Ice::PropertyDict& newProperties, const ::Ice::Context& __ctx)
+    void setProperties(const ::Ice::PropertyDict& __p_newProperties, const ::Ice::Context& __ctx)
     {
-        setProperties(newProperties, &__ctx);
+        setProperties(__p_newProperties, &__ctx);
     }
 #ifdef ICE_CPP11
     ::Ice::AsyncResultPtr
-    begin_setProperties(const ::Ice::PropertyDict& newProperties, 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_setProperties(const ::Ice::PropertyDict& __p_newProperties, 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_setProperties(newProperties, 0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent));
+        return begin_setProperties(__p_newProperties, 0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent));
     }
     ::Ice::AsyncResultPtr
-    begin_setProperties(const ::Ice::PropertyDict& newProperties, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
+    begin_setProperties(const ::Ice::PropertyDict& __p_newProperties, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_setProperties(newProperties, 0, ::Ice::newCallback(__completed, __sent), 0);
+        return begin_setProperties(__p_newProperties, 0, ::Ice::newCallback(__completed, __sent), 0);
     }
     ::Ice::AsyncResultPtr
-    begin_setProperties(const ::Ice::PropertyDict& newProperties, 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_setProperties(const ::Ice::PropertyDict& __p_newProperties, 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_setProperties(newProperties, &__ctx, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent), 0);
+        return begin_setProperties(__p_newProperties, &__ctx, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent), 0);
     }
     ::Ice::AsyncResultPtr
-    begin_setProperties(const ::Ice::PropertyDict& newProperties, 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_setProperties(const ::Ice::PropertyDict& __p_newProperties, 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_setProperties(newProperties, &__ctx, ::Ice::newCallback(__completed, __sent));
+        return begin_setProperties(__p_newProperties, &__ctx, ::Ice::newCallback(__completed, __sent));
     }
 #endif
 
-    ::Ice::AsyncResultPtr begin_setProperties(const ::Ice::PropertyDict& newProperties)
+    ::Ice::AsyncResultPtr begin_setProperties(const ::Ice::PropertyDict& __p_newProperties)
     {
-        return begin_setProperties(newProperties, 0, ::IceInternal::__dummyCallback, 0);
+        return begin_setProperties(__p_newProperties, 0, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_setProperties(const ::Ice::PropertyDict& newProperties, const ::Ice::Context& __ctx)
+    ::Ice::AsyncResultPtr begin_setProperties(const ::Ice::PropertyDict& __p_newProperties, const ::Ice::Context& __ctx)
     {
-        return begin_setProperties(newProperties, &__ctx, ::IceInternal::__dummyCallback, 0);
+        return begin_setProperties(__p_newProperties, &__ctx, ::IceInternal::__dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_setProperties(const ::Ice::PropertyDict& newProperties, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_setProperties(const ::Ice::PropertyDict& __p_newProperties, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_setProperties(newProperties, 0, __del, __cookie);
+        return begin_setProperties(__p_newProperties, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_setProperties(const ::Ice::PropertyDict& newProperties, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_setProperties(const ::Ice::PropertyDict& __p_newProperties, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_setProperties(newProperties, &__ctx, __del, __cookie);
+        return begin_setProperties(__p_newProperties, &__ctx, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_setProperties(const ::Ice::PropertyDict& newProperties, const ::Ice::Callback_PropertiesAdmin_setPropertiesPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_setProperties(const ::Ice::PropertyDict& __p_newProperties, const ::Ice::Callback_PropertiesAdmin_setPropertiesPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_setProperties(newProperties, 0, __del, __cookie);
+        return begin_setProperties(__p_newProperties, 0, __del, __cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_setProperties(const ::Ice::PropertyDict& newProperties, const ::Ice::Context& __ctx, const ::Ice::Callback_PropertiesAdmin_setPropertiesPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
+    ::Ice::AsyncResultPtr begin_setProperties(const ::Ice::PropertyDict& __p_newProperties, const ::Ice::Context& __ctx, const ::Ice::Callback_PropertiesAdmin_setPropertiesPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_setProperties(newProperties, &__ctx, __del, __cookie);
+        return begin_setProperties(__p_newProperties, &__ctx, __del, __cookie);
     }
 
     void end_setProperties(const ::Ice::AsyncResultPtr&);

data/ext/ice/cpp/include/Ice/PropertiesF.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>
 //
@@ -33,14 +33,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/Protocol.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/Proxy.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.
@@ -21,6 +21,7 @@
 #include <Ice/ObjectF.h>
 #include <Ice/ObjectAdapterF.h>
 #include <Ice/ReferenceF.h>
+#include <Ice/BatchRequestQueueF.h>
 #include <Ice/AsyncResult.h>
 //#include <Ice/RouterF.h> // Can't include RouterF.h here, otherwise we have cyclic includes
 //#include <Ice/LocatorF.h> // Can't include RouterF.h here, otherwise we have cyclic includes
@@ -844,7 +845,9 @@ public:
     void __end(const ::Ice::AsyncResultPtr&, const std::string&) const;
 
     ::IceInternal::RequestHandlerPtr __getRequestHandler();
-    void __setRequestHandler(const ::IceInternal::RequestHandlerPtr&, const ::IceInternal::RequestHandlerPtr&);
+    ::IceInternal::BatchRequestQueuePtr __getBatchRequestQueue();
+    ::IceInternal::RequestHandlerPtr __setRequestHandler(const ::IceInternal::RequestHandlerPtr&);
+    void __updateRequestHandler(const ::IceInternal::RequestHandlerPtr&, const ::IceInternal::RequestHandlerPtr&);
 
 protected:
 
@@ -977,6 +980,7 @@ private:
 
     ::IceInternal::ReferencePtr _reference;
     ::IceInternal::RequestHandlerPtr _requestHandler;
+    ::IceInternal::BatchRequestQueuePtr _batchRequestQueue;
     IceUtil::Mutex _mutex;
 };
 

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