From 5a63f8a18645d612decdcc853335df0682c41d03 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Sat, 18 Jun 2022 21:29:27 +0200
Subject: Drop make_array(); use std::to_array() where needed

make_array() has been introduced to cover for shortcomings on macOS and
Windows. These shortcomings are no more there, so we can just use the
standardrlibrary.
---
 lib/e2ee/e2ee.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/e2ee')

diff --git a/lib/e2ee/e2ee.h b/lib/e2ee/e2ee.h
index f97eb27a..1efd0f16 100644
--- a/lib/e2ee/e2ee.h
+++ b/lib/e2ee/e2ee.h
@@ -37,8 +37,9 @@ constexpr auto MegolmV1AesSha2AlgoKey = "m.megolm.v1.aes-sha2"_ls;
 
 inline bool isSupportedAlgorithm(const QString& algorithm)
 {
-    static constexpr auto SupportedAlgorithms =
-        make_array(OlmV1Curve25519AesSha2AlgoKey, MegolmV1AesSha2AlgoKey);
+    static constexpr std::array SupportedAlgorithms {
+        OlmV1Curve25519AesSha2AlgoKey, MegolmV1AesSha2AlgoKey
+    };
     return std::find(SupportedAlgorithms.cbegin(), SupportedAlgorithms.cend(),
                      algorithm)
            != SupportedAlgorithms.cend();
-- 
cgit v1.2.3