Fix gcc10 compat

v0.11.2-next
Nicolas Werner 2 years ago
parent 920409e914
commit e9f4298418
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
  1. 2
      scripts/emoji_codegen.py
  2. 2
      src/emoji/Provider.cpp

@ -15,7 +15,7 @@ class Emoji(object):
def generate_qml_list(**kwargs): def generate_qml_list(**kwargs):
entrycount = sum([len(c[1]) for c in kwargs.items()]) entrycount = sum([len(c[1]) for c in kwargs.items()])
tmpl = Template(''' tmpl = Template('''
constexpr std::array<Emoji, {{ entrycount }} > emoji::Provider::emoji = { constexpr const std::array<Emoji, {{ entrycount }} > emoji::Provider::emoji = {
{%- for c in kwargs.items() %} {%- for c in kwargs.items() %}
// {{ c[0].capitalize() }} // {{ c[0].capitalize() }}
{%- for e in c[1] %} {%- for e in c[1] %}

@ -16,7 +16,7 @@ null_literal(const char16_t (&lit)[N])
return std::u16string_view(lit, N); return std::u16string_view(lit, N);
} }
constexpr std::array<Emoji, 3681> emoji::Provider::emoji = { constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
// People // People
Emoji{null_literal(u"\U0001F600"), Emoji{null_literal(u"\U0001F600"),
null_literal(u"grinning"), null_literal(u"grinning"),

Loading…
Cancel
Save