mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'hotfix-1.7.2' into develop

Browse Source
This commit is contained in:
Jinhao
2019-12-05 03:58:50 +08:00
parent 0ab4225262 8911e2d76a
commit dbf6a7eeba
5 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/filesystem/filesystem.cpp
View File

@@ -11,12 +11,12 @@
* provide some interface for file management
*/
#include <nana/config.hpp>
#include <nana/filesystem/filesystem_ext.hpp>
#include <vector>
#include <sstream>
#include <string>
#include <nana/config.hpp>
#ifdef _nana_std_put_time
#include <nana/stdc++.hpp>
#else
@@ -149,7 +149,7 @@ namespace nana
}
}
#if NANA_USING_NANA_FILESYSTEM
#if NANA_USING_NANA_FILESYSTEM // and BOOST ?
namespace nana_fs = nana::filesystem;
namespace nana
@@ -1589,11 +1589,9 @@ namespace std
return exists(status(p, ec));
}
*/
}//end namespace filesystem
}//end namespace std
#if (defined(NANA_USING_STD_EXPERIMENTAL_FILESYSTEM) && defined(_MSC_VER) && (_MSC_VER > 1912)) || \
(!defined(__clang__) && defined(__GNUC__) && (__cplusplus < 201603 || (__GNUC__* 100 + __GNUC_MINOR__ < 801)))
#if (defined(NANA_USING_STD_EXPERIMENTAL_FILESYSTEM) && defined(_MSC_VER) && (_MSC_VER > 1912)) || \
(!defined(__clang__) && defined(__GNUC__) && (__cplusplus < 201603 || (__GNUC__* 100 + __GNUC_MINOR__ < 801)))
namespace detail
{
@@ -1736,9 +1734,9 @@ namespace std
{
return weakly_canonical(p, &err);
}
}
}
#endif
}//end namespace filesystem
}//end namespace std
#endif //NANA_USING_NANA_FILESYSTEM