diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-01-15 13:08:33 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-01-16 13:00:42 +0300 |
| commit | 5a794c96850e4023ef10582a7de6128e7b7a1f3b (patch) | |
| tree | 10450eebb7bf28cf1ac965d7fc86b1c712cb5baf /intern/opensubdiv/internal/opensubdiv_util.h | |
| parent | f36f60543ff8b99066f43a9df9a62b43cc3153c3 (diff) | |
OpenSubdiv: Use own utility header
Replaces direct access to std.
Diffstat (limited to 'intern/opensubdiv/internal/opensubdiv_util.h')
| -rw-r--r-- | intern/opensubdiv/internal/opensubdiv_util.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/intern/opensubdiv/internal/opensubdiv_util.h b/intern/opensubdiv/internal/opensubdiv_util.h index 1f5ddc00f01..e7123d9d97b 100644 --- a/intern/opensubdiv/internal/opensubdiv_util.h +++ b/intern/opensubdiv/internal/opensubdiv_util.h @@ -20,12 +20,20 @@ #ifndef OPENSUBDIV_UTIL_H_ #define OPENSUBDIV_UTIL_H_ +#include <algorithm> #include <vector> +#include <stack> #include <string> +#include <utility> namespace opensubdiv_capi { +using std::fill; +using std::max; +using std::min; +using std::stack; using std::string; +using std::swap; using std::vector; #define foreach(x, y) for (x : y) @@ -34,9 +42,9 @@ using std::vector; #define STRINGIFY_APPEND(a, b) "" a #b #define STRINGIFY(x) STRINGIFY_APPEND("", x) -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); } // namespace opensubdiv_capi |