summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Freeze/EvictorI.cpp2
-rw-r--r--cpp/src/Glacier2/Blobject.cpp2
-rw-r--r--cpp/src/Ice/Proxy.cpp44
-rw-r--r--cpp/src/Ice/Reference.h1
-rw-r--r--cpp/src/IceGrid/LocatorI.cpp6
-rwxr-xr-xcpp/src/slice2cs/Gen.cpp6
-rw-r--r--cpp/src/slice2java/Gen.cpp6
-rw-r--r--cpp/src/slice2javae/Gen.cpp6
-rwxr-xr-xcpp/src/slice2vb/Gen.cpp6
9 files changed, 55 insertions, 24 deletions
diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp
index ce7b7f783f1..1b0e066b9d5 100644
--- a/cpp/src/Freeze/EvictorI.cpp
+++ b/cpp/src/Freeze/EvictorI.cpp
@@ -602,7 +602,7 @@ Freeze::EvictorI::addFacet(const ObjectPtr& servant, const Identity& ident, cons
ObjectPrx obj = _adapter->createProxy(ident);
if(!facet.empty())
{
- obj = obj->ice_newFacet(facet);
+ obj = obj->ice_facet(facet);
}
return obj;
}
diff --git a/cpp/src/Glacier2/Blobject.cpp b/cpp/src/Glacier2/Blobject.cpp
index 3e7fa8ba5f1..9c69caca6b2 100644
--- a/cpp/src/Glacier2/Blobject.cpp
+++ b/cpp/src/Glacier2/Blobject.cpp
@@ -109,7 +109,7 @@ Glacier2::Blobject::invoke(ObjectPrx& proxy, const AMD_Array_Object_ice_invokePt
//
if(!current.facet.empty())
{
- proxy = proxy->ice_newFacet(current.facet);
+ proxy = proxy->ice_facet(current.facet);
}
//
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 441e69ef7bb..3bfdc14610a 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -54,7 +54,7 @@ IceInternal::checkedCastImpl(const ObjectPrx& b, const string& f, const string&
if(b)
{
- ObjectPrx bb = b->ice_newFacet(f);
+ ObjectPrx bb = b->ice_facet(f);
try
{
if(bb->ice_isA(typeId))
@@ -88,7 +88,7 @@ IceInternal::checkedCastImpl(const ObjectPrx& b, const string& f, const string&
if(b)
{
- ObjectPrx bb = b->ice_newFacet(f);
+ ObjectPrx bb = b->ice_facet(f);
try
{
if(bb->ice_isA(typeId, ctx))
@@ -378,7 +378,7 @@ IceProxy::Ice::Object::ice_getIdentity() const
}
ObjectPrx
-IceProxy::Ice::Object::ice_newIdentity(const Identity& newIdentity) const
+IceProxy::Ice::Object::ice_identity(const Identity& newIdentity) const
{
if(newIdentity == _reference->getIdentity())
{
@@ -392,6 +392,12 @@ IceProxy::Ice::Object::ice_newIdentity(const Identity& newIdentity) const
}
}
+ObjectPrx
+IceProxy::Ice::Object::ice_newIdentity(const Identity& newIdentity) const
+{
+ return ice_identity(newIdentity);
+}
+
Context
IceProxy::Ice::Object::ice_getContext() const
{
@@ -399,7 +405,7 @@ IceProxy::Ice::Object::ice_getContext() const
}
ObjectPrx
-IceProxy::Ice::Object::ice_newContext(const Context& newContext) const
+IceProxy::Ice::Object::ice_context(const Context& newContext) const
{
ObjectPrx proxy(new ::IceProxy::Ice::Object());
proxy->setup(_reference->changeContext(newContext));
@@ -407,6 +413,12 @@ IceProxy::Ice::Object::ice_newContext(const Context& newContext) const
}
ObjectPrx
+IceProxy::Ice::Object::ice_newContext(const Context& newContext) const
+{
+ return ice_context(newContext);
+}
+
+ObjectPrx
IceProxy::Ice::Object::ice_defaultContext() const
{
ObjectPrx proxy(new ::IceProxy::Ice::Object());
@@ -421,7 +433,7 @@ IceProxy::Ice::Object::ice_getFacet() const
}
ObjectPrx
-IceProxy::Ice::Object::ice_newFacet(const string& newFacet) const
+IceProxy::Ice::Object::ice_facet(const string& newFacet) const
{
if(newFacet == _reference->getFacet())
{
@@ -435,6 +447,12 @@ IceProxy::Ice::Object::ice_newFacet(const string& newFacet) const
}
}
+ObjectPrx
+IceProxy::Ice::Object::ice_newFacet(const string& newFacet) const
+{
+ return ice_facet(newFacet);
+}
+
string
IceProxy::Ice::Object::ice_getAdapterId() const
{
@@ -442,7 +460,7 @@ IceProxy::Ice::Object::ice_getAdapterId() const
}
ObjectPrx
-IceProxy::Ice::Object::ice_newAdapterId(const string& newAdapterId) const
+IceProxy::Ice::Object::ice_adapterId(const string& newAdapterId) const
{
if(newAdapterId == _reference->getAdapterId())
{
@@ -456,6 +474,12 @@ IceProxy::Ice::Object::ice_newAdapterId(const string& newAdapterId) const
}
}
+ObjectPrx
+IceProxy::Ice::Object::ice_newAdapterId(const string& newAdapterId) const
+{
+ return ice_adapterId(newAdapterId);
+}
+
EndpointSeq
IceProxy::Ice::Object::ice_getEndpoints() const
{
@@ -469,7 +493,7 @@ IceProxy::Ice::Object::ice_getEndpoints() const
}
ObjectPrx
-IceProxy::Ice::Object::ice_newEndpoints(const EndpointSeq& newEndpoints) const
+IceProxy::Ice::Object::ice_endpoints(const EndpointSeq& newEndpoints) const
{
vector<EndpointIPtr> endpoints;
for(EndpointSeq::const_iterator p = newEndpoints.begin(); p != newEndpoints.end(); ++p)
@@ -489,6 +513,12 @@ IceProxy::Ice::Object::ice_newEndpoints(const EndpointSeq& newEndpoints) const
}
}
+ObjectPrx
+IceProxy::Ice::Object::ice_newEndpoints(const EndpointSeq& newEndpoints) const
+{
+ return ice_endpoints(newEndpoints);
+}
+
Int
IceProxy::Ice::Object::ice_getLocatorCacheTimeout() const
{
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index 988cfa83bc8..6026ed4f47a 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -53,6 +53,7 @@ public:
Ice::CommunicatorPtr getCommunicator() const;
virtual bool getSecure() const = 0;
+ virtual bool getCompress() const = 0;
virtual std::string getAdapterId() const = 0;
virtual std::vector<EndpointIPtr> getEndpoints() const = 0;
virtual bool getCollocationOptimization() const = 0;
diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp
index 47d9321ca67..0284e0a95e7 100644
--- a/cpp/src/IceGrid/LocatorI.cpp
+++ b/cpp/src/IceGrid/LocatorI.cpp
@@ -98,7 +98,7 @@ public:
//
if(obj)
{
- _cb->ice_response(obj->ice_newIdentity(_obj->ice_getIdentity()));
+ _cb->ice_response(obj->ice_identity(_obj->ice_getIdentity()));
}
else
{
@@ -232,7 +232,7 @@ LocatorI::Request::response(const Ice::ObjectPrx& proxy)
}
Lock sync(*this);
- _proxies.push_back(proxy->ice_newIdentity(Ice::stringToIdentity("dummy")));
+ _proxies.push_back(proxy->ice_identity(Ice::stringToIdentity("dummy")));
//
// If we received all the required proxies, it's time to send the
@@ -277,7 +277,7 @@ LocatorI::Request::sendResponse()
}
Ice::ObjectPrx proxy = _locator->getCommunicator()->stringToProxy("dummy:default");
- _amdCB->ice_response(proxy->ice_newEndpoints(endpoints));
+ _amdCB->ice_response(proxy->ice_endpoints(endpoints));
}
}
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 08d95db0ae3..47a87d9ac85 100755
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -3461,7 +3461,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
_out << sb;
_out << nl << "return null;";
_out << eb;
- _out << nl << "Ice.ObjectPrx bb = b.ice_newFacet(f);";
+ _out << nl << "Ice.ObjectPrx bb = b.ice_facet(f);";
_out << nl << "try";
_out << sb;
_out << nl << "if(bb.ice_isA(\"" << p->scoped() << "\"))";
@@ -3483,7 +3483,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
_out << sb;
_out << nl << "return null;";
_out << eb;
- _out << nl << "Ice.ObjectPrx bb = b.ice_newFacet(f);";
+ _out << nl << "Ice.ObjectPrx bb = b.ice_facet(f);";
_out << nl << "try";
_out << sb;
_out << nl << "if(bb.ice_isA(\"" << p->scoped() << "\", ctx))";
@@ -3516,7 +3516,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
_out << sb;
_out << nl << "return null;";
_out << eb;
- _out << nl << "Ice.ObjectPrx bb = b.ice_newFacet(f);";
+ _out << nl << "Ice.ObjectPrx bb = b.ice_facet(f);";
_out << nl << name << "PrxHelper h = new " << name << "PrxHelper();";
_out << nl << "h.copyFrom__(bb);";
_out << nl << "return h;";
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 7f4f6fc770a..5d60f13c254 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -3181,7 +3181,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
out << nl << name << "Prx d = null;";
out << nl << "if(b != null)";
out << sb;
- out << nl << "Ice.ObjectPrx bb = b.ice_newFacet(f);";
+ out << nl << "Ice.ObjectPrx bb = b.ice_facet(f);";
out << nl << "try";
out << sb;
out << nl << "if(bb.ice_isA(\"" << scoped << "\"))";
@@ -3204,7 +3204,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
out << nl << name << "Prx d = null;";
out << nl << "if(b != null)";
out << sb;
- out << nl << "Ice.ObjectPrx bb = b.ice_newFacet(f);";
+ out << nl << "Ice.ObjectPrx bb = b.ice_facet(f);";
out << nl << "try";
out << sb;
out << nl << "if(bb.ice_isA(\"" << scoped << "\", ctx))";
@@ -3238,7 +3238,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
out << nl << name << "Prx d = null;";
out << nl << "if(b != null)";
out << sb;
- out << nl << "Ice.ObjectPrx bb = b.ice_newFacet(f);";
+ out << nl << "Ice.ObjectPrx bb = b.ice_facet(f);";
out << nl << name << "PrxHelper h = new " << name << "PrxHelper();";
out << nl << "h.__copyFrom(bb);";
out << nl << "d = h;";
diff --git a/cpp/src/slice2javae/Gen.cpp b/cpp/src/slice2javae/Gen.cpp
index ce10208c083..2b0b0105fbd 100644
--- a/cpp/src/slice2javae/Gen.cpp
+++ b/cpp/src/slice2javae/Gen.cpp
@@ -2337,7 +2337,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
out << nl << name << "Prx d = null;";
out << nl << "if(b != null)";
out << sb;
- out << nl << "Ice.ObjectPrx bb = b.ice_newFacet(f);";
+ out << nl << "Ice.ObjectPrx bb = b.ice_facet(f);";
out << nl << "try";
out << sb;
out << nl << "if(bb.ice_isA(\"" << scoped << "\"))";
@@ -2360,7 +2360,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
out << nl << name << "Prx d = null;";
out << nl << "if(b != null)";
out << sb;
- out << nl << "Ice.ObjectPrx bb = b.ice_newFacet(f);";
+ out << nl << "Ice.ObjectPrx bb = b.ice_facet(f);";
out << nl << "try";
out << sb;
out << nl << "if(bb.ice_isA(\"" << scoped << "\", ctx))";
@@ -2394,7 +2394,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
out << nl << name << "Prx d = null;";
out << nl << "if(b != null)";
out << sb;
- out << nl << "Ice.ObjectPrx bb = b.ice_newFacet(f);";
+ out << nl << "Ice.ObjectPrx bb = b.ice_facet(f);";
out << nl << name << "PrxHelper h = new " << name << "PrxHelper();";
out << nl << "h.__copyFrom(bb);";
out << nl << "d = h;";
diff --git a/cpp/src/slice2vb/Gen.cpp b/cpp/src/slice2vb/Gen.cpp
index 2ba4aa87429..6b9b248d4e1 100755
--- a/cpp/src/slice2vb/Gen.cpp
+++ b/cpp/src/slice2vb/Gen.cpp
@@ -3834,7 +3834,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
_out << nl << "Return Nothing";
_out.dec();
_out << nl << "End If";
- _out << nl << "Dim bb As Ice.ObjectPrx = b.ice_newFacet(f)";
+ _out << nl << "Dim bb As Ice.ObjectPrx = b.ice_facet(f)";
_out << nl << "Try";
_out.inc();
_out << nl << "If bb.ice_isA(\"" << p->scoped() << "\") Then";
@@ -3859,7 +3859,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
_out << nl << "Return Nothing";
_out.dec();
_out << nl << "End If";
- _out << nl << "Dim bb As Ice.ObjectPrx = b.ice_newFacet(f)";
+ _out << nl << "Dim bb As Ice.ObjectPrx = b.ice_facet(f)";
_out << nl << "Try";
_out.inc();
_out << nl << "If bb.ice_isA(\"" << p->scoped() << "\", ctx) Then";
@@ -3897,7 +3897,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
_out << nl << "Return Nothing";
_out.dec();
_out << nl << "End If";
- _out << nl << "Dim bb As Ice.ObjectPrx = b.ice_newFacet(f)";
+ _out << nl << "Dim bb As Ice.ObjectPrx = b.ice_facet(f)";
_out << nl << "Dim h As " << name << "PrxHelper = new " << name << "PrxHelper()";
_out << nl << "h.copyFrom__(bb)";
_out << nl << "Return h";
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 03:02:09 +0000