diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-04-26 21:56:58 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-04-26 21:56:58 +0300 |
commit | 129b19f69fbbdcd896150aa8faa7f20254169c0c (patch) | |
tree | dd15d89fa3d6422139a0ba41a22f6f4db3f8b5ee /src/utils | |
parent | 5f5ea46910feefc212a98ea715b0d4b0d9d4bc23 (diff) | |
download | mv-129b19f69fbbdcd896150aa8faa7f20254169c0c.tar.gz mv-129b19f69fbbdcd896150aa8faa7f20254169c0c.tar.bz2 mv-129b19f69fbbdcd896150aa8faa7f20254169c0c.tar.xz mv-129b19f69fbbdcd896150aa8faa7f20254169c0c.zip |
Add to log draw backend name.
Add ability to get free video memory (fast openg with NVIDIA).
Add test with id 100 for long perfomance testing.
Diffstat (limited to 'src/utils')
-rw-r--r-- | src/utils/stringutils.cpp | 13 | ||||
-rw-r--r-- | src/utils/stringutils.h | 3 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index fcafd7711..1808ea173 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -460,6 +460,19 @@ void splitToStringVector(StringVect &tokens, const std::string &text, } } +void splitToStringSet(std::set<std::string> &tokens, const std::string &text, + char separator) +{ + std::stringstream ss(text); + std::string item; + while (std::getline(ss, item, separator)) + { + item = trim(item); + if (!item.empty()) + tokens.insert(item); + } +} + std::string combineDye(std::string file, std::string dye) { if (dye.empty()) diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h index 94c455025..917ea3ab6 100644 --- a/src/utils/stringutils.h +++ b/src/utils/stringutils.h @@ -182,6 +182,9 @@ std::list<std::string> splitToStringList(const std::string &text, void splitToStringVector(StringVect &tokens, const std::string &text, char separator); +void splitToStringSet(std::set<std::string> &tokens, + const std::string &text, char separator); + std::string combineDye(std::string file, std::string dye); std::string combineDye2(std::string file, std::string dye); |