diff options
| -rw-r--r-- | lib/mxcreply.cpp | 1 | ||||
| -rw-r--r-- | lib/util.h | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/mxcreply.cpp b/lib/mxcreply.cpp index b757bb93..319d514a 100644 --- a/lib/mxcreply.cpp +++ b/lib/mxcreply.cpp @@ -5,7 +5,6 @@ #include <QtCore/QBuffer> #include "accountregistry.h" -#include "connection.h" #include "room.h" #ifdef Quotient_E2EE_ENABLED @@ -109,8 +109,8 @@ private: */ template <typename InputIt, typename ForwardIt, typename Pred> inline std::pair<InputIt, ForwardIt> findFirstOf(InputIt first, InputIt last, - ForwardIt sFirst, - ForwardIt sLast, Pred pred) + ForwardIt sFirst, + ForwardIt sLast, Pred pred) { for (; first != last; ++first) for (auto it = sFirst; it != sLast; ++it) @@ -156,7 +156,7 @@ inline ImplPtr<ImplType> makeImpl(ArgTs&&... args) } template <typename ImplType> -const inline ImplPtr<ImplType> ZeroImpl() +constexpr ImplPtr<ImplType> ZeroImpl() { return { nullptr, [](ImplType*) { /* nullptr doesn't need deletion */ } }; } |