diff options
| -rw-r--r-- | src/common/Utilities/Concepts.h | 6 | ||||
| -rw-r--r-- | src/common/Utilities/Containers.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/common/Utilities/Concepts.h b/src/common/Utilities/Concepts.h index 4cfa52c029c..3f52c6613ca 100644 --- a/src/common/Utilities/Concepts.h +++ b/src/common/Utilities/Concepts.h @@ -19,15 +19,11 @@ #define TRINITYCORE_CONCEPTS_H #include <concepts> -#include <functional> // std::invoke namespace Trinity { template <typename Callable, typename R, typename... Args> -concept invocable_r = requires(Callable && callable, Args&&... args) -{ - { std::invoke(static_cast<Callable&&>(callable), static_cast<Args&&>(args)...) } -> std::convertible_to<R>; -}; +concept invocable_r = std::is_invocable_r_v<R, Callable, Args...>; } #endif // TRINITYCORE_CONCEPTS_H diff --git a/src/common/Utilities/Containers.h b/src/common/Utilities/Containers.h index bec7344cb6d..4a764629937 100644 --- a/src/common/Utilities/Containers.h +++ b/src/common/Utilities/Containers.h @@ -239,7 +239,7 @@ namespace Trinity ++first1; else if (*first2 < *first1) ++first2; - else if (!std::invoke(std::forward<Predicate>(equalPred), *first1, *first2)) + else if (!std::forward<Predicate>(equalPred)(*first1, *first2)) ++first1, ++first2; else return true; |