Merge branch 'hotfix-1.7.2' into develop

This commit is contained in:
Jinhao 2019-12-21 05:20:26 +08:00
commit e4d152706e

View File

@ -577,10 +577,14 @@ namespace std
{ {
namespace filesystem 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; using namespace ::nana::filesystem;
} }
#endif
} }
} }