TartanLlama/optional
1
0
Fork 1
mirror of https://github.com/TartanLlama/optional.git synced 2025-07-30 01:47:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

More Clang fixes

Browse Source
This commit is contained in:
Simon Brand
2018-09-03 14:30:07 +01:00
parent 4d5453bc56
commit 6c5e6d6477
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tl/optional.hpp
View File

@ -142,7 +142,7 @@ struct conjunction<B, Bs...>
#if defined(_LIBCPP_VERSION) && __cplusplus == 201103L
#define TL_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
#endif
// In C++11 mode, there's an issue in libc++'s std::mem_fn
// which results in a hard-error when using it in a noexcept expression
// in some cases. This is a check to workaround the common failing case.
@ -161,8 +161,9 @@ struct is_pointer_to_non_const_member_func<Ret (T::*) (Args...) volatile&> : std
template <class T, class Ret, class... Args>
struct is_pointer_to_non_const_member_func<Ret (T::*) (Args...) volatile&&> : std::true_type{};
template <class T> struct is_ref_to_const : std::false_type{};
template <class T> struct is_ref_to_const<T const&> : std::true_type{};
template <class T> struct is_const_or_const_ref : std::false_type{};
template <class T> struct is_const_or_const_ref<T const&> : std::true_type{};
template <class T> struct is_const_or_const_ref<T const> : std::true_type{};
#endif
// std::invoke from C++17
@ -170,7 +171,7 @@ template <class T> struct is_ref_to_const<T const&> : std::true_type{};
template <typename Fn, typename... Args,
#ifdef TL_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
typename = enable_if_t<!(is_pointer_to_non_const_member_func<Fn>::value
&& is_ref_to_const<Args...>::value)>,
&& is_const_or_const_ref<Args...>::value)>,
#endif
typename = enable_if_t<std::is_member_pointer<decay_t<Fn>>{}>,
int = 0>