Build - compile on Windows and i686 again, and read the sources as UTF-8 under Debian's C locale

Author: samaaron

app/api/include/api/audio/node_tree_order.hpp

@@ -14,6 +14,7 @@
 #ifndef SONIC_PI_NODE_TREE_ORDER_HPP
 #define SONIC_PI_NODE_TREE_ORDER_HPP
 
+#include <cstddef>
 #include <cstdint>
 #include <unordered_map>
 #include <unordered_set>
@@ -63,9 +64,9 @@ inline OrderedTree order_children(const std::vector<OrderNode>& nodes)
 {
     OrderedTree out;
 
-    std::unordered_map<int32_t, size_t> index; // id -> position in `nodes`
+    std::unordered_map<int32_t, std::size_t> index; // id -> position in `nodes`
     index.reserve(nodes.size() * 2);
-    for (size_t i = 0; i < nodes.size(); ++i)
+    for (std::size_t i = 0; i < nodes.size(); ++i)
         index[nodes[i].id] = i;
 
     std::unordered_set<int32_t> placed;
@@ -77,7 +78,7 @@ inline OrderedTree order_children(const std::vector<OrderNode>& nodes)
         if (!n.is_group)
             continue;
         int32_t childId = n.head;
-        for (size_t guard = 0;
+        for (std::size_t guard = 0;
              childId >= 0 && index.count(childId) && guard <= nodes.size();
              ++guard)
         {

app/gui/platform/recorder_audio_mix.h

@@ -30,7 +30,7 @@ constexpr uint32_t kRecordedChannelsMax = 2;
 
 inline uint32_t recordedChannels(uint32_t tapChannels)
 {
-    return std::min(tapChannels, kRecordedChannelsMax);
+    return (std::min)(tapChannels, kRecordedChannelsMax);   // parenthesised: windows.h's min macro
 }
 
 // Copies the recorded channels of `frames` interleaved tap frames into `out`

app/server/ruby/test/test_engine_forwards.rb

@@ -25,12 +25,18 @@ class EngineForwardsTester < Minitest::Test
     OSC_HANDLER = File.join(ROOT, "app/api/src/osc/osc_handler.cpp")
     SPIDER      = File.join(ROOT, "app/server/ruby/bin/spider-server.rb")
 
+    # The sources are UTF-8 whatever the locale says: Debian's build runs
+    # under C, where a plain read stops at the first non-ASCII byte.
+    def source(path)
+      File.read(path, encoding: "UTF-8")
+    end
+
     def gui_handled
-      File.read(OSC_HANDLER).scan(%r{match\("(/clockwork/[^"]+)"\)}).flatten.uniq
+      source(OSC_HANDLER).scan(%r{match\("(/clockwork/[^"]+)"\)}).flatten.uniq
     end
 
     def sent_to_gui_by_spider
-      File.read(SPIDER).scan(%r{gui\.send\("(/clockwork/[^"]+)"}).flatten.uniq
+      source(SPIDER).scan(%r{gui\.send\("(/clockwork/[^"]+)"}).flatten.uniq
     end
 
     def test_the_gui_handlers_are_found
@@ -67,7 +73,7 @@ def test_the_gui_never_asks_the_engine_directly_what_the_daemon_relays
       sources = Dir[File.join(ROOT, "app/gui/**/*.{cpp,h}")] +
                 Dir[File.join(ROOT, "app/api/src/**/*.{cpp,h}")]
       direct = GUI_TO_ENGINE_REQUESTS.values.flat_map do |request|
-        sources.select { |f| File.read(f).include?("\"#{request}\"") }
+        sources.select { |f| source(f).include?("\"#{request}\"") }
                .map { |f| "#{request} in #{f.delete_prefix(ROOT + '/')}" }
       end
       assert_empty direct, "answers to these are discarded: ask through the daemon"
@@ -85,7 +91,7 @@ def test_the_gui_hears_every_setup
     end
 
     def test_the_daemon_forwards_every_setup_unfiltered
-      daemon = File.read(File.join(__dir__, "../bin/daemon.rb"))
+      daemon = source(File.join(__dir__, "../bin/daemon.rb"))
       refute_match(/SetupGenerations|rebuild\?/, daemon)
     end
   end