diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-05-19 08:16:48 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-05-19 08:16:48 +0300 |
| commit | 889de3e93aadb5c79adb58953513cab3e6cd3a3d (patch) | |
| tree | cc16c37b883144eeb546dfc1013c3a88ff29d750 /src/utility.h | |
| parent | ea3c653a8b6352b1df234e6a9663499e9a42bf90 (diff) | |
| download | minetest-889de3e93aadb5c79adb58953513cab3e6cd3a3d.tar.gz minetest-889de3e93aadb5c79adb58953513cab3e6cd3a3d.tar.bz2 minetest-889de3e93aadb5c79adb58953513cab3e6cd3a3d.zip | |
put the wstring stoi too in the ignore-on-vc2010 #if
Diffstat (limited to 'src/utility.h')
| -rw-r--r-- | src/utility.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/utility.h b/src/utility.h index 28732a099..84838c0c7 100644 --- a/src/utility.h +++ b/src/utility.h @@ -809,6 +809,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; @@ -819,11 +824,6 @@ inline float stof(std::string s) #endif -inline s32 stoi(std::wstring s) -{ - return atoi(wide_to_narrow(s).c_str()); -} - inline std::string itos(s32 i) { std::ostringstream o; |