summaryrefslogtreecommitdiff
path: root/cppe
diff options
context:
space:
mode:
Diffstat (limited to 'cppe')
-rw-r--r--cppe/demo/IceE/bidir/Client.cpp2
-rw-r--r--cppe/include/IceE/Proxy.h10
-rw-r--r--cppe/src/IceE/Proxy.cpp26
-rw-r--r--cppe/src/IceE/RouterInfo.cpp6
-rw-r--r--cppe/test/IceE/operations/AllTests.cpp4
-rw-r--r--cppe/test/IceE/operations/BatchOneways.cpp4
6 files changed, 37 insertions, 15 deletions
diff --git a/cppe/demo/IceE/bidir/Client.cpp b/cppe/demo/IceE/bidir/Client.cpp
index 8a1b16f3875..fa085a53972 100644
--- a/cppe/demo/IceE/bidir/Client.cpp
+++ b/cppe/demo/IceE/bidir/Client.cpp
@@ -50,7 +50,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
ident.category = "";
adapter->add(new CallbackReceiverI, ident);
adapter->activate();
- server->ice_connection()->setAdapter(adapter);
+ server->ice_getConnection()->setAdapter(adapter);
server->addClient(ident);
communicator->waitForShutdown();
diff --git a/cppe/include/IceE/Proxy.h b/cppe/include/IceE/Proxy.h
index add2ba3cf72..4efb088512b 100644
--- a/cppe/include/IceE/Proxy.h
+++ b/cppe/include/IceE/Proxy.h
@@ -106,9 +106,12 @@ public:
bool operator==(const Object&) const;
bool operator!=(const Object&) const;
bool operator<(const Object&) const;
- ::Ice::Int ice_hash() const;
- ::Ice::CommunicatorPtr ice_communicator() const;
+ ICE_DEPRECATED_API ::Ice::Int ice_hash() const;
+ ::Ice::Int ice_getHash() const;
+
+ ICE_DEPRECATED_API ::Ice::CommunicatorPtr ice_communicator() const;
+ ::Ice::CommunicatorPtr ice_getCommunicator() const;
::std::string ice_toString() const;
@@ -154,7 +157,8 @@ public:
::Ice::ObjectPrx ice_timeout(int) const;
- ::Ice::ConnectionPtr ice_connection();
+ ICE_DEPRECATED_API ::Ice::ConnectionPtr ice_connection();
+ ::Ice::ConnectionPtr ice_getConnection();
::IceInternal::ReferencePtr __reference() const;
void __copyFrom(const ::Ice::ObjectPrx&);
diff --git a/cppe/src/IceE/Proxy.cpp b/cppe/src/IceE/Proxy.cpp
index 3d5aceb24e8..9251c387f3a 100644
--- a/cppe/src/IceE/Proxy.cpp
+++ b/cppe/src/IceE/Proxy.cpp
@@ -147,12 +147,24 @@ IceProxy::Ice::Object::operator<(const Object& r) const
Int
IceProxy::Ice::Object::ice_hash() const
{
+ return ice_getHash();
+}
+
+Int
+IceProxy::Ice::Object::ice_getHash() const
+{
return _reference->hash();
}
CommunicatorPtr
IceProxy::Ice::Object::ice_communicator() const
{
+ return ice_getCommunicator();
+}
+
+CommunicatorPtr
+IceProxy::Ice::Object::ice_getCommunicator() const
+{
return _reference->getCommunicator();
}
@@ -178,7 +190,7 @@ IceProxy::Ice::Object::ice_isA(const string& __id, const Context& __context)
{
__checkTwowayOnly("ice_isA");
static const string __operation("ice_isA");
- ConnectionPtr __connection = ice_connection();
+ ConnectionPtr __connection = ice_getConnection();
Outgoing __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
BasicStream* __stream = __og.stream();
try
@@ -250,7 +262,7 @@ IceProxy::Ice::Object::ice_ping(const Context& __context)
try
{
static const string __operation("ice_ping");
- ConnectionPtr __connection = ice_connection();
+ ConnectionPtr __connection = ice_getConnection();
Outgoing __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
bool __ok = __og.invoke();
try
@@ -313,7 +325,7 @@ IceProxy::Ice::Object::ice_ids(const Context& __context)
{
__checkTwowayOnly("ice_ids");
static const string __operation("ice_ids");
- ConnectionPtr __connection = ice_connection();
+ ConnectionPtr __connection = ice_getConnection();
Outgoing __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
vector<string> __ret;
bool __ok = __og.invoke();
@@ -378,7 +390,7 @@ IceProxy::Ice::Object::ice_id(const Context& __context)
{
__checkTwowayOnly("ice_id");
static const string __operation("ice_id");
- ConnectionPtr __connection = ice_connection();
+ ConnectionPtr __connection = ice_getConnection();
Outgoing __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
string __ret;
bool __ok = __og.invoke();
@@ -647,6 +659,12 @@ IceProxy::Ice::Object::ice_timeout(int t) const
ConnectionPtr
IceProxy::Ice::Object::ice_connection()
{
+ return ice_getConnection();
+}
+
+ConnectionPtr
+IceProxy::Ice::Object::ice_getConnection()
+{
::IceUtil::Mutex::Lock sync(*this);
if(!_connection)
diff --git a/cppe/src/IceE/RouterInfo.cpp b/cppe/src/IceE/RouterInfo.cpp
index 2d338d6909c..0a0f2c439e6 100644
--- a/cppe/src/IceE/RouterInfo.cpp
+++ b/cppe/src/IceE/RouterInfo.cpp
@@ -14,7 +14,7 @@
#include <IceE/RouterInfo.h>
#include <IceE/Router.h>
#include <IceE/LocalException.h>
-#include <IceE/Connection.h> // For ice_connection()->timeout().
+#include <IceE/Connection.h> // For ice_getConnection()->timeout().
#include <IceE/Functional.h>
using namespace std;
@@ -179,7 +179,7 @@ IceInternal::RouterInfo::getClientProxy()
// we must use the same timeout as the already existing
// connection.
//
- _clientProxy = _clientProxy->ice_timeout(_router->ice_connection()->timeout());
+ _clientProxy = _clientProxy->ice_timeout(_router->ice_getConnection()->timeout());
}
return _clientProxy;
@@ -196,7 +196,7 @@ IceInternal::RouterInfo::setClientProxy(const ObjectPrx& clientProxy)
// In order to avoid creating a new connection to the router, we
// must use the same timeout as the already existing connection.
//
- _clientProxy = _clientProxy->ice_timeout(_router->ice_connection()->timeout());
+ _clientProxy = _clientProxy->ice_timeout(_router->ice_getConnection()->timeout());
}
ObjectPrx
diff --git a/cppe/test/IceE/operations/AllTests.cpp b/cppe/test/IceE/operations/AllTests.cpp
index 9d9d11f9223..f301533e065 100644
--- a/cppe/test/IceE/operations/AllTests.cpp
+++ b/cppe/test/IceE/operations/AllTests.cpp
@@ -33,8 +33,8 @@ allTests(const Ice::CommunicatorPtr& communicator)
test(base->ice_batchOneway()->ice_isBatchOneway());
tprintf("ok\n");
- tprintf("testing ice_communicator... ");
- test(base->ice_communicator().get() == communicator.get());
+ tprintf("testing ice_getCommunicator... ");
+ test(base->ice_getCommunicator().get() == communicator.get());
tprintf("ok\n");
tprintf("testing checked cast... ");
diff --git a/cppe/test/IceE/operations/BatchOneways.cpp b/cppe/test/IceE/operations/BatchOneways.cpp
index ec7a0d2f394..103aabd3dc7 100644
--- a/cppe/test/IceE/operations/BatchOneways.cpp
+++ b/cppe/test/IceE/operations/BatchOneways.cpp
@@ -66,7 +66,7 @@ batchOneways(const Test::MyClassPrx& p)
test(false);
}
- batch->ice_connection()->flushBatchRequests();
+ batch->ice_getConnection()->flushBatchRequests();
}
for(i = 0 ; i < 10 ; ++i)
@@ -94,6 +94,6 @@ batchOneways(const Test::MyClassPrx& p)
test(false);
}
- batch->ice_connection()->flushBatchRequests();
+ batch->ice_getConnection()->flushBatchRequests();
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 21:33:27 +0000