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

filesystem to experimental to avoid conflicts with fs_utillity

Browse Source
This commit is contained in:
qPCR4vir 2015-05-22 23:21:01 +02:00
parent 59f0ace353
commit f55c54f7b4
2 changed files with 366 additions and 363 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@
// namespace std { namespace experimental { namespace filesystem { inline namespace v1 { // namespace std { namespace experimental { namespace filesystem { inline namespace v1 {
namespace nana namespace nana { namespace experimental
{ {
namespace filesystem namespace filesystem
{ {
@ -73,7 +73,7 @@ namespace filesystem
//enum class directory_options; //enum class directory_options;
// class filesystem_error; // class filesystem_error;
enum class error { none = 0 }; enum class error { none = 0 }; // deprecate ??
struct attribute // deprecate ?? struct attribute // deprecate ??
{ {
@ -449,6 +449,7 @@ namespace filesystem
}//end namespace filesystem }//end namespace filesystem
} //end namespace experimental
}//end namespace nana }//end namespace nana
#endif #endif

4
source/filesystem/filesystem.cpp
View File

@ -36,7 +36,8 @@
#include <stdlib.h> #include <stdlib.h>
#endif #endif
namespace nana namespace nana {
namespace experimental
{ {
namespace filesystem namespace filesystem
{ {
@ -439,4 +440,5 @@ namespace filesystem
return nana::string(); return nana::string();
} }
}//end namespace filesystem }//end namespace filesystem
} //end namespace experimental
}//end namespace nana }//end namespace nana