diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-06-04 14:53:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-04 14:53:57 -0400 |
| commit | b0f5401adb755b305669b16d6589639f79721626 (patch) | |
| tree | d38f28d6d45835a7889438bb1fe1035049d8bedb /indra/llcommon/lleventdispatcher.h | |
| parent | 316bc0bdf30514a0c6894ef7c2859e79bf02a546 (diff) | |
| parent | 9e6cf32add0a857b4e28c638bd378a8d3f70fcdb (diff) | |
Merge pull request #1555 from secondlife/lua-timers
Add timer support to the Lua viewer
Diffstat (limited to 'indra/llcommon/lleventdispatcher.h')
| -rw-r--r-- | indra/llcommon/lleventdispatcher.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcommon/lleventdispatcher.h b/indra/llcommon/lleventdispatcher.h index 35bf9075a0..5adaa3ebae 100644 --- a/indra/llcommon/lleventdispatcher.h +++ b/indra/llcommon/lleventdispatcher.h @@ -35,7 +35,6 @@ #include <boost/fiber/fss.hpp> #include <boost/function_types/is_member_function_pointer.hpp> #include <boost/function_types/is_nonmember_callable_builtin.hpp> -#include <boost/hof/is_invocable.hpp> // until C++17, when we get std::is_invocable #include <boost/iterator/transform_iterator.hpp> #include <functional> // std::function #include <memory> // std::unique_ptr @@ -48,6 +47,7 @@ #include "llevents.h" #include "llptrto.h" #include "llsdutil.h" +#include "stringize.h" class LLSD; @@ -99,7 +99,7 @@ public: template <typename CALLABLE, typename=typename std::enable_if< - boost::hof::is_invocable<CALLABLE, LLSD>::value + std::is_invocable<CALLABLE, LLSD>::value >::type> void add(const std::string& name, const std::string& desc, @@ -296,7 +296,7 @@ public: */ template <typename CALLABLE, typename=typename std::enable_if< - ! boost::hof::is_invocable<CALLABLE, LLSD>() + ! std::is_invocable<CALLABLE, LLSD>() >::type> void add(const std::string& name, const std::string& desc, @@ -338,7 +338,7 @@ public: template<typename Function, typename = typename std::enable_if< boost::function_types::is_nonmember_callable_builtin<Function>::value && - ! boost::hof::is_invocable<Function, LLSD>::value + ! std::is_invocable<Function, LLSD>::value >::type> void add(const std::string& name, const std::string& desc, Function f, const LLSD& params, const LLSD& defaults=LLSD()); |