diff options
author | Bernard Normier <bernard@zeroc.com> | 2007-12-21 11:12:14 -0500 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2007-12-21 11:12:14 -0500 |
commit | 08ec7524df324e627bbb8d93c509f0d90badbe3b (patch) | |
tree | a640ae99a5e35b210352150feef4f71832b265c5 /cpp/src/Ice/IdentityUtil.cpp | |
parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
download | ice-08ec7524df324e627bbb8d93c509f0d90badbe3b.tar.bz2 ice-08ec7524df324e627bbb8d93c509f0d90badbe3b.tar.xz ice-08ec7524df324e627bbb8d93c509f0d90badbe3b.zip |
IceUtil cleanup (first commit)
Diffstat (limited to 'cpp/src/Ice/IdentityUtil.cpp')
-rw-r--r-- | cpp/src/Ice/IdentityUtil.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/IdentityUtil.cpp b/cpp/src/Ice/IdentityUtil.cpp index 4758804b4fb..c3891505b84 100644 --- a/cpp/src/Ice/IdentityUtil.cpp +++ b/cpp/src/Ice/IdentityUtil.cpp @@ -47,7 +47,7 @@ Ice::stringToIdentity(const string& s) if(slash == string::npos) { - if(!IceUtil::unescapeString(s, 0, s.size(), ident.name)) + if(!IceUtilInternal::unescapeString(s, 0, s.size(), ident.name)) { IdentityParseException ex(__FILE__, __LINE__); ex.str = s; @@ -56,7 +56,7 @@ Ice::stringToIdentity(const string& s) } else { - if(!IceUtil::unescapeString(s, 0, slash, ident.category)) + if(!IceUtilInternal::unescapeString(s, 0, slash, ident.category)) { IdentityParseException ex(__FILE__, __LINE__); ex.str = s; @@ -64,7 +64,7 @@ Ice::stringToIdentity(const string& s) } if(slash + 1 < s.size()) { - if(!IceUtil::unescapeString(s, slash + 1, s.size(), ident.name)) + if(!IceUtilInternal::unescapeString(s, slash + 1, s.size(), ident.name)) { IdentityParseException ex(__FILE__, __LINE__); ex.str = s; @@ -81,10 +81,10 @@ Ice::identityToString(const Identity& ident) { if(ident.category.empty()) { - return IceUtil::escapeString(ident.name, "/"); + return IceUtilInternal::escapeString(ident.name, "/"); } else { - return IceUtil::escapeString(ident.category, "/") + '/' + IceUtil::escapeString(ident.name, "/"); + return IceUtilInternal::escapeString(ident.category, "/") + '/' + IceUtilInternal::escapeString(ident.name, "/"); } } |