From 408785f0680a531c493de225fad60b6369227cfb Mon Sep 17 00:00:00 2001 From: Alexey Rusakov Date: Sat, 23 Apr 2022 19:47:14 +0200 Subject: Cleanup --- lib/mxcreply.cpp | 1 - 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 #include "accountregistry.h" -#include "connection.h" #include "room.h" #ifdef Quotient_E2EE_ENABLED diff --git a/lib/util.h b/lib/util.h index b14e1648..3910059b 100644 --- a/lib/util.h +++ b/lib/util.h @@ -109,8 +109,8 @@ private: */ template inline std::pair 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 makeImpl(ArgTs&&... args) } template -const inline ImplPtr ZeroImpl() +constexpr ImplPtr ZeroImpl() { return { nullptr, [](ImplType*) { /* nullptr doesn't need deletion */ } }; } -- cgit v1.2.3