Skip to content

fix: when use c++ 20, compile failed #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: when use c++ 20, compile failed #73

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
579d709
fix: version
wendajiang Feb 14, 2023
28ccac9
fix: invoke_result_t
wendajiang Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions include/clipp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@
#include <iterator>
#include <functional>

#ifdef _MSVC_LANG
#define CLIPP_CPLUSPLUS _MSVC_LANG
#else
#define CLIPP_CPLUSPLUS __cplusplus
#endif

/*************************************************************************//**
*
Expand Down Expand Up @@ -160,7 +165,14 @@ constexpr auto
check_is_callable(int) -> decltype(
std::declval<Fn>()(std::declval<Args>()...),
std::integral_constant<bool,
std::is_same<Ret,typename std::result_of<Fn(Args...)>::type>::value>{} );
std::is_same<Ret,
#if CLIPP_CPLUSPLUS >= 201703L
typename std::invoke_result_t<Fn, Args...>
#else
typename std::result_of<Fn(Args...)>::type
#endif
>::value>{} );


template<class,class,class...>
constexpr auto
Expand All @@ -171,7 +183,13 @@ constexpr auto
check_is_callable_without_arg(int) -> decltype(
std::declval<Fn>()(),
std::integral_constant<bool,
std::is_same<Ret,typename std::result_of<Fn()>::type>::value>{} );
std::is_same<Ret,
#if CLIPP_CPLUSPLUS >= 201703L
typename std::invoke_result_t<Fn>
#else
typename std::result_of<Fn()>::type
#endif
>::value>{} );

template<class,class>
constexpr auto
Expand Down