diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-05-16 19:39:15 +0300 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-05-16 19:39:15 +0300 |
commit | 94c9686020798c8ec8113c242dc1dfe0c2accf71 (patch) | |
tree | 7390a7dc47939a5cbf30d9e38a7a3ccb5e52db86 /src/utility.h | |
parent | 1c3a85fa54079c0676df520d32f2c414133c2bf1 (diff) | |
parent | b3268ff3896097abdd9199e4bb8ee826afda8388 (diff) | |
download | minetest-94c9686020798c8ec8113c242dc1dfe0c2accf71.tar.gz minetest-94c9686020798c8ec8113c242dc1dfe0c2accf71.tar.bz2 minetest-94c9686020798c8ec8113c242dc1dfe0c2accf71.zip |
merged CiaranG's changes (player privileges)
Diffstat (limited to 'src/utility.h')
-rw-r--r-- | src/utility.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/utility.h b/src/utility.h index 12d732bea..326ebf161 100644 --- a/src/utility.h +++ b/src/utility.h @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <fstream> #include <string> #include <sstream> +#include <vector> #include <jthread.h> #include <jmutex.h> #include <jmutexautolock.h> @@ -731,6 +732,19 @@ inline std::string wide_to_narrow(const std::wstring& wcs) return *mbs; } +// Split a string using the given delimiter. Returns a vector containing +// the component parts. +inline std::vector<std::wstring> str_split(const std::wstring &str, wchar_t delimiter) +{ + std::vector<std::wstring> parts; + std::wstringstream sstr(str); + std::wstring part; + while(std::getline(sstr, part, delimiter)) + parts.push_back(part); + return parts; +} + + /* See test.cpp for example cases. wraps degrees to the range of -360...360 @@ -791,6 +805,11 @@ inline s32 stoi(std::string s) return atoi(s.c_str()); } +inline s32 stoi(std::wstring s) +{ + return atoi(wide_to_narrow(s).c_str()); +} + inline float stof(std::string s) { float f; |