summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/CHANGES6
-rw-r--r--cpp/demo/Glacier2/callback/Client.cpp8
-rw-r--r--cpp/include/Ice/Proxy.h20
-rw-r--r--cpp/include/IceUtil/Config.h8
-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
-rw-r--r--cpp/test/Glacier2/router/Client.cpp6
-rw-r--r--cpp/test/Ice/binding/AllTests.cpp2
-rw-r--r--cpp/test/Ice/exceptions/AllTests.cpp4
-rw-r--r--cpp/test/Ice/operations/Twoways.cpp8
-rw-r--r--cpp/test/Ice/operations/TwowaysAMI.cpp10
18 files changed, 100 insertions, 51 deletions
diff --git a/cpp/CHANGES b/cpp/CHANGES
index 14f38a25cbb..f90a5aa63dc 100644
--- a/cpp/CHANGES
+++ b/cpp/CHANGES
@@ -1,6 +1,12 @@
Changes since version 3.0.1
---------------------------
+- Deprecated ice_newIdentity, ice_newFacet, ice_newContext,
+ ice_newAdapterId and ice_newEndpoints methods proxy. You should now
+ use the ice_identity, ice_facet, ice_context, ice_adapterId and
+ ice_endpoints proxy methods. The former methods will be removed from
+ the next major release.
+
- Changed the Ice core and services to use the random generator from
IceUtil. The initialization of the communicator doesn't call srand
or srand48 anymore. It's up to your application to call it if
diff --git a/cpp/demo/Glacier2/callback/Client.cpp b/cpp/demo/Glacier2/callback/Client.cpp
index cfcabc93870..fd2c4333ab5 100644
--- a/cpp/demo/Glacier2/callback/Client.cpp
+++ b/cpp/demo/Glacier2/callback/Client.cpp
@@ -179,13 +179,13 @@ CallbackClient::run(int argc, char* argv[])
if(fake)
{
- twowayR = CallbackReceiverPrx::uncheckedCast(twowayR->ice_newIdentity(callbackReceiverFakeIdent));
- onewayR = CallbackReceiverPrx::uncheckedCast(onewayR->ice_newIdentity(callbackReceiverFakeIdent));
+ twowayR = CallbackReceiverPrx::uncheckedCast(twowayR->ice_identity(callbackReceiverFakeIdent));
+ onewayR = CallbackReceiverPrx::uncheckedCast(onewayR->ice_identity(callbackReceiverFakeIdent));
}
else
{
- twowayR = CallbackReceiverPrx::uncheckedCast(twowayR->ice_newIdentity(callbackReceiverIdent));
- onewayR = CallbackReceiverPrx::uncheckedCast(onewayR->ice_newIdentity(callbackReceiverIdent));
+ twowayR = CallbackReceiverPrx::uncheckedCast(twowayR->ice_identity(callbackReceiverIdent));
+ onewayR = CallbackReceiverPrx::uncheckedCast(onewayR->ice_identity(callbackReceiverIdent));
}
cout << "callback receiver identity: " << Ice::identityToString(twowayR->ice_getIdentity()) << endl;
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index 5babc03e9cf..36e43b04c8f 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -117,20 +117,25 @@ public:
const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&, const ::Ice::Context&);
::Ice::Identity ice_getIdentity() const;
- ::Ice::ObjectPrx ice_newIdentity(const ::Ice::Identity&) const;
+ ICE_DEPRECATED_API ::Ice::ObjectPrx ice_newIdentity(const ::Ice::Identity&) const;
+ ::Ice::ObjectPrx ice_identity(const ::Ice::Identity&) const;
::Ice::Context ice_getContext() const;
- ::Ice::ObjectPrx ice_newContext(const ::Ice::Context&) const;
+ ICE_DEPRECATED_API ::Ice::ObjectPrx ice_newContext(const ::Ice::Context&) const;
+ ::Ice::ObjectPrx ice_context(const ::Ice::Context&) const;
::Ice::ObjectPrx ice_defaultContext() const;
const ::std::string& ice_getFacet() const;
- ::Ice::ObjectPrx ice_newFacet(const ::std::string&) const;
+ ICE_DEPRECATED_API ::Ice::ObjectPrx ice_newFacet(const ::std::string&) const;
+ ::Ice::ObjectPrx ice_facet(const ::std::string&) const;
::std::string ice_getAdapterId() const;
- ::Ice::ObjectPrx ice_newAdapterId(const ::std::string&) const;
+ ICE_DEPRECATED_API ::Ice::ObjectPrx ice_newAdapterId(const ::std::string&) const;
+ ::Ice::ObjectPrx ice_adapterId(const ::std::string&) const;
::Ice::EndpointSeq ice_getEndpoints() const;
- ::Ice::ObjectPrx ice_newEndpoints(const ::Ice::EndpointSeq&) const;
+ ICE_DEPRECATED_API ::Ice::ObjectPrx ice_newEndpoints(const ::Ice::EndpointSeq&) const;
+ ::Ice::ObjectPrx ice_endpoints(const ::Ice::EndpointSeq&) const;
::Ice::Int ice_getLocatorCacheTimeout() const;
::Ice::ObjectPrx ice_locatorCacheTimeout(::Ice::Int) const;
@@ -157,7 +162,6 @@ public:
::Ice::ObjectPrx ice_timeout(int) const;
::Ice::ObjectPrx ice_router(const ::Ice::RouterPrx&) const;
::Ice::ObjectPrx ice_locator(const ::Ice::LocatorPrx&) const;
-
::Ice::ObjectPrx ice_collocationOptimization(bool) const;
::Ice::ObjectPrx ice_connectionId(const ::std::string&) const;
@@ -423,7 +427,7 @@ uncheckedCastImpl< ::Ice::ObjectPrx>(const ::Ice::ObjectPrx& b, const std::strin
::Ice::ObjectPrx d = 0;
if(b)
{
- d = b->ice_newFacet(f);
+ d = b->ice_facet(f);
}
return d;
}
@@ -468,7 +472,7 @@ uncheckedCastImpl(const ::Ice::ObjectPrx& b, const std::string& f)
{
typedef typename P::element_type T;
- ::Ice::ObjectPrx bb = b->ice_newFacet(f);
+ ::Ice::ObjectPrx bb = b->ice_facet(f);
d = new T;
d->__copyFrom(bb);
}
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index d16c98caebd..2deb5d54e7e 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -65,6 +65,14 @@
# define ICE_DECLSPEC_IMPORT /**/
#endif
+#if defined(_MSC_VER)
+# define ICE_DEPRECATED_API __declspec(deprecated)
+#elif defined(__GNUC__)
+# define ICE_DEPRECATED_API __attribute__((deprecated))
+#else
+# define ICE_DEPRECATED_API /**/
+#endif
+
//
// Let's use these extensions with IceUtil:
//
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";
diff --git a/cpp/test/Glacier2/router/Client.cpp b/cpp/test/Glacier2/router/Client.cpp
index 9b6489a75c2..aee08743c16 100644
--- a/cpp/test/Glacier2/router/Client.cpp
+++ b/cpp/test/Glacier2/router/Client.cpp
@@ -617,7 +617,7 @@ CallbackClient::run(int argc, char* argv[])
Context context;
context["_fwd"] = "t";
CallbackPrx otherCategoryTwoway = CallbackPrx::uncheckedCast(
- twoway->ice_newIdentity(stringToIdentity("c2/callback")));
+ twoway->ice_identity(stringToIdentity("c2/callback")));
otherCategoryTwoway->initiateCallback(twowayR, context);
test(callbackReceiverImpl->callbackOK());
cout << "ok" << endl;
@@ -630,7 +630,7 @@ CallbackClient::run(int argc, char* argv[])
try
{
CallbackPrx otherCategoryTwoway = CallbackPrx::uncheckedCast(
- twoway->ice_newIdentity(stringToIdentity("c3/callback")));
+ twoway->ice_identity(stringToIdentity("c3/callback")));
otherCategoryTwoway->initiateCallback(twowayR, context);
test(false);
}
@@ -645,7 +645,7 @@ CallbackClient::run(int argc, char* argv[])
Context context;
context["_fwd"] = "t";
CallbackPrx otherCategoryTwoway = CallbackPrx::uncheckedCast(
- twoway->ice_newIdentity(stringToIdentity("_userid/callback")));
+ twoway->ice_identity(stringToIdentity("_userid/callback")));
otherCategoryTwoway->initiateCallback(twowayR, context);
test(callbackReceiverImpl->callbackOK());
cout << "ok" << endl;
diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp
index 901ef628aca..86e37d26ba1 100644
--- a/cpp/test/Ice/binding/AllTests.cpp
+++ b/cpp/test/Ice/binding/AllTests.cpp
@@ -70,7 +70,7 @@ createTestIntfPrx(vector<RemoteObjectAdapterPrx>& adapters)
Ice::EndpointSeq edpts = test->ice_getEndpoints();
endpoints.insert(endpoints.end(), edpts.begin(), edpts.end());
}
- return TestIntfPrx::uncheckedCast(test->ice_newEndpoints(endpoints));
+ return TestIntfPrx::uncheckedCast(test->ice_endpoints(endpoints));
}
void
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index 7beae0c27c7..15a7c40817f 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -989,7 +989,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
Ice::Identity id = Ice::stringToIdentity("does not exist");
try
{
- ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower->ice_newIdentity(id));
+ ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower->ice_identity(id));
thrower2->throwAasA(1);
// thrower2->ice_ping();
test(false);
@@ -1206,7 +1206,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
{
id = Ice::stringToIdentity("does not exist");
- ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower->ice_newIdentity(id));
+ ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower->ice_identity(id));
AMI_Thrower_throwAasAObjectNotExistIPtr cb = new AMI_Thrower_throwAasAObjectNotExistI;
thrower2->throwAasA_async(cb, 1);
test(cb->check());
diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp
index 79e36af35a3..e71d5a92c18 100644
--- a/cpp/test/Ice/operations/Twoways.cpp
+++ b/cpp/test/Ice/operations/Twoways.cpp
@@ -633,7 +633,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
test(r == ctx);
}
{
- Test::MyClassPrx p2 = Test::MyClassPrx::checkedCast(p->ice_newContext(ctx));
+ Test::MyClassPrx p2 = Test::MyClassPrx::checkedCast(p->ice_context(ctx));
test(p2->ice_getContext() == ctx);
Test::StringStringD r = p2->opContext();
test(r == ctx);
@@ -650,7 +650,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
communicator->setDefaultContext(dflt);
test(p->opContext() != dflt);
- Test::MyClassPrx p2 = Test::MyClassPrx::uncheckedCast(p->ice_newContext(Ice::Context()));
+ Test::MyClassPrx p2 = Test::MyClassPrx::uncheckedCast(p->ice_context(Ice::Context()));
test(p2->opContext().empty());
p2 = Test::MyClassPrx::uncheckedCast(p->ice_defaultContext());
@@ -665,11 +665,11 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
test(c->opContext() == dflt);
dflt["a"] = "c";
- Test::MyClassPrx c2 = Test::MyClassPrx::uncheckedCast(c->ice_newContext(dflt));
+ Test::MyClassPrx c2 = Test::MyClassPrx::uncheckedCast(c->ice_context(dflt));
test(c2->opContext()["a"] == "c");
dflt.clear();
- Test::MyClassPrx c3 = Test::MyClassPrx::uncheckedCast(c2->ice_newContext(dflt));
+ Test::MyClassPrx c3 = Test::MyClassPrx::uncheckedCast(c2->ice_context(dflt));
Ice::Context tmp = c3->opContext();
test(tmp.find("a") == tmp.end());
diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp
index 7f46498f777..9ef5ca5fbac 100644
--- a/cpp/test/Ice/operations/TwowaysAMI.cpp
+++ b/cpp/test/Ice/operations/TwowaysAMI.cpp
@@ -1202,7 +1202,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
p->opContext_async(cb, ctx);
test(cb->check());
}
- Test::MyClassPrx p2 = Test::MyClassPrx::checkedCast(p->ice_newContext(ctx));
+ Test::MyClassPrx p2 = Test::MyClassPrx::checkedCast(p->ice_context(ctx));
test(p2->ice_getContext() == ctx);
{
AMI_MyClass_opContextEqualIPtr cb = new AMI_MyClass_opContextEqualI(ctx);
@@ -1210,7 +1210,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
test(cb->check());
}
{
- Test::MyClassPrx p2 = Test::MyClassPrx::checkedCast(p->ice_newContext(ctx));
+ Test::MyClassPrx p2 = Test::MyClassPrx::checkedCast(p->ice_context(ctx));
AMI_MyClass_opContextEqualIPtr cb = new AMI_MyClass_opContextEqualI(ctx);
p2->opContext_async(cb, ctx);
test(cb->check());
@@ -1228,7 +1228,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
test(cb->check());
}
- Test::MyClassPrx p2 = Test::MyClassPrx::uncheckedCast(p->ice_newContext(Ice::Context()));
+ Test::MyClassPrx p2 = Test::MyClassPrx::uncheckedCast(p->ice_context(Ice::Context()));
{
AMI_MyClass_opContextEqualIPtr cb = new AMI_MyClass_opContextEqualI(Ice::Context());
p2->opContext_async(cb);
@@ -1261,7 +1261,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
}
dflt["a"] = "c";
- Test::MyClassPrx c2 = Test::MyClassPrx::uncheckedCast(c->ice_newContext(dflt));
+ Test::MyClassPrx c2 = Test::MyClassPrx::uncheckedCast(c->ice_context(dflt));
{
Ice::Context tmp;
tmp["a"] = "c";
@@ -1271,7 +1271,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
}
dflt.clear();
- Test::MyClassPrx c3 = Test::MyClassPrx::uncheckedCast(c2->ice_newContext(dflt));
+ Test::MyClassPrx c3 = Test::MyClassPrx::uncheckedCast(c2->ice_context(dflt));
{
Ice::Context tmp;
AMI_MyClass_opContextEqualIPtr cb = new AMI_MyClass_opContextEqualI(tmp);
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 16:53:36 +0000