1 files changed, 75 insertions, 0 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index aadce898703..ba56ed55365 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -121,6 +121,12 @@ IceProxy::Ice::Object::ice_hash() const
 }
 
 bool
+IceProxy::Ice::Object::ice_isA(const string& __id)
+{
+    return ice_isA(__id, _reference->context);
+}
+
+bool
 IceProxy::Ice::Object::ice_isA(const string& __id, const Context& __context)
 {
     int __cnt = 0;
@@ -143,6 +149,12 @@ IceProxy::Ice::Object::ice_isA(const string& __id, const Context& __context)
 }
 
 void
+IceProxy::Ice::Object::ice_ping()
+{
+    return ice_ping(_reference->context);
+}
+
+void
 IceProxy::Ice::Object::ice_ping(const Context& __context)
 {
     int __cnt = 0;
@@ -166,6 +178,12 @@ IceProxy::Ice::Object::ice_ping(const Context& __context)
 }
 
 vector<string>
+IceProxy::Ice::Object::ice_ids()
+{
+    return ice_ids(_reference->context);
+}
+
+vector<string>
 IceProxy::Ice::Object::ice_ids(const Context& __context)
 {
     int __cnt = 0;
@@ -188,6 +206,12 @@ IceProxy::Ice::Object::ice_ids(const Context& __context)
 }
 
 string
+IceProxy::Ice::Object::ice_id()
+{
+    return ice_id(_reference->context);
+}
+
+string
 IceProxy::Ice::Object::ice_id(const Context& __context)
 {
     int __cnt = 0;
@@ -210,6 +234,12 @@ IceProxy::Ice::Object::ice_id(const Context& __context)
 }
 
 FacetPath
+IceProxy::Ice::Object::ice_facets()
+{
+    return ice_facets(_reference->context);
+}
+
+FacetPath
 IceProxy::Ice::Object::ice_facets(const Context& __context)
 {
     int __cnt = 0;
@@ -235,6 +265,15 @@ bool
 IceProxy::Ice::Object::ice_invoke(const string& operation,
 				  OperationMode mode,
 				  const vector<Byte>& inParams,
+				  vector<Byte>& outParams)
+{
+    return ice_invoke(operation, mode, inParams, outParams, _reference->context);
+}
+
+bool
+IceProxy::Ice::Object::ice_invoke(const string& operation,
+				  OperationMode mode,
+				  const vector<Byte>& inParams,
 				  vector<Byte>& outParams,
 				  const Context& context)
 {
@@ -269,6 +308,15 @@ void
 IceProxy::Ice::Object::ice_invoke_async(const AMI_Object_ice_invokePtr& cb,
 					const string& operation,
 					OperationMode mode,
+					const vector<Byte>& inParams)
+{
+    return ice_invoke_async(cb, operation, mode, inParams, _reference->context);
+}
+
+void
+IceProxy::Ice::Object::ice_invoke_async(const AMI_Object_ice_invokePtr& cb,
+					const string& operation,
+					OperationMode mode,
 					const vector<Byte>& inParams,
 					const Context& context)
 {
@@ -288,6 +336,27 @@ IceProxy::Ice::Object::ice_invoke_async(const AMI_Object_ice_invokePtr& cb,
     }
 }
 
+Context
+IceProxy::Ice::Object::ice_getContext() const
+{
+    return _reference->context;
+}
+
+ObjectPrx
+IceProxy::Ice::Object::ice_newContext(const Context& newContext) const
+{
+    if(newContext == _reference->context)
+    {
+	return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+    }
+    else
+    {
+	ObjectPrx proxy(new ::IceProxy::Ice::Object());
+	proxy->setup(_reference->changeContext(newContext));
+	return proxy;
+    }
+}
+
 Identity
 IceProxy::Ice::Object::ice_getIdentity() const
 {
@@ -767,6 +836,12 @@ IceProxy::Ice::Object::__createDelegateD()
     return Handle< ::IceDelegateD::Ice::Object>(new ::IceDelegateD::Ice::Object);
 }
 
+const Context&
+IceProxy::Ice::Object::__defaultContext() const
+{
+    return _reference->context;
+}
+
 void
 IceProxy::Ice::Object::setup(const ReferencePtr& ref)
 {