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/Incoming.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/Incoming.cpp')
| -rw-r--r-- | cpp/src/Ice/Incoming.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index f0de7b3c8e8..8b7e8a33ea4 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -172,7 +172,7 @@ IceInternal::IncomingBase::__warning(const Exception& ex) const Warning out(_os.instance()->initializationData().logger); out << "dispatch exception: " << ex; - out << "\nidentity: " << Ice::identityToString(_current.id); + out << "\nidentity: " << _os.instance()->identityToString(_current.id); out << "\nfacet: " << IceUtilInternal::escapeString(_current.facet, ""); out << "\noperation: " << _current.operation; @@ -193,7 +193,7 @@ IceInternal::IncomingBase::__warning(const string& msg) const Warning out(_os.instance()->initializationData().logger); out << "dispatch exception: " << msg; - out << "\nidentity: " << Ice::identityToString(_current.id); + out << "\nidentity: " << _os.instance()->identityToString(_current.id); out << "\nfacet: " << IceUtilInternal::escapeString(_current.facet, ""); out << "\noperation: " << _current.operation; |