diff options
Diffstat (limited to 'intern/opensubdiv/internal/opensubdiv_util.cc')
-rw-r--r-- | intern/opensubdiv/internal/opensubdiv_util.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/intern/opensubdiv/internal/opensubdiv_util.cc b/intern/opensubdiv/internal/opensubdiv_util.cc index 87bfce2116c..317d9d9e06a 100644 --- a/intern/opensubdiv/internal/opensubdiv_util.cc +++ b/intern/opensubdiv/internal/opensubdiv_util.cc @@ -28,20 +28,20 @@ namespace opensubdiv_capi { -void stringSplit(std::vector<std::string>* tokens, - const std::string& str, - const std::string& separators, +void stringSplit(vector<string>* tokens, + const string& str, + const string& separators, bool skip_empty) { size_t token_start = 0, token_length = 0; for (size_t i = 0; i < str.length(); ++i) { const char ch = str[i]; - if (separators.find(ch) == std::string::npos) { + if (separators.find(ch) == string::npos) { // Append non-separator char to a token. ++token_length; } else { // Append current token to the list (if any). if (token_length > 0 || !skip_empty) { - std::string token = str.substr(token_start, token_length); + string token = str.substr(token_start, token_length); tokens->push_back(token); } // Re-set token pointers, @@ -52,8 +52,8 @@ void stringSplit(std::vector<std::string>* tokens, // Append token which might be at the end of the string. if ((token_length != 0) || (!skip_empty && token_start > 0 && - separators.find(str[token_start-1]) != std::string::npos)) { - std::string token = str.substr(token_start, token_length); + separators.find(str[token_start-1]) != string::npos)) { + string token = str.substr(token_start, token_length); tokens->push_back(token); } } |