From ea3c653a8b6352b1df234e6a9663499e9a42bf90 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Wed, 18 May 2011 22:05:31 +0300
Subject: [PATCH] (hopefully) fixed stoi/stof compile problems on vc2010
---
src/utility.h | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/utility.h b/src/utility.h
index 326ebf161..28732a099 100644
--- a/src/utility.h
+++ b/src/utility.h
@@ -800,16 +800,15 @@ 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());
}
-inline s32 stoi(std::wstring s)
-{
- return atoi(wide_to_narrow(s).c_str());
-}
-
inline float stof(std::string s)
{
float f;
@@ -818,6 +817,13 @@ inline float stof(std::string s)
return f;
}
+#endif
+
+inline s32 stoi(std::wstring s)
+{
+ return atoi(wide_to_narrow(s).c_str());
+}
+
inline std::string itos(s32 i)
{
std::ostringstream o;
--
GitLab