diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/PropertiesI.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp index c22a2572042..cfec754baf9 100644 --- a/cpp/src/Ice/PropertiesI.cpp +++ b/cpp/src/Ice/PropertiesI.cpp @@ -748,23 +748,11 @@ Ice::PropertiesI::loadConfig() if(!value.empty()) { - const string delim = " \t\r\n"; - string::size_type beg = value.find_first_not_of(delim); - while(beg != string::npos) + vector<string> files; + IceUtilInternal::splitString(value, ",", files); + for(vector<string>::const_iterator i = files.begin(); i != files.end(); ++i) { - string::size_type end = value.find(",", beg); - string file; - if(end == string::npos) - { - file = value.substr(beg); - beg = end; - } - else - { - file = value.substr(beg, end - beg); - beg = value.find_first_not_of("," + delim, end); - } - load(file); + load(IceUtilInternal::trim(*i)); } } |