diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-12-20 23:00:17 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-12-20 23:00:17 +0100 |
| commit | 1bfce436ef24da5886a752f906628472ceb60a96 (patch) | |
| tree | ae4fc9bac597df81b4855a0fadbde552c978bbbf /cpp/src/IceUtil/StringUtil.cpp | |
| parent | edits to CHANGES & RELEASE_NOTES (diff) | |
| download | ice-1bfce436ef24da5886a752f906628472ceb60a96.tar.bz2 ice-1bfce436ef24da5886a752f906628472ceb60a96.tar.xz ice-1bfce436ef24da5886a752f906628472ceb60a96.zip | |
Fixed bug 4514 - Ice/facets test failure
Diffstat (limited to 'cpp/src/IceUtil/StringUtil.cpp')
| -rw-r--r-- | cpp/src/IceUtil/StringUtil.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp index edec3076976..dbbcfa0da9f 100644 --- a/cpp/src/IceUtil/StringUtil.cpp +++ b/cpp/src/IceUtil/StringUtil.cpp @@ -329,6 +329,11 @@ IceUtilInternal::splitString(const string& str, const string& delim, vector<stri quoteChar = str[pos++]; continue; // Skip the quote } + else if(quoteChar == '\0' && str[pos] == '\\' && pos + 1 < length && + (str[pos + 1] == '\'' || str[pos + 1] == '"')) + { + ++pos; + } else if(quoteChar != '\0' && str[pos] == '\\' && pos + 1 < length && str[pos + 1] == quoteChar) { ++pos; |