summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Incoming.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-02-29 15:56:29 +0100
committerJose <jose@zeroc.com>2016-02-29 15:56:29 +0100
commit05f2548dc1b12b4b5afd3406af3bd899c17f85be (patch)
tree0bc0ae4845afa929e74f2f1fcb9ee20057b3240f /cpp/src/Ice/Incoming.cpp
parentICE-6843 - Check for php-config in the path (diff)
downloadice-05f2548dc1b12b4b5afd3406af3bd899c17f85be.tar.bz2
ice-05f2548dc1b12b4b5afd3406af3bd899c17f85be.tar.xz
ice-05f2548dc1b12b4b5afd3406af3bd899c17f85be.zip
ICE-6952 - identityToString/stringToIdentity non member functions
Diffstat (limited to 'cpp/src/Ice/Incoming.cpp')
-rw-r--r--cpp/src/Ice/Incoming.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index 8b7e8a33ea4..f0de7b3c8e8 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: " << _os.instance()->identityToString(_current.id);
+ out << "\nidentity: " << Ice::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: " << _os.instance()->identityToString(_current.id);
+ out << "\nidentity: " << Ice::identityToString(_current.id);
out << "\nfacet: " << IceUtilInternal::escapeString(_current.facet, "");
out << "\noperation: " << _current.operation;