Merge remote-tracking branch 'cnjinhao/hotfix-1.3' into hotfix-1.3

2016-03-18 22:25:43 +01:00
parent b0815fafca 8ec21827a0
commit d2b08d0f26
66 changed files with 280 additions and 107 deletions
--- a/source/detail/platform_spec_posix.cpp
+++ b/source/detail/platform_spec_posix.cpp
@@ -16,6 +16,9 @@

 #include <nana/detail/platform_spec_selector.hpp>
 #if defined(NANA_POSIX) && defined(NANA_X11)
+
+#include <nana/push_ignore_diagnostic>
+
 #include <X11/Xlocale.h>
 #include <locale>
 #include <map>
@@ -1414,4 +1417,6 @@ namespace detail
 	}
 }//end namespace detail
 }//end namespace nana
+
+#include <nana/pop_ignore_diagnostic>
 #endif //NANA_POSIX && NANA_X11