From 09c33fa2189c2b538d6618d4bd78d6e6e32b5c3a Mon Sep 17 00:00:00 2001 From: Marc Laukien Date: Fri, 9 Apr 2004 16:38:00 +0000 Subject: moved StringUtil to IceUtil, fixed names --- cpp/src/Ice/ReferenceFactory.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cpp/src/Ice/ReferenceFactory.cpp') diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp index b1714ad1355..ba919e7a0e9 100644 --- a/cpp/src/Ice/ReferenceFactory.cpp +++ b/cpp/src/Ice/ReferenceFactory.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include using namespace std; using namespace Ice; @@ -150,7 +150,7 @@ IceInternal::ReferenceFactory::create(const string& str) // or double quotation marks. // string idstr; - end = checkQuote(s, beg); + end = IceUtil::checkQuote(s, beg); if(end == string::npos) { ProxyParseException ex(__FILE__, __LINE__); @@ -264,7 +264,7 @@ IceInternal::ReferenceFactory::create(const string& str) if(s[argumentBeg] != '@' && s[argumentBeg] != ':' && s[argumentBeg] != '-') { beg = argumentBeg; - end = checkQuote(s, beg); + end = IceUtil::checkQuote(s, beg); if(end == string::npos) { ProxyParseException ex(__FILE__, __LINE__); @@ -304,7 +304,7 @@ IceInternal::ReferenceFactory::create(const string& str) throw ex; } - if(!decodeString(argument, 0, argument.size(), facet)) + if(!IceUtil::unescapeString(argument, 0, argument.size(), facet)) { ProxyParseException ex(__FILE__, __LINE__); ex.str = str; @@ -427,7 +427,7 @@ IceInternal::ReferenceFactory::create(const string& str) throw ex; } - end = checkQuote(s, beg); + end = IceUtil::checkQuote(s, beg); if(end == string::npos) { ProxyParseException ex(__FILE__, __LINE__); @@ -447,7 +447,7 @@ IceInternal::ReferenceFactory::create(const string& str) beg++; // Skip leading quote } - if(!decodeString(s, beg, end, adapter) || adapter.size() == 0) + if(!IceUtil::unescapeString(s, beg, end, adapter) || adapter.size() == 0) { ProxyParseException ex(__FILE__, __LINE__); ex.str = str; -- cgit v1.2.3