From d2e9486f2d12c09b4951458a45b20321e4b85a92 Mon Sep 17 00:00:00 2001 From: Jimmy Thrasher Date: Wed, 2 Apr 2014 20:19:49 -0400 Subject: [PATCH] Fix some more constexpr issues for clang --- src/keys.cc | 2 +- src/normal.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/keys.cc b/src/keys.cc index cecf9634..e3b2f111 100644 --- a/src/keys.cc +++ b/src/keys.cc @@ -17,7 +17,7 @@ Key canonicalize_ifn(Key key) } using KeyAndName = std::pair; -static constexpr KeyAndName keynamemap[] = { +static const KeyAndName keynamemap[] = { { "ret", '\r' }, { "space", ' ' }, { "tab", '\t' }, diff --git a/src/normal.cc b/src/normal.cc index 73346a75..b0794e8f 100644 --- a/src/normal.cc +++ b/src/normal.cc @@ -864,7 +864,7 @@ void select_object(Context& context, int param) return select(context, std::bind(sel.func, _1, _2, flags)); } - static constexpr struct + static const struct { CodepointPair pair; Codepoint name;