ESP32 3.0.0 compatibility

tttapa · Dec 24, 2023 · 806beca · 806beca
1 parent 77d04e3
commit 806beca
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 16 deletions.
diff --git a/src/AH/Containers/Array.hpp b/src/AH/Containers/Array.hpp
@@ -232,26 +232,26 @@ class ArraySlice {
 
 template <class T, size_t N>
 template <size_t Start, size_t End>
-inline ArraySlice<T, abs_diff(Start, End) + 1, (End < Start), false>
-Array<T, N>::slice() {
+auto Array<T, N>::slice()
+    -> ArraySlice<T, abs_diff(Start, End) + 1, (End < Start), false> {
     static_assert(Start < N, "");
     static_assert(End < N, "");
     return &(*this)[Start];
 }
 
 template <class T, size_t N>
 template <size_t Start, size_t End>
-inline ArraySlice<T, abs_diff(Start, End) + 1, (End < Start), true>
-Array<T, N>::slice() const {
+auto Array<T, N>::slice() const
+    -> ArraySlice<T, abs_diff(Start, End) + 1, (End < Start), true> {
     static_assert(Start < N, "");
     static_assert(End < N, "");
     return &(*this)[Start];
 }
 
 template <class T, size_t N, bool Reverse, bool Const>
 template <size_t Start, size_t End>
-ArraySlice<T, abs_diff(End, Start) + 1, Reverse ^ (End < Start), Const>
-ArraySlice<T, N, Reverse, Const>::slice() const {
+auto ArraySlice<T, N, Reverse, Const>::slice() const
+    -> ArraySlice<T, abs_diff(End, Start) + 1, Reverse ^ (End < Start), Const> {
     static_assert(Start < N, "");
     static_assert(End < N, "");
     return &(*this)[Start];

diff --git a/src/AH/Settings/Warnings.hpp b/src/AH/Settings/Warnings.hpp
@@ -7,7 +7,8 @@
 #define AH_DIAGNOSTIC_WERROR()                                                 \
     _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic error \"-Wall\"")   \
         _Pragma("GCC diagnostic error \"-Wextra\"")                            \
-            _Pragma("GCC diagnostic ignored \"-Wc++0x-compat\"")
+            _Pragma("GCC diagnostic ignored \"-Wc++0x-compat\"")               \
+                _Pragma("GCC diagnostic ignored \"-Wc++11-compat\"")
 #define AH_DIAGNOSTIC_POP() _Pragma("GCC diagnostic pop")
 #define AH_DIAGNOSTIC_EXTERNAL_HEADER()                                        \
     _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wall\"") \

diff --git a/src/MIDI_Inputs/MCU/VPotRing.hpp b/src/MIDI_Inputs/MCU/VPotRing.hpp
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <AH/Settings/Warnings.hpp>
+
+AH_DIAGNOSTIC_WERROR() // Enable errors on warnings
+
 #include <AH/STL/algorithm>
 #include <AH/Timing/MillisMicrosTimer.hpp>
 #include <MIDI_Inputs/InterfaceMIDIInputElements.hpp>
@@ -356,4 +360,6 @@ class VPotRing
 
 } // namespace MCU
 
-END_CS_NAMESPACE
+END_CS_NAMESPACE
+
+AH_DIAGNOSTIC_POP()
diff --git a/src/MIDI_Inputs/MCU/VU.hpp b/src/MIDI_Inputs/MCU/VU.hpp
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <AH/Settings/Warnings.hpp>
+
+AH_DIAGNOSTIC_WERROR()
+
 #include <AH/Timing/MillisMicrosTimer.hpp>
 #include <MIDI_Inputs/InterfaceMIDIInputElements.hpp>
 #include <MIDI_Inputs/MIDIInputElementMatchers.hpp>
@@ -413,4 +417,6 @@ class VU
 
 } // namespace MCU
 
-END_CS_NAMESPACE
+END_CS_NAMESPACE
+
+AH_DIAGNOSTIC_POP()
diff --git a/src/MIDI_Inputs/MIDIInputElement.hpp b/src/MIDI_Inputs/MIDIInputElement.hpp
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <AH/Settings/Warnings.hpp>
+
+AH_DIAGNOSTIC_WERROR() // Enable errors on warnings
+
 #include <Def/MIDIAddress.hpp>
 #include <MIDI_Parsers/MIDI_MessageTypes.hpp>
 
@@ -149,4 +153,6 @@ using MIDIInputElementPB = MIDIInputElement<MIDIMessageType::PitchBend>;
 /// MIDI Input Element that listens for MIDI System Exclusive messages.
 using MIDIInputElementSysEx = MIDIInputElement<MIDIMessageType::SysExStart>;
 
-END_CS_NAMESPACE
+END_CS_NAMESPACE
+
+AH_DIAGNOSTIC_POP()
diff --git a/src/MIDI_Inputs/NoteCCKPRange.hpp b/src/MIDI_Inputs/NoteCCKPRange.hpp
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <AH/Settings/Warnings.hpp>
+
+AH_DIAGNOSTIC_WERROR()
+
 #include "MIDIInputElementMatchers.hpp"
 
 BEGIN_CS_NAMESPACE
@@ -196,4 +200,6 @@ using KPRange = NoteCCKPRange<MIDIMessageType::KeyPressure, BankSize, RangeLen>;
 
 } // namespace Bankable
 
-END_CS_NAMESPACE
+END_CS_NAMESPACE
+
+AH_DIAGNOSTIC_POP()
diff --git a/src/MIDI_Inputs/NoteCCKPValue.hpp b/src/MIDI_Inputs/NoteCCKPValue.hpp
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <AH/Settings/Warnings.hpp>
+
+AH_DIAGNOSTIC_WERROR()
+
 #include "InterfaceMIDIInputElements.hpp"
 #include "MIDIInputElementMatchers.hpp"
 
@@ -157,4 +161,6 @@ using KPValue = NoteCCKPValue<MIDIMessageType::KeyPressure, BankSize>;
 
 } // namespace Bankable
 
-END_CS_NAMESPACE
+END_CS_NAMESPACE
+
+AH_DIAGNOSTIC_POP()
diff --git a/src/MIDI_Inputs/PBValue.hpp b/src/MIDI_Inputs/PBValue.hpp
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <AH/Settings/Warnings.hpp>
+
+AH_DIAGNOSTIC_WERROR()
+
 #include "InterfaceMIDIInputElements.hpp"
 #include "MIDIInputElementMatchers.hpp"
 
@@ -107,4 +111,6 @@ class PBValue
 
 } // namespace Bankable
 
-END_CS_NAMESPACE
+END_CS_NAMESPACE
+
+AH_DIAGNOSTIC_POP()
diff --git a/src/MIDI_Outputs/Abstract/MIDIChordButton.hpp b/src/MIDI_Outputs/Abstract/MIDIChordButton.hpp
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <AH/Settings/Warnings.hpp>
+
+AH_DIAGNOSTIC_WERROR() // Enable errors on warnings
+
 #include <AH/Hardware/Button.hpp>
 #include <AH/STL/memory> // std::unique_ptr
 #include <Def/Def.hpp>
@@ -89,4 +93,6 @@ class MIDIChordButton : public MIDIOutputElement {
     Sender sender;
 };
 
-END_CS_NAMESPACE
+END_CS_NAMESPACE
+
+AH_DIAGNOSTIC_POP()
diff --git a/src/MIDI_Outputs/Bankable/Abstract/MIDIChordButton.hpp b/src/MIDI_Outputs/Bankable/Abstract/MIDIChordButton.hpp
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <AH/Settings/Warnings.hpp>
+
+AH_DIAGNOSTIC_WERROR() // Enable errors on warnings
+
 #include <AH/Hardware/Button.hpp>
 #include <AH/STL/memory> // std::unique_ptr
 #include <Banks/BankAddresses.hpp>
@@ -89,4 +93,6 @@ class MIDIChordButton : public MIDIOutputElement {
 
 } // namespace Bankable
 
-END_CS_NAMESPACE
+END_CS_NAMESPACE
+
+AH_DIAGNOSTIC_POP()
diff --git a/src/Selectors/LEDs/SelectorLEDs.hpp b/src/Selectors/LEDs/SelectorLEDs.hpp
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <AH/Settings/Warnings.hpp>
+
+AH_DIAGNOSTIC_WERROR()
+
 #include <AH/Hardware/ExtendedInputOutput/ExtendedInputOutput.hpp>
 #include <Def/Def.hpp>
 #include <Selectors/Selector.hpp>
@@ -215,4 +219,6 @@ class SwitchSelectorLED
           } {}
 };
 
-END_CS_NAMESPACE
+END_CS_NAMESPACE
+
+AH_DIAGNOSTIC_POP()