Merge branch 'hotfix-1.2' into prepare-utf8

2015-12-04 23:44:11 +08:00
parent e8266b5ae8 21a5e2fc2e
commit babcacd63d
28 changed files with 351 additions and 236 deletions
--- a/source/deploy.cpp
+++ b/source/deploy.cpp
@@ -61,6 +61,13 @@ namespace std
 			*pos = (std::size_t)(end - sptr);
 		return ((int)result);
 	}
+	using ::strtof;
+	using ::strtold;
+	using ::wcstold;
+	using ::strtoll;
+	using ::wcstoll;
+	using ::strtoull;
+	using ::wcstoull;

 	float stof(const std::string& str, std::size_t * pos)
 	{