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

Merge branch 'dankan1890-compiler' into develop

Browse Source
This commit is contained in:
Jinhao 2016-07-17 10:28:05 +08:00
commit 152da8e98f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,9 +118,10 @@
//<codecvt> is a known issue on libstdc++, it works on libc++ //<codecvt> is a known issue on libstdc++, it works on libc++
#define STD_CODECVT_NOT_SUPPORTED #define STD_CODECVT_NOT_SUPPORTED
#if !defined(__cpp_lib_make_unique) || (__cpp_lib_make_unique != 201304)
#ifndef STD_MAKE_UNIQUE_NOT_SUPPORTED #ifndef STD_MAKE_UNIQUE_NOT_SUPPORTED
#define STD_MAKE_UNIQUE_NOT_SUPPORTED #define STD_MAKE_UNIQUE_NOT_SUPPORTED
#endif
#endif #endif
#endif #endif
@ -195,9 +196,9 @@
// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0061r0.html // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0061r0.html
# if __cpp_lib_experimental_filesystem #if defined(__cpp_lib_experimental_filesystem) && (__cpp_lib_experimental_filesystem == 201406)
# undef STD_FILESYSTEM_NOT_SUPPORTED # undef STD_FILESYSTEM_NOT_SUPPORTED
# endif #endif
#ifdef __has_include #ifdef __has_include