diff options
Diffstat (limited to 'src/utility.h')
-rw-r--r-- | src/utility.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/utility.h b/src/utility.h index 326ebf161..84838c0c7 100644 --- a/src/utility.h +++ b/src/utility.h @@ -800,6 +800,10 @@ inline s32 stoi(const std::string &s, s32 min, s32 max) return i; } + +// MSVC2010 includes it's own versions of these +#if !defined(_MSC_VER) || _MSC_VER < 1600 + inline s32 stoi(std::string s) { return atoi(s.c_str()); @@ -818,6 +822,8 @@ inline float stof(std::string s) return f; } +#endif + inline std::string itos(s32 i) { std::ostringstream o; |