diff options
Diffstat (limited to 'cpp/src/Ice/Proxy.cpp')
-rw-r--r-- | cpp/src/Ice/Proxy.cpp | 56 |
1 files changed, 1 insertions, 55 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 08809f08a76..65828b44e04 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -24,7 +24,7 @@ #include <Ice/LocatorInfo.h> #include <Ice/BasicStream.h> #include <Ice/LocalException.h> -#include <Ice/ConnectionI.h> // To convert from ConnectionIPtr to ConnectionPtr in ice_connection(). +#include <Ice/ConnectionI.h> // To convert from ConnectionIPtr to ConnectionPtr in ice_getConnection(). #include <Ice/Stream.h> #include <Ice/ImplicitContextI.h> @@ -85,24 +85,12 @@ 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(); @@ -331,12 +319,6 @@ IceProxy::Ice::Object::ice_identity(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 { @@ -352,12 +334,6 @@ IceProxy::Ice::Object::ice_context(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 = __newInstance(); @@ -386,12 +362,6 @@ IceProxy::Ice::Object::ice_facet(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 { @@ -413,12 +383,6 @@ IceProxy::Ice::Object::ice_adapterId(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 { @@ -452,12 +416,6 @@ IceProxy::Ice::Object::ice_endpoints(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 { @@ -616,12 +574,6 @@ IceProxy::Ice::Object::ice_isCollocationOptimized() const } ObjectPrx -IceProxy::Ice::Object::ice_collocationOptimization(bool b) const -{ - return ice_collocationOptimized(b); -} - -ObjectPrx IceProxy::Ice::Object::ice_collocationOptimized(bool b) const { if(b == _reference->getCollocationOptimized()) @@ -812,12 +764,6 @@ IceProxy::Ice::Object::ice_threadPerConnection(bool b) const } ConnectionPtr -IceProxy::Ice::Object::ice_connection() -{ - return ice_getConnection(); -} - -ConnectionPtr IceProxy::Ice::Object::ice_getConnection() { int __cnt = 0; |