diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2020-12-28 19:42:08 +0100 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2020-12-28 19:42:08 +0100 |
| commit | 0bafa198fb08c8545a026a8806b47cf95bdc8272 (patch) | |
| tree | 297bdb5cd4767a653c1c17d962dc6c10ce76e0d9 /lib | |
| parent | a49c3f2eb4e1aa5c6687c7637c1a06fcd69b0a23 (diff) | |
| parent | 0f974c0f96f29035ee766e8913504fed4a4903a5 (diff) | |
| download | libquotient-0bafa198fb08c8545a026a8806b47cf95bdc8272.tar.gz libquotient-0bafa198fb08c8545a026a8806b47cf95bdc8272.zip | |
Merge branch 'kitsune-fix-msvc-build' into master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/connection.cpp | 2 | ||||
| -rw-r--r-- | lib/events/event.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/connection.cpp b/lib/connection.cpp index f59d2962..42b17570 100644 --- a/lib/connection.cpp +++ b/lib/connection.cpp @@ -451,7 +451,7 @@ void Connection::Private::completeSetup(const QString& mxId) #ifndef Quotient_E2EE_ENABLED qCWarning(E2EE) << "End-to-end encryption (E2EE) support is turned off."; #else // Quotient_E2EE_ENABLED - AccountSettings accountSettings(userId); + AccountSettings accountSettings(data->userId()); encryptionManager.reset( new EncryptionManager(accountSettings.encryptionAccountPickle())); if (accountSettings.encryptionAccountPickle().isEmpty()) { diff --git a/lib/events/event.h b/lib/events/event.h index 309ebddf..9f2f4f91 100644 --- a/lib/events/event.h +++ b/lib/events/event.h @@ -327,8 +327,9 @@ inline auto visit(const BaseEventT& event, FnT&& visitor) } namespace _impl { + // Using bool instead of auto below because auto apparently upsets MSVC template <class BaseT, typename FnT> - inline constexpr auto needs_downcast = + inline constexpr bool needs_downcast = std::is_base_of_v<BaseT, std::decay_t<fn_arg_t<FnT>>> && !std::is_same_v<BaseT, std::decay_t<fn_arg_t<FnT>>>; } |