oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Some MSVC fixes

Browse source
This commit is contained in:
Perttu Ahola 2011-11-29 14:13:57 +02:00
parent c910ead4db
commit c8211ceb3e
3 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/utility.h
View file

@ -967,7 +967,7 @@ inline bool is_yes(const std::string &s)
return false;
}
inline s32 stoi(const std::string &s, s32 min, s32 max)
inline s32 mystoi(const std::string &s, s32 min, s32 max)
{
s32 i = atoi(s.c_str());
if(i < min)
@ -979,19 +979,19 @@ inline s32 stoi(const std::string &s, s32 min, s32 max)
// MSVC2010 includes it's own versions of these
#if !defined(_MSC_VER) || _MSC_VER < 1600
//#if !defined(_MSC_VER) || _MSC_VER < 1600
inline s32 stoi(std::string s)
inline s32 mystoi(std::string s)
{
return atoi(s.c_str());
}
inline s32 stoi(std::wstring s)
inline s32 mystoi(std::wstring s)
{
return atoi(wide_to_narrow(s).c_str());
}
inline float stof(std::string s)
inline float mystof(std::string s)
{
float f;
std::istringstream ss(s);
@ -999,7 +999,10 @@ inline float stof(std::string s)
return f;
}
#endif
//#endif
#define stoi mystoi
#define stof mystof
inline std::string itos(s32 i)
{