Merge branch 'develop' into prepare-utf8

2016-01-03 14:18:03 +08:00
parent 0a4f04267e cd5a0bf554
commit 0bb7c788d5
13 changed files with 522 additions and 108 deletions
--- a/source/deploy.cpp
+++ b/source/deploy.cpp
@@ -299,6 +299,7 @@ namespace std
 #endif //STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED

 #ifdef STD_TO_STRING_NOT_SUPPORTED
+#include <sstream>
 namespace std
 {
 	std::string to_string(double v)
@@ -363,7 +364,13 @@ namespace std
 		ss << v;
 		return ss.str();
 	}
+}
+#endif // STD_TO_STRING_NOT_SUPPORTED

+#ifdef STD_TO_WSTRING_NOT_SUPPORTED
+#include <sstream>
+namespace std
+{
 	std::wstring to_wstring(double v)
 	{
 		std::wstringstream ss;