Skip to content

Commit ee859ac

Browse files
committed
fix some warnings due to c++17 upgrade
1 parent b3fb962 commit ee859ac

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/core/EntityGroup.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class EntityGroup final : private sf::NonCopyable {
8181

8282
template<typename F, typename...Args,
8383
typename std::enable_if<std::is_same<
84-
typename std::result_of<F(lif::Entity&, Args&&...)>::type, bool>::value,
84+
typename std::invoke_result<F(lif::Entity&, Args&&...)>::type, bool>::value,
8585
std::nullptr_t>::type = nullptr>
8686
void apply(const F& func, Args&&... args) {
8787
for (auto& e : entities)
@@ -92,7 +92,7 @@ class EntityGroup final : private sf::NonCopyable {
9292
/** Applies a function to all entities. */
9393
template<typename F, typename...Args,
9494
typename std::enable_if<std::is_same<
95-
typename std::result_of<F(lif::Entity&, Args&&...)>::type, void>::value,
95+
typename std::invoke_result<F, lif::Entity&, Args&&...>::type, void>::value,
9696
std::nullptr_t>::type = nullptr>
9797
void apply(const F& func, Args&&... args) {
9898
for (auto& e : entities)
@@ -102,7 +102,7 @@ class EntityGroup final : private sf::NonCopyable {
102102
/** @see apply */
103103
template<typename F, typename...Args,
104104
typename std::enable_if<std::is_same<
105-
typename std::result_of<F(lif::Entity&, Args&&...)>::type, bool>::value,
105+
typename std::invoke_result<F, lif::Entity&, Args&&...>::type, bool>::value,
106106
std::nullptr_t>::type = nullptr>
107107
void apply(const F& func, Args&&... args) const {
108108
for (const auto& e : entities)
@@ -113,7 +113,7 @@ class EntityGroup final : private sf::NonCopyable {
113113
/** @see apply */
114114
template<typename F, typename...Args,
115115
typename std::enable_if<std::is_same<
116-
typename std::result_of<F(lif::Entity&, Args&&...)>::type, void>::value,
116+
typename std::invoke_result<F, lif::Entity&, Args&&...>::type, void>::value,
117117
std::nullptr_t>::type = nullptr>
118118
void apply(const F& func, Args&&... args) const {
119119
for (const auto& e : entities)

0 commit comments

Comments
 (0)