diff options
author | Jose <jose@zeroc.com> | 2016-02-29 18:04:18 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2016-02-29 18:04:18 +0100 |
commit | 97554afcad548fcac64d399fd2e05af49ffcba12 (patch) | |
tree | 6916a256775181b7674f39ad7b3f3eeaa1fdfa62 /cpp/src/Ice/ObjectAdapterI.cpp | |
parent | ICE-6952 - identityToString/stringToIdentity non member functions (diff) | |
download | ice-97554afcad548fcac64d399fd2e05af49ffcba12.tar.bz2 ice-97554afcad548fcac64d399fd2e05af49ffcba12.tar.xz ice-97554afcad548fcac64d399fd2e05af49ffcba12.zip |
Rework previous fix for 3.6 compatibility
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
-rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 2513179cbc3..220811dda07 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -958,7 +958,7 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router) if(_routerInfo->getAdapter()) { throw AlreadyRegisteredException(__FILE__, __LINE__, "object adapter with router", - Ice::identityToString(router->ice_getIdentity())); + _instance->identityToString(router->ice_getIdentity())); } // |