diff options
| author | Roxanne Skelly <roxie@lindenlab.com> | 2024-05-20 14:36:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-20 14:36:14 -0700 |
| commit | a1d7d2abc304b59fbca26f0ca23c926762be10a1 (patch) | |
| tree | fcb3901b838af753e40c2ddd1ce84b95a6c2f603 /indra/llcommon/apply.h | |
| parent | f51797f088808029745161854aa86b775f041a64 (diff) | |
| parent | 3a212d9608492ae64a3a32f80790371b90be9e9e (diff) | |
Merge pull request #1532 from secondlife/roxie/webrtc-voice
[WebRTC] Merge from main
Diffstat (limited to 'indra/llcommon/apply.h')
| -rw-r--r-- | indra/llcommon/apply.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llcommon/apply.h b/indra/llcommon/apply.h index cf6161ed50..ec1a39f7b0 100644 --- a/indra/llcommon/apply.h +++ b/indra/llcommon/apply.h @@ -3,7 +3,7 @@ * @author Nat Goodspeed * @date 2022-06-18 * @brief C++14 version of std::apply() - * + * * $LicenseInfo:firstyear=2022&license=viewerlgpl$ * Copyright (c) 2022, Linden Research, Inc. * $/LicenseInfo$ @@ -69,7 +69,7 @@ using std::invoke; // Use invoke() to handle pointer-to-method: // derived from https://stackoverflow.com/a/38288251 -template<typename Fn, typename... Args, +template<typename Fn, typename... Args, typename std::enable_if<std::is_member_pointer<typename std::decay<Fn>::type>::value, int>::type = 0 > auto invoke(Fn&& f, Args&&... args) @@ -77,7 +77,7 @@ auto invoke(Fn&& f, Args&&... args) return std::mem_fn(std::forward<Fn>(f))(std::forward<Args>(args)...); } -template<typename Fn, typename... Args, +template<typename Fn, typename... Args, typename std::enable_if<!std::is_member_pointer<typename std::decay<Fn>::type>::value, int>::type = 0 > auto invoke(Fn&& f, Args&&... args) @@ -154,7 +154,7 @@ using std::bind_front; #else // no std::bind_front() -template<typename Fn, typename... Args, +template<typename Fn, typename... Args, typename std::enable_if<!std::is_member_pointer<typename std::decay<Fn>::type>::value, int>::type = 0 > auto bind_front(Fn&& f, Args&&... args) @@ -172,7 +172,7 @@ auto bind_front(Fn&& f, Args&&... args) }; } -template<typename Fn, typename... Args, +template<typename Fn, typename... Args, typename std::enable_if<std::is_member_pointer<typename std::decay<Fn>::type>::value, int>::type = 0 > auto bind_front(Fn&& f, Args&&... args) |