mirror of
https://github.com/ThePhD/sol2.git
synced 2024-03-22 13:10:44 +08:00
change resolve to behave better with crappy clang
This commit is contained in:
parent
b0612a5b68
commit
b2d137f65f
|
@ -26,6 +26,9 @@
|
||||||
#include "tuple.hpp"
|
#include "tuple.hpp"
|
||||||
|
|
||||||
namespace sol {
|
namespace sol {
|
||||||
|
// Clang has distinct problems with constexpr arguments,
|
||||||
|
// so don't use the constexpr versions inside of clang.
|
||||||
|
#ifndef __clang__
|
||||||
namespace detail {
|
namespace detail {
|
||||||
template<typename R, typename... Args, typename F, typename = std::result_of_t<meta::unqualified_t<F>(Args...)>>
|
template<typename R, typename... Args, typename F, typename = std::result_of_t<meta::unqualified_t<F>(Args...)>>
|
||||||
inline constexpr auto resolve_i(types<R(Args...)>, F&&)->R(meta::unqualified_t<F>::*)(Args...) {
|
inline constexpr auto resolve_i(types<R(Args...)>, F&&)->R(meta::unqualified_t<F>::*)(Args...) {
|
||||||
|
@ -87,10 +90,77 @@ namespace sol {
|
||||||
return detail::resolve_v(std::is_member_object_pointer<Sig C::*>(), mem_ptr);
|
return detail::resolve_v(std::is_member_object_pointer<Sig C::*>(), mem_ptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename... Sig, typename F>
|
template<typename... Sig, typename F, meta::disable<std::is_function<meta::unqualified_t<F>>> = meta::enabler>
|
||||||
inline constexpr auto resolve(F&& f) -> decltype(detail::resolve_i(types<Sig...>(), std::forward<F>(f))) {
|
inline constexpr auto resolve(F&& f) -> decltype(detail::resolve_i(types<Sig...>(), std::forward<F>(f))) {
|
||||||
return detail::resolve_i(types<Sig...>(), std::forward<F>(f));
|
return detail::resolve_i(types<Sig...>(), std::forward<F>(f));
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
namespace detail {
|
||||||
|
template<typename R, typename... Args, typename F, typename = std::result_of_t<meta::unqualified_t<F>(Args...)>>
|
||||||
|
inline auto resolve_i(types<R(Args...)>, F&&)->R(meta::unqualified_t<F>::*)(Args...) {
|
||||||
|
using Sig = R(Args...);
|
||||||
|
typedef meta::unqualified_t<F> Fu;
|
||||||
|
return static_cast<Sig Fu::*>(&Fu::operator());
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename F, typename U = meta::unqualified_t<F>>
|
||||||
|
inline auto resolve_f(std::true_type, F&& f)
|
||||||
|
-> decltype(resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f))) {
|
||||||
|
return resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f));
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename F>
|
||||||
|
inline void resolve_f(std::false_type, F&&) {
|
||||||
|
static_assert(meta::has_deducible_signature<F>::value,
|
||||||
|
"Cannot use no-template-parameter call with an overloaded functor: specify the signature");
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename F, typename U = meta::unqualified_t<F>>
|
||||||
|
inline auto resolve_i(types<>, F&& f) -> decltype(resolve_f(meta::has_deducible_signature<U>(), std::forward<F>(f))) {
|
||||||
|
return resolve_f(meta::has_deducible_signature<U> {}, std::forward<F>(f));
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename... Args, typename F, typename R = std::result_of_t<F&(Args...)>>
|
||||||
|
inline auto resolve_i(types<Args...>, F&& f) -> decltype(resolve_i(types<R(Args...)>(), std::forward<F>(f))) {
|
||||||
|
return resolve_i(types<R(Args...)>(), std::forward<F>(f));
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename Sig, typename C>
|
||||||
|
inline Sig C::* resolve_v(std::false_type, Sig C::* mem_func_ptr) {
|
||||||
|
return mem_func_ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename Sig, typename C>
|
||||||
|
inline Sig C::* resolve_v(std::true_type, Sig C::* mem_variable_ptr) {
|
||||||
|
return mem_variable_ptr;
|
||||||
|
}
|
||||||
|
} // detail
|
||||||
|
|
||||||
|
template<typename... Args, typename R>
|
||||||
|
inline auto resolve(R fun_ptr(Args...))->R(*)(Args...) {
|
||||||
|
return fun_ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename Sig>
|
||||||
|
inline Sig* resolve(Sig* fun_ptr) {
|
||||||
|
return fun_ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename... Args, typename R, typename C>
|
||||||
|
inline auto resolve(R(C::*mem_ptr)(Args...))->R(C::*)(Args...) {
|
||||||
|
return mem_ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename Sig, typename C>
|
||||||
|
inline Sig C::* resolve(Sig C::* mem_ptr) {
|
||||||
|
return detail::resolve_v(std::is_member_object_pointer<Sig C::*>(), mem_ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename... Sig, typename F>
|
||||||
|
inline auto resolve(F&& f) -> decltype(detail::resolve_i(types<Sig...>(), std::forward<F>(f))) {
|
||||||
|
return detail::resolve_i(types<Sig...>(), std::forward<F>(f));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
} // sol
|
} // sol
|
||||||
|
|
||||||
#endif // SOL_RESOLVE_HPP
|
#endif // SOL_RESOLVE_HPP
|
||||||
|
|
Loading…
Reference in New Issue
Block a user