1 files changed, 7 insertions, 20 deletions
diff --git a/lib/quotient_common.h b/lib/quotient_common.h
index 8bcd5ca6..136e9f79 100644
--- a/lib/quotient_common.h
+++ b/lib/quotient_common.h
@@ -41,7 +41,6 @@
     Q_ENUM_NS_IMPL(Enum)                  \
     Q_FLAG_NS(Flags)
 
-// Apple Clang hasn't caught up with explicit(bool) yet
 #if __cpp_conditional_explicit >= 201806L
 #define QUO_IMPLICIT explicit(false)
 #else
@@ -54,19 +53,6 @@
 namespace Quotient {
 Q_NAMESPACE_EXPORT(QUOTIENT_API)
 
-// std::array {} needs explicit template parameters on macOS because
-// Apple stdlib doesn't have deduction guides for std::array. C++20 has
-// to_array() but that can't be borrowed, this time because of MSVC:
-// https://developercommunity.visualstudio.com/t/vc-ice-p1-initc-line-3652-from-stdto-array/1464038
-// Therefore a simpler (but also slightly more wobbly - it resolves the element
-// type using std::common_type<>) make_array facility is implemented here.
-template <typename... Ts>
-constexpr auto make_array(Ts&&... items)
-{
-    return std::array<std::common_type_t<Ts...>, sizeof...(items)>(
-        { std::forward<Ts>(items)... });
-}
-
 // TODO: code like this should be generated from the CS API definition
 
 //! \brief Membership states
@@ -87,9 +73,10 @@ enum class Membership : unsigned int {
 };
 QUO_DECLARE_FLAGS_NS(MembershipMask, Membership)
 
-constexpr auto MembershipStrings = make_array(
-    // The order MUST be the same as the order in the original enum
-    "join", "leave", "invite", "knock", "ban");
+constexpr std::array MembershipStrings {
+    // The order MUST be the same as the order in the Membership enum
+    "join", "leave", "invite", "knock", "ban"
+};
 
 //! \brief Local user join-state names
 //!
@@ -105,10 +92,10 @@ enum class JoinState : std::underlying_type_t<Membership> {
 };
 QUO_DECLARE_FLAGS_NS(JoinStates, JoinState)
 
-[[maybe_unused]] constexpr auto JoinStateStrings = make_array(
+[[maybe_unused]] constexpr std::array JoinStateStrings {
     MembershipStrings[0], MembershipStrings[1], MembershipStrings[2],
     MembershipStrings[3] /* same as MembershipStrings, sans "ban" */
-);
+};
 
 //! \brief Network job running policy flags
 //!
@@ -135,7 +122,7 @@ enum RoomType {
 };
 Q_ENUM_NS(RoomType)
 
-[[maybe_unused]] constexpr auto RoomTypeStrings = make_array("m.space");
+[[maybe_unused]] constexpr std::array RoomTypeStrings { "m.space" };
 
 } // namespace Quotient
 Q_DECLARE_OPERATORS_FOR_FLAGS(Quotient::MembershipMask)