Merge branch 'develop-c++17' into develop

2018-06-04 02:29:55 +08:00
parent d5f8f8b305 163223e46f
commit a9f23e2503
35 changed files with 270 additions and 86 deletions
--- a/source/filesystem/filesystem.cpp
+++ b/source/filesystem/filesystem.cpp
@@ -16,7 +16,7 @@
 #include <sstream>

 #include <nana/config.hpp>
-#ifdef _enable_std_put_time
+#ifdef _nana_std_put_time
 	#include <nana/stdc++.hpp>
 #else
 	#include <iomanip>