diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-10-15 15:36:14 +0200 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-10-15 15:36:14 +0200 |
| commit | 4aa8eb029737f536a6ad3b1e3eaf296a68a3b926 (patch) | |
| tree | 984a8bbeaae983ed34da27ff7e6160ededf9c95c | |
| parent | c2b84e41fba24f32270c24c0a6f679a1c4de0eea (diff) | |
| download | libquotient-4aa8eb029737f536a6ad3b1e3eaf296a68a3b926.tar.gz libquotient-4aa8eb029737f536a6ad3b1e3eaf296a68a3b926.zip | |
Fixed building with clang+libcpp (used on OS X)
libcpp has pessimistic definition of array that only engages constexpr in C++14 mode and newer; so one cannot use std::array<> in constexpr code.
| -rw-r--r-- | joinstate.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/joinstate.h b/joinstate.h index cfdb90f2..d6c374d2 100644 --- a/joinstate.h +++ b/joinstate.h @@ -31,10 +31,10 @@ namespace QMatrixClient // We cannot use REGISTER_ENUM outside of a Q_OBJECT and besides, we want // to use strings that match respective JSON keys. - static constexpr std::array<const char*, 3> JoinStateStrings + static const std::array<const char*, 3> JoinStateStrings { { "join", "invite", "leave" } }; - inline constexpr const char* toCString(JoinState js) + inline const char* toCString(JoinState js) { return JoinStateStrings[size_t(js)]; } |