From 65bac9c027828a27c0e2fd9c2f6ace00ad5b8df2 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Fri, 18 Aug 2017 08:15:18 +0700 Subject: [PATCH] Respecify EnumDescs array sizes manually to workaround clang-3.6 bug --- src/buffer.hh | 4 ++-- src/client.hh | 2 +- src/input_handler.hh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/buffer.hh b/src/buffer.hh index 4fa42d56..41b29b77 100644 --- a/src/buffer.hh +++ b/src/buffer.hh @@ -23,7 +23,7 @@ enum class EolFormat constexpr auto enum_desc(Meta::Type) { - return make_array>({ + return make_array, 2>({ { EolFormat::Lf, "lf" }, { EolFormat::Crlf, "crlf" }, }); @@ -37,7 +37,7 @@ enum class ByteOrderMark constexpr auto enum_desc(Meta::Type) { - return make_array>({ + return make_array, 2>({ { ByteOrderMark::None, "none" }, { ByteOrderMark::Utf8, "utf8" }, }); diff --git a/src/client.hh b/src/client.hh index f65208e5..daf8aa02 100644 --- a/src/client.hh +++ b/src/client.hh @@ -133,7 +133,7 @@ enum class Autoreload constexpr auto enum_desc(Meta::Type) { - return make_array>({ + return make_array, 5>({ { Autoreload::Yes, "yes" }, { Autoreload::No, "no" }, { Autoreload::Ask, "ask" }, diff --git a/src/input_handler.hh b/src/input_handler.hh index 71d93220..e4cad6d0 100644 --- a/src/input_handler.hh +++ b/src/input_handler.hh @@ -138,7 +138,7 @@ constexpr bool with_bit_ops(Meta::Type) { return true; } constexpr auto enum_desc(Meta::Type) { - return make_array>({ + return make_array, 3>({ { AutoInfo::Command, "command"}, { AutoInfo::OnKey, "onkey"}, { AutoInfo::Normal, "normal" }