Fix gcc10 again. Remove this once we stop supporting gcc10

src/emoji/Provider.cpp

@@ -16,7 +16,14 @@ null_literal(const char16_t (&lit)[N])
     return std::u16string_view(lit, N);
 }
 
-constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
+// GCC10 seems to remove the array otherwise, but later versions don't
+#if (defined(__GNUC__) && !defined(__clang__)) && __GNUC__ < 11
+constinit const
+#else
+constexpr
+#endif
+  std::array<Emoji, 3681>
+    emoji::Provider::emoji = {
       // People
       Emoji{null_literal(u"\U0001F600"),
             null_literal(u"grinning"),
@@ -8146,7 +8153,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"woman_and_man_holding_hands_medium_light_skin_tone_medium_skin_tone"),
             null_literal(u"woman and man holding hands: medium-light skin tone, medium skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(u"\U0001F469\U0001F3FC\U0000200D\U0001F91D\U0000200D\U0001F468\U0001F3FE"),
+      Emoji{
+        null_literal(u"\U0001F469\U0001F3FC\U0000200D\U0001F91D\U0000200D\U0001F468\U0001F3FE"),
         null_literal(u"woman_and_man_holding_hands_medium_light_skin_tone_medium_dark_skin_tone"),
         null_literal(u"woman and man holding hands: medium-light skin tone, medium-dark skin tone"),
         emoji::Emoji::Category::People},
@@ -8178,7 +8186,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"woman_and_man_holding_hands_medium_dark_skin_tone_light_skin_tone"),
             null_literal(u"woman and man holding hands: medium-dark skin tone, light skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(u"\U0001F469\U0001F3FE\U0000200D\U0001F91D\U0000200D\U0001F468\U0001F3FC"),
+      Emoji{
+        null_literal(u"\U0001F469\U0001F3FE\U0000200D\U0001F91D\U0000200D\U0001F468\U0001F3FC"),
         null_literal(u"woman_and_man_holding_hands_medium_dark_skin_tone_medium_light_skin_tone"),
         null_literal(u"woman and man holding hands: medium-dark skin tone, medium-light skin tone"),
         emoji::Emoji::Category::People},
@@ -8856,7 +8865,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"couple_with_heart_dark_skin_tone"),
             null_literal(u"couple with heart: dark skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F9D1\U0001F3FB\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F9D1\U0001F3FC"),
         null_literal(u"couple_with_heart_person_person_light_skin_tone_medium_light_skin_tone"),
         null_literal(u"couple with heart: person, person, light skin tone, medium-light skin tone"),
@@ -8866,7 +8876,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"couple_with_heart_person_person_light_skin_tone_medium_skin_tone"),
             null_literal(u"couple with heart: person, person, light skin tone, medium skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F9D1\U0001F3FB\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F9D1\U0001F3FE"),
         null_literal(u"couple_with_heart_person_person_light_skin_tone_medium_dark_skin_tone"),
         null_literal(u"couple with heart: person, person, light skin tone, medium-dark skin tone"),
@@ -8876,7 +8887,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"couple_with_heart_person_person_light_skin_tone_dark_skin_tone"),
             null_literal(u"couple with heart: person, person, light skin tone, dark skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F9D1\U0001F3FC\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F9D1\U0001F3FB"),
         null_literal(u"couple_with_heart_person_person_medium_light_skin_tone_light_skin_tone"),
         null_literal(u"couple with heart: person, person, medium-light skin tone, light skin tone"),
@@ -8885,16 +8897,18 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
         null_literal(
           u"\U0001F9D1\U0001F3FC\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F9D1\U0001F3FD"),
         null_literal(u"couple_with_heart_person_person_medium_light_skin_tone_medium_skin_tone"),
-    null_literal(u"couple with heart: person, person, medium-light skin tone, medium skin tone"),
-    emoji::Emoji::Category::People},
-  Emoji{
         null_literal(
+          u"couple with heart: person, person, medium-light skin tone, medium skin tone"),
+        emoji::Emoji::Category::People},
+      Emoji{null_literal(
               u"\U0001F9D1\U0001F3FC\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F9D1\U0001F3FE"),
-    null_literal(u"couple_with_heart_person_person_medium_light_skin_tone_medium_dark_skin_tone"),
+            null_literal(
+              u"couple_with_heart_person_person_medium_light_skin_tone_medium_dark_skin_tone"),
             null_literal(
               u"couple with heart: person, person, medium-light skin tone, medium-dark skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F9D1\U0001F3FC\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F9D1\U0001F3FF"),
         null_literal(u"couple_with_heart_person_person_medium_light_skin_tone_dark_skin_tone"),
         null_literal(u"couple with heart: person, person, medium-light skin tone, dark skin tone"),
@@ -8908,9 +8922,11 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
         null_literal(
           u"\U0001F9D1\U0001F3FD\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F9D1\U0001F3FC"),
         null_literal(u"couple_with_heart_person_person_medium_skin_tone_medium_light_skin_tone"),
-    null_literal(u"couple with heart: person, person, medium skin tone, medium-light skin tone"),
+        null_literal(
+          u"couple with heart: person, person, medium skin tone, medium-light skin tone"),
         emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F9D1\U0001F3FD\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F9D1\U0001F3FE"),
         null_literal(u"couple_with_heart_person_person_medium_skin_tone_medium_dark_skin_tone"),
         null_literal(u"couple with heart: person, person, medium skin tone, medium-dark skin tone"),
@@ -8920,24 +8936,27 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"couple_with_heart_person_person_medium_skin_tone_dark_skin_tone"),
             null_literal(u"couple with heart: person, person, medium skin tone, dark skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F9D1\U0001F3FE\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F9D1\U0001F3FB"),
         null_literal(u"couple_with_heart_person_person_medium_dark_skin_tone_light_skin_tone"),
         null_literal(u"couple with heart: person, person, medium-dark skin tone, light skin tone"),
         emoji::Emoji::Category::People},
-  Emoji{
+      Emoji{null_literal(
-    null_literal(
               u"\U0001F9D1\U0001F3FE\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F9D1\U0001F3FC"),
-    null_literal(u"couple_with_heart_person_person_medium_dark_skin_tone_medium_light_skin_tone"),
+            null_literal(
+              u"couple_with_heart_person_person_medium_dark_skin_tone_medium_light_skin_tone"),
             null_literal(
               u"couple with heart: person, person, medium-dark skin tone, medium-light skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F9D1\U0001F3FE\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F9D1\U0001F3FD"),
         null_literal(u"couple_with_heart_person_person_medium_dark_skin_tone_medium_skin_tone"),
         null_literal(u"couple with heart: person, person, medium-dark skin tone, medium skin tone"),
         emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F9D1\U0001F3FE\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F9D1\U0001F3FF"),
         null_literal(u"couple_with_heart_person_person_medium_dark_skin_tone_dark_skin_tone"),
         null_literal(u"couple with heart: person, person, medium-dark skin tone, dark skin tone"),
@@ -8947,7 +8966,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"couple_with_heart_person_person_dark_skin_tone_light_skin_tone"),
             null_literal(u"couple with heart: person, person, dark skin tone, light skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F9D1\U0001F3FF\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F9D1\U0001F3FC"),
         null_literal(u"couple_with_heart_person_person_dark_skin_tone_medium_light_skin_tone"),
         null_literal(u"couple with heart: person, person, dark skin tone, medium-light skin tone"),
@@ -8957,7 +8977,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"couple_with_heart_person_person_dark_skin_tone_medium_skin_tone"),
             null_literal(u"couple with heart: person, person, dark skin tone, medium skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F9D1\U0001F3FF\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F9D1\U0001F3FE"),
         null_literal(u"couple_with_heart_person_person_dark_skin_tone_medium_dark_skin_tone"),
         null_literal(u"couple with heart: person, person, dark skin tone, medium-dark skin tone"),
@@ -9001,7 +9022,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"couple_with_heart_woman_man_medium_light_skin_tone"),
             null_literal(u"couple with heart: woman, man, medium-light skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F469\U0001F3FC\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F468\U0001F3FD"),
         null_literal(u"couple_with_heart_woman_man_medium_light_skin_tone_medium_skin_tone"),
         null_literal(u"couple with heart: woman, man, medium-light skin tone, medium skin tone"),
@@ -9010,7 +9032,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
         null_literal(
           u"\U0001F469\U0001F3FC\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F468\U0001F3FE"),
         null_literal(u"couple_with_heart_woman_man_medium_light_skin_tone_medium_dark_skin_tone"),
-    null_literal(u"couple with heart: woman, man, medium-light skin tone, medium-dark skin tone"),
+        null_literal(
+          u"couple with heart: woman, man, medium-light skin tone, medium-dark skin tone"),
         emoji::Emoji::Category::People},
       Emoji{null_literal(
               u"\U0001F469\U0001F3FC\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F468\U0001F3FF"),
@@ -9022,7 +9045,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"couple_with_heart_woman_man_medium_skin_tone_light_skin_tone"),
             null_literal(u"couple with heart: woman, man, medium skin tone, light skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F469\U0001F3FD\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F468\U0001F3FC"),
         null_literal(u"couple_with_heart_woman_man_medium_skin_tone_medium_light_skin_tone"),
         null_literal(u"couple with heart: woman, man, medium skin tone, medium-light skin tone"),
@@ -9051,7 +9075,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
         null_literal(
           u"\U0001F469\U0001F3FE\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F468\U0001F3FC"),
         null_literal(u"couple_with_heart_woman_man_medium_dark_skin_tone_medium_light_skin_tone"),
-    null_literal(u"couple with heart: woman, man, medium-dark skin tone, medium-light skin tone"),
+        null_literal(
+          u"couple with heart: woman, man, medium-dark skin tone, medium-light skin tone"),
         emoji::Emoji::Category::People},
       Emoji{null_literal(
               u"\U0001F469\U0001F3FE\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F468\U0001F3FD"),
@@ -9137,7 +9162,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"couple_with_heart_man_man_medium_light_skin_tone_medium_skin_tone"),
             null_literal(u"couple with heart: man, man, medium-light skin tone, medium skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F468\U0001F3FC\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F468\U0001F3FE"),
         null_literal(u"couple_with_heart_man_man_medium_light_skin_tone_medium_dark_skin_tone"),
         null_literal(u"couple with heart: man, man, medium-light skin tone, medium-dark skin tone"),
@@ -9177,7 +9203,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"couple_with_heart_man_man_medium_dark_skin_tone_light_skin_tone"),
             null_literal(u"couple with heart: man, man, medium-dark skin tone, light skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F468\U0001F3FE\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F468\U0001F3FC"),
         null_literal(u"couple_with_heart_man_man_medium_dark_skin_tone_medium_light_skin_tone"),
         null_literal(u"couple with heart: man, man, medium-dark skin tone, medium-light skin tone"),
@@ -9231,7 +9258,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"couple_with_heart_woman_woman_light_skin_tone"),
             null_literal(u"couple with heart: woman, woman, light skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F469\U0001F3FB\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F469\U0001F3FC"),
         null_literal(u"couple_with_heart_woman_woman_light_skin_tone_medium_light_skin_tone"),
         null_literal(u"couple with heart: woman, woman, light skin tone, medium-light skin tone"),
@@ -9241,7 +9269,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"couple_with_heart_woman_woman_light_skin_tone_medium_skin_tone"),
             null_literal(u"couple with heart: woman, woman, light skin tone, medium skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F469\U0001F3FB\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F469\U0001F3FE"),
         null_literal(u"couple_with_heart_woman_woman_light_skin_tone_medium_dark_skin_tone"),
         null_literal(u"couple with heart: woman, woman, light skin tone, medium-dark skin tone"),
@@ -9251,7 +9280,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"couple_with_heart_woman_woman_light_skin_tone_dark_skin_tone"),
             null_literal(u"couple with heart: woman, woman, light skin tone, dark skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F469\U0001F3FC\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F469\U0001F3FB"),
         null_literal(u"couple_with_heart_woman_woman_medium_light_skin_tone_light_skin_tone"),
         null_literal(u"couple with heart: woman, woman, medium-light skin tone, light skin tone"),
@@ -9261,7 +9291,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"couple_with_heart_woman_woman_medium_light_skin_tone"),
             null_literal(u"couple with heart: woman, woman, medium-light skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F469\U0001F3FC\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F469\U0001F3FD"),
         null_literal(u"couple_with_heart_woman_woman_medium_light_skin_tone_medium_skin_tone"),
         null_literal(u"couple with heart: woman, woman, medium-light skin tone, medium skin tone"),
@@ -9270,9 +9301,11 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
         null_literal(
           u"\U0001F469\U0001F3FC\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F469\U0001F3FE"),
         null_literal(u"couple_with_heart_woman_woman_medium_light_skin_tone_medium_dark_skin_tone"),
-    null_literal(u"couple with heart: woman, woman, medium-light skin tone, medium-dark skin tone"),
+        null_literal(
+          u"couple with heart: woman, woman, medium-light skin tone, medium-dark skin tone"),
         emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F469\U0001F3FC\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F469\U0001F3FF"),
         null_literal(u"couple_with_heart_woman_woman_medium_light_skin_tone_dark_skin_tone"),
         null_literal(u"couple with heart: woman, woman, medium-light skin tone, dark skin tone"),
@@ -9282,7 +9315,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"couple_with_heart_woman_woman_medium_skin_tone_light_skin_tone"),
             null_literal(u"couple with heart: woman, woman, medium skin tone, light skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F469\U0001F3FD\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F469\U0001F3FC"),
         null_literal(u"couple_with_heart_woman_woman_medium_skin_tone_medium_light_skin_tone"),
         null_literal(u"couple with heart: woman, woman, medium skin tone, medium-light skin tone"),
@@ -9292,7 +9326,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"couple_with_heart_woman_woman_medium_skin_tone"),
             null_literal(u"couple with heart: woman, woman, medium skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F469\U0001F3FD\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F469\U0001F3FE"),
         null_literal(u"couple_with_heart_woman_woman_medium_skin_tone_medium_dark_skin_tone"),
         null_literal(u"couple with heart: woman, woman, medium skin tone, medium-dark skin tone"),
@@ -9302,7 +9337,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"couple_with_heart_woman_woman_medium_skin_tone_dark_skin_tone"),
             null_literal(u"couple with heart: woman, woman, medium skin tone, dark skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F469\U0001F3FE\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F469\U0001F3FB"),
         null_literal(u"couple_with_heart_woman_woman_medium_dark_skin_tone_light_skin_tone"),
         null_literal(u"couple with heart: woman, woman, medium-dark skin tone, light skin tone"),
@@ -9311,9 +9347,11 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
         null_literal(
           u"\U0001F469\U0001F3FE\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F469\U0001F3FC"),
         null_literal(u"couple_with_heart_woman_woman_medium_dark_skin_tone_medium_light_skin_tone"),
-    null_literal(u"couple with heart: woman, woman, medium-dark skin tone, medium-light skin tone"),
+        null_literal(
+          u"couple with heart: woman, woman, medium-dark skin tone, medium-light skin tone"),
         emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F469\U0001F3FE\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F469\U0001F3FD"),
         null_literal(u"couple_with_heart_woman_woman_medium_dark_skin_tone_medium_skin_tone"),
         null_literal(u"couple with heart: woman, woman, medium-dark skin tone, medium skin tone"),
@@ -9333,7 +9371,8 @@ constexpr const std::array<Emoji, 3681> emoji::Provider::emoji = {
             null_literal(u"couple_with_heart_woman_woman_dark_skin_tone_light_skin_tone"),
             null_literal(u"couple with heart: woman, woman, dark skin tone, light skin tone"),
             emoji::Emoji::Category::People},
-  Emoji{null_literal(
+      Emoji{
+        null_literal(
           u"\U0001F469\U0001F3FF\U0000200D\U00002764\U0000FE0F\U0000200D\U0001F469\U0001F3FC"),
         null_literal(u"couple_with_heart_woman_woman_dark_skin_tone_medium_light_skin_tone"),
         null_literal(u"couple with heart: woman, woman, dark skin tone, medium-light skin tone"),