Skip to content

Commit adf1092

Browse files
committed
Try to be a bit more paranoid about C++11 support
1 parent 1227982 commit adf1092

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

timsort.hpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,19 @@
6262
# if defined(__cplusplus) && __cplusplus < 201103L
6363
# undef GFX_TIMSORT_USE_CXX11
6464
# endif
65-
# ifdef _LIBCPP_VERSION
66-
# if defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) || defined(_LIBCPP_CXX03_LANG)
65+
# ifdef __GLIBCXX__
66+
# if __GLIBCXX__ < 20150422
6767
# undef GFX_TIMSORT_USE_CXX11
6868
# endif
69-
# elif defined(__GLIBCXX__)
70-
# if __GLIBCXX__ < 20150422
69+
# endif
70+
# ifdef _LIBCPP_VERSION
71+
# if defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) || defined(_LIBCPP_CXX03_LANG)
7172
# undef GFX_TIMSORT_USE_CXX11
7273
# endif
7374
# endif
7475
# ifdef __clang__
7576
# ifdef __has_feature
76-
# if !(__has_feature(cxx_rvalue_references))
77+
# if !(__has_feature(cxx_rvalue_references) && __has_feature(is_trivially_copyable))
7778
# undef GFX_TIMSORT_USE_CXX11
7879
# endif
7980
# else

0 commit comments

Comments
 (0)