Merge branch 'boostfix' of https://github.com/pavelxdd/nana into pavelxdd-boostfix

This commit is contained in:
Jinhao
2017-12-01 22:18:13 +08:00
7 changed files with 57 additions and 19 deletions

View File

@@ -53,6 +53,7 @@
#undef NANA_USING_BOOST_FILESYSTEM
#define NANA_USING_BOOST_FILESYSTEM 1
# include <chrono>
# include <boost/filesystem.hpp>
// add boost::filesystem into std::experimental::filesystem
@@ -60,6 +61,20 @@ namespace std {
namespace experimental {
namespace filesystem {
using namespace boost::filesystem;
using file_time_type = std::chrono::time_point<std::chrono::system_clock>;
enum class file_type {
none = boost::filesystem::file_type::status_unknown,
not_found = boost::filesystem::file_type::file_not_found,
regular = boost::filesystem::file_type::regular_file,
directory = boost::filesystem::file_type::directory_file,
symlink = boost::filesystem::file_type::symlink_file,
block = boost::filesystem::file_type::block_file,
character = boost::filesystem::file_type::character_file,
fifo = boost::filesystem::file_type::fifo_file,
socket = boost::filesystem::file_type::socket_file,
unknown = boost::filesystem::file_type::type_unknown,
};
} // filesystem
} // experimental
} // std

View File

@@ -12,6 +12,9 @@
* @brief Implement the lack support of standard library.
*/
#ifndef NANA_STDCXX_INCLUDED
#define NANA_STDCXX_INCLUDED
#include "c++defines.hpp"
//Implement workarounds for GCC/MinGW which version is below 4.8.2
@@ -153,4 +156,6 @@ namespace std
return (v < lo ? lo : (hi < v ? hi : v));
}
}
#endif
#endif
#endif // NANA_STDCXX_INCLUDED