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

better mimic?

Browse Source
This commit is contained in:
qPCR4vir 2015-05-24 03:12:02 +02:00
parent a42931830f
commit 9fbabadd78
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/nana/filesystem/filesystem.hpp
View File

@ -142,11 +142,17 @@ namespace filesystem
file_type what() const; file_type what() const;
nana::string filename() const; nana::string filename() const;
operator nana::string() { return filename(); }
private:
#if defined(NANA_WINDOWS) #if defined(NANA_WINDOWS)
public:
nana::string to_string() const { return text_; }
operator nana::string() const { return text_; }
private:
nana::string text_; nana::string text_;
#else #else
public:
std::string to_string() const { return text_; }
operator std::string() const { return text_; }
private:
std::string text_; std::string text_;
#endif #endif
}; };
@ -187,7 +193,7 @@ namespace filesystem
directory_iterator():end_(true), handle_(nullptr){} directory_iterator():end_(true), handle_(nullptr){}
directory_iterator(const nana::string& file_path) { _m_prepare(file_path); } directory_iterator(const nana::string& file_path) { _m_prepare(file_path); }
directory_iterator(const path& file_path) { _m_prepare(file_path.filename()); } //directory_iterator(const path& file_path) { _m_prepare(file_path.filename()); }
const value_type& const value_type&
operator*() const { return value_; } operator*() const { return value_; }
@ -400,7 +406,8 @@ namespace filesystem
bool file_attrib(const nana::string& file, attribute&); bool file_attrib(const nana::string& file, attribute&);
inline bool is_directory(file_status s) noexcept{ return s.type() == file_type::directory ;} inline bool is_directory(file_status s) noexcept{ return s.type() == file_type::directory ;}
inline bool is_directory(const path& p){return directory_iterator(p.filename())->attr.directory; } inline bool is_directory(const path& p) { return directory_iterator{ p }->attr.directory; }//works??
inline bool is_directory(const directory_entry& d) { return d.attr.directory; }
//bool is_directory(const path& p, error_code& ec) noexcept; //bool is_directory(const path& p, error_code& ec) noexcept;
//bool is_regular_file(file_status s) noexcept; //bool is_regular_file(file_status s) noexcept;