Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 01:53:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

(hopefully) fixed stoi/stof compile problems on vc2010

Browse Source
This commit is contained in:
Perttu Ahola 2011-05-18 22:05:31 +03:00
parent cdfb5345e9
commit ea3c653a8b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/utility.h
View File

@ -800,16 +800,15 @@ inline s32 stoi(const std::string &s, s32 min, s32 max)
return i; return i;
} }
// MSVC2010 includes it's own versions of these
#if !defined(_MSC_VER) || _MSC_VER < 1600
inline s32 stoi(std::string s) inline s32 stoi(std::string s)
{ {
return atoi(s.c_str()); 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) inline float stof(std::string s)
{ {
float f; float f;
@ -818,6 +817,13 @@ inline float stof(std::string s)
return f; return f;
} }
#endif
inline s32 stoi(std::wstring s)
{
return atoi(wide_to_narrow(s).c_str());
}
inline std::string itos(s32 i) inline std::string itos(s32 i)
{ {
std::ostringstream o; std::ostringstream o;