fix mingw compilation error

2015-04-05 22:07:57 +08:00
parent e3a82e99c0
commit 86d675fa85
11 changed files with 174 additions and 69 deletions
--- a/include/nana/deploy.hpp
+++ b/include/nana/deploy.hpp
@@ -15,6 +15,8 @@
 #ifndef NANA_DEPLOY_HPP
 #define NANA_DEPLOY_HPP

+#include <stdexcept>
+
 #include <nana/config.hpp>
 #include <nana/charset.hpp>
 #if defined(NANA_LINUX)
@@ -22,7 +24,7 @@
 #endif

 //Implement workarounds for MinGW
-#if defined(NANA_MINGW)
+#if defined(NANA_MINGW) && __GNUC_MINOR__ < 8
 namespace std
 {
 	//Workaround for no implemenation of std::stoi in MinGW.
--- a/include/nana/std_thread.hpp
+++ b/include/nana/std_thread.hpp
@@ -2,7 +2,7 @@
 #define NANA_STD_THREAD_HPP
 #include <nana/config.hpp>

-#if defined(NANA_MINGW)
+#if defined(STD_THREAD_NOT_SUPPORTED)
 #include <boost/thread.hpp>
 namespace std
 {