Merge branch 'hotfix-1.7.2' into develop

2019-12-21 05:20:26 +08:00
parent 0b94dc80ae e08a7a3531
commit e4d152706e
1 changed files with 5 additions and 1 deletions
--- a/include/nana/filesystem/filesystem.hpp
+++ b/include/nana/filesystem/filesystem.hpp
@@ -577,10 +577,14 @@ namespace std
 {
    namespace filesystem
    {
-        inline namespace nana_filesystem
+#if defined(_MSC_VER) && ((!defined(_MSVC_LANG)) || _MSVC_LANG < 201703)
+		using namespace ::nana::filesystem;
+#else
+		inline namespace nana_filesystem
        {
            using namespace ::nana::filesystem;
        }
+#endif
    }
 }