From 6d7485fd0dd63000abb3a6cabdb56697684caef3 Mon Sep 17 00:00:00 2001
From: reuk <reuk@users.noreply.github.com>
Date: Thu, 2 Nov 2023 12:01:52 +0000
Subject: [PATCH] juce_midi_ci: Improve MinGW compatibility

---
 examples/Audio/CapabilityInquiryDemo.h                      | 2 +-
 modules/juce_midi_ci/ci/juce_CIEncodings.cpp                | 2 +-
 modules/juce_midi_ci/ci/juce_CIMessages.h                   | 6 +++---
 .../detail/juce_CIPropertyDataMessageChunker.cpp            | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/examples/Audio/CapabilityInquiryDemo.h b/examples/Audio/CapabilityInquiryDemo.h
index 198e8e1030..46ed2e3a3d 100644
--- a/examples/Audio/CapabilityInquiryDemo.h
+++ b/examples/Audio/CapabilityInquiryDemo.h
@@ -1634,7 +1634,7 @@ private:
         const auto channelIndex = address.getChannel() != ci::ChannelInGroup::wholeGroup
                                 ? (size_t) address.getChannel()
                                 : 16;
-        const auto buttonIndex = address.getGroup() * numChannelColumns + channelIndex;
+        const auto buttonIndex = (size_t) address.getGroup() * numChannelColumns + channelIndex;
         return buttons[buttonIndex];
     }
 
diff --git a/modules/juce_midi_ci/ci/juce_CIEncodings.cpp b/modules/juce_midi_ci/ci/juce_CIEncodings.cpp
index 14134f98a2..eaec997602 100644
--- a/modules/juce_midi_ci/ci/juce_CIEncodings.cpp
+++ b/modules/juce_midi_ci/ci/juce_CIEncodings.cpp
@@ -250,7 +250,7 @@ std::vector<std::byte> Encodings::decode (Span<const std::byte> bytes, Encoding
                 return {};
             }
 
-            result.resize (previousSize + (size_t) read);
+            result.resize ((size_t) read + previousSize);
 
             if (read == 0)
                 return result;
diff --git a/modules/juce_midi_ci/ci/juce_CIMessages.h b/modules/juce_midi_ci/ci/juce_CIMessages.h
index 9980e23ec3..2a382ae8bc 100644
--- a/modules/juce_midi_ci/ci/juce_CIMessages.h
+++ b/modules/juce_midi_ci/ci/juce_CIMessages.h
@@ -316,7 +316,7 @@ namespace Message
     {
         auto tie() const
         {
-            return std::tuple();
+            return std::tuple<>();
         }
 
         bool operator== (const ProfileInquiry& x) const { return tie() == x.tie(); }
@@ -655,7 +655,7 @@ namespace Message
     {
         auto tie() const
         {
-            return std::tuple();
+            return std::tuple<>();
         }
 
         bool operator== (const ProcessInquiry& x) const { return tie() == x.tie(); }
@@ -710,7 +710,7 @@ namespace Message
     {
         auto tie() const
         {
-            return std::tuple();
+            return std::tuple<>();
         }
 
         bool operator== (const ProcessEndMidiMessageReport& x) const { return tie() == x.tie(); }
diff --git a/modules/juce_midi_ci/detail/juce_CIPropertyDataMessageChunker.cpp b/modules/juce_midi_ci/detail/juce_CIPropertyDataMessageChunker.cpp
index 35f1775011..c5cd6128f6 100644
--- a/modules/juce_midi_ci/detail/juce_CIPropertyDataMessageChunker.cpp
+++ b/modules/juce_midi_ci/detail/juce_CIPropertyDataMessageChunker.cpp
@@ -146,7 +146,8 @@ void PropertyDataMessageChunker::populateStorage() const
     std::rotate (storage->begin(), storage->begin() + getRoomForBody(), storage->end());
 
     // ...and bring the storage buffer down to size, if we didn't manage to fill it
-    storage->resize (storage->size() + numBytesRead - (size_t) getRoomForBody());
+    const auto room = (size_t) getRoomForBody();
+    storage->resize (storage->size() + numBytesRead - room);
 }
 
 } // namespace juce::midi_ci::detail