Work around new V[K] AA initialisation FTBFS with old compilers

Partially reverts fc06743.
zorael · Dec 17, 2023 · d98204d · d98204d
1 parent 37d9e2c
commit d98204d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/source/kameloso/plugins/counter.d b/source/kameloso/plugins/counter.d
@@ -812,8 +812,10 @@ void loadCounters(CounterPlugin plugin)
     foreach (immutable channelName, channelCountersJSON; json.object)
     {
         // Initialise the AA
-        plugin.counters[channelName] = new Counter[string];
+        //plugin.counters[channelName] = new Counter[string];  // fails with older compilers
+        plugin.counters[channelName][string.init] = Counter.init;
         auto channelCounters = channelName in plugin.counters;
+        (*channelCounters).remove(string.init);
 
         foreach (immutable word, counterJSON; channelCountersJSON.object)
         {

diff --git a/source/kameloso/plugins/oneliner.d b/source/kameloso/plugins/oneliner.d
@@ -980,8 +980,10 @@ void loadOneliners(OnelinerPlugin plugin)
     foreach (immutable channelName, const channelOnelinersJSON; allOnelinersJSON.object)
     {
         // Initialise the AA
-        plugin.onelinersByChannel[channelName] = new Oneliner[string];
+        //plugin.onelinersByChannel[channelName] = new Oneliner[string];  // fails with older compilers
+        plugin.onelinersByChannel[channelName][string.init] = Oneliner.init;
         auto channelOneliners = channelName in plugin.onelinersByChannel;
+        (*channelOneliners).remove(string.init);
 
         foreach (immutable trigger, const onelinerJSON; channelOnelinersJSON.object)
         {

diff --git a/source/kameloso/plugins/twitch/base.d b/source/kameloso/plugins/twitch/base.d
@@ -2683,8 +2683,10 @@ in (((channelName.length && idString.length) ||
         if (!customEmotes)
         {
             // Initialise it
-            plugin.customEmotesByChannel[channelName] = new bool[dstring];
+            //plugin.customEmotesByChannel[channelName] = new bool[dstring];  // fails with older compilers
+            plugin.customEmotesByChannel[channelName][dstring.init] = false;
             customEmotes = channelName in plugin.customEmotesByChannel;
+            (*customEmotes).remove(dstring.init);
         }
 
         emoteImports =