diff options
| author | Linus Jahn <lnj@kaidan.im> | 2023-03-11 00:29:02 +0100 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2023-03-11 00:29:02 +0100 |
| commit | 463111576fb1476192acd2d8fe415b8482a8a696 (patch) | |
| tree | e87e3bb8f8724f019954692ac22b0d6386dfa5e7 /src/base/QXmppPromise.h | |
| parent | 6ea3edfd83a0bf1558d43e48eac563730276c175 (diff) | |
| parent | 4897c9b6a36e961fb44d2bce04a698f979a423d5 (diff) | |
| download | qxmpp-463111576fb1476192acd2d8fe415b8482a8a696.tar.gz | |
Merge branch '1.5'
Diffstat (limited to 'src/base/QXmppPromise.h')
| -rw-r--r-- | src/base/QXmppPromise.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/base/QXmppPromise.h b/src/base/QXmppPromise.h index 4900dae1..6408ad0c 100644 --- a/src/base/QXmppPromise.h +++ b/src/base/QXmppPromise.h @@ -45,7 +45,7 @@ public: #ifdef QXMPP_DOC void reportFinished(T &&value) #else - template<typename U, std::enable_if_t<!std::is_void_v<T> && std::is_same_v<T, U>> * = nullptr> + template<typename U, typename TT = T, std::enable_if_t<!std::is_void_v<TT> && std::is_same_v<TT, U>> * = nullptr> void finish(U &&value) #endif { @@ -61,7 +61,7 @@ public: } /// \cond - template<typename U, std::enable_if_t<!std::is_void_v<T> && std::is_constructible_v<T, U> && !std::is_same_v<T, U>> * = nullptr> + template<typename U, typename TT = T, std::enable_if_t<!std::is_void_v<TT> && std::is_constructible_v<TT, U> && !std::is_same_v<TT, U>> * = nullptr> void finish(U &&value) { Q_ASSERT(!d.isFinished()); |