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

Merge branch 'hotfix-1.3' into develop

Browse Source
This commit is contained in:
Jinhao 2016-02-17 00:34:22 +08:00
commit 2dd9283782
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nana/c++defines.hpp
View File

@ -39,6 +39,7 @@
#ifndef NANA_CXX_DEFINES_INCLUDED #ifndef NANA_CXX_DEFINES_INCLUDED
#define NANA_CXX_DEFINES_INCLUDED #define NANA_CXX_DEFINES_INCLUDED
#define STD_FILESYSTEM_NOT_SUPPORTED #define STD_FILESYSTEM_NOT_SUPPORTED
//C++ language //C++ language
#if defined(_MSC_VER) #if defined(_MSC_VER)
# undef STD_FILESYSTEM_NOT_SUPPORTED # undef STD_FILESYSTEM_NOT_SUPPORTED
@ -46,6 +47,7 @@
# //Nana defines some macros for lack of support of keywords # //Nana defines some macros for lack of support of keywords
# define _ALLOW_KEYWORD_MACROS # define _ALLOW_KEYWORD_MACROS
# #
# define CXX_NO_INLINE_NAMESPACE //no support of C++11 inline namespace until Visual C++ 2015
# define noexcept //no support of noexcept until Visual C++ 2015 # define noexcept //no support of noexcept until Visual C++ 2015
# define constexpr //no support of constexpr until Visual C++ 2015 # define constexpr //no support of constexpr until Visual C++ 2015
# endif # endif

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

@ -42,8 +42,13 @@
// namespace std { namespace experimental { namespace filesystem { inline namespace v1 { // namespace std { namespace experimental { namespace filesystem { inline namespace v1 {
namespace nana { namespace experimental { inline namespace v1 namespace nana { namespace experimental {
#ifndef CXX_NO_INLINE_NAMESPACE
inline namespace v1
{ {
#endif
namespace filesystem namespace filesystem
{ {
enum class file_type enum class file_type
@ -367,8 +372,9 @@ namespace filesystem
return index ? path.substr(0, index + 1) : std::basic_string<CharType>(); return index ? path.substr(0, index + 1) : std::basic_string<CharType>();
} }
#ifndef CXX_NO_INLINE_NAMESPACE
} //end namespace v1 } //end namespace v1
#endif
} //end namespace filesystem } //end namespace filesystem
} //end namespace experimental } //end namespace experimental

5
source/filesystem/filesystem.cpp
View File

@ -38,7 +38,9 @@
namespace nana { namespace experimental { namespace nana { namespace experimental {
#ifndef CXX_NO_INLINE_NAMESPACE
inline namespace v1 { inline namespace v1 {
#endif
namespace filesystem namespace filesystem
{ {
//class filesystem_error //class filesystem_error
@ -870,7 +872,10 @@ namespace nana { namespace experimental {
::chdir(p.c_str()); ::chdir(p.c_str());
#endif #endif
} }
#ifndef CXX_NO_INLINE_NAMESPACE
} //end namespace v1 } //end namespace v1
#endif
}//end namespace filesystem }//end namespace filesystem
} //end namespace experimental } //end namespace experimental
}//end namespace nana }//end namespace nana