Trying to fix Windows CI (#539)

* Trying to fix Windows CI * Triage * More triage * Even more triage * Trying to break things again * Still trying to break * closer * This should do it * One more time * More CI fixes
Chowdhury-DSP · Jun 18, 2024 · ec8a440 · ec8a440
1 parent 5a7b118
commit ec8a440
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -38,7 +38,7 @@ jobs:
             build_type: "Release"
           - name: "Test"
             os: windows-2022
-            build_type: "Release"
+            build_type: "Debug"
           - name: "Coverage"
             os: ubuntu-22.04
             cmake_args: "-DCODE_COVERAGE=ON -DCMAKE_BUILD_TYPE=Debug"

diff --git a/modules/common/chowdsp_data_structures/Allocators/chowdsp_STLArenaAllocator.h b/modules/common/chowdsp_data_structures/Allocators/chowdsp_STLArenaAllocator.h
@@ -28,7 +28,7 @@ struct STLArenaAllocator
 
     T* allocate (std::size_t n)
     {
-        return static_cast<T*> (arena.allocate_bytes (n, alignof (T)));
+        return static_cast<T*> (arena.allocate_bytes (n * sizeof (T), alignof (T)));
     }
 
     void deallocate (T*, std::size_t) const

diff --git a/modules/common/chowdsp_data_structures/Structures/chowdsp_AbstractTree.cpp b/modules/common/chowdsp_data_structures/Structures/chowdsp_AbstractTree.cpp
@@ -10,7 +10,7 @@ template <typename ElementType, typename DerivedType>
 AbstractTree<ElementType, DerivedType>::~AbstractTree()
 {
     doForAllNodes ([] (Node& node)
-                   { node.~Node(); });
+                   { node.leaf.reset(); });
 }
 
 template <typename ElementType, typename DerivedType>
@@ -108,7 +108,7 @@ void AbstractTree<ElementType, DerivedType>::removeNode (Node& node)
             node.parent->last_child = node.prev_sibling;
     }
 
-    node.~Node();
+    node.leaf.reset();
 }
 
 template <typename ElementType, typename DerivedType>
@@ -150,9 +150,10 @@ template <typename ElementType, typename DerivedType>
 void AbstractTree<ElementType, DerivedType>::clear()
 {
     doForAllNodes ([] (Node& node)
-                   { node.~Node(); });
+                   { node.leaf.reset(); });
     allocator.reset (64 * sizeof (Node));
     count = 0;
+    root_node = {};
 }
 
 template <typename ElementType, typename DerivedType>

diff --git a/modules/common/chowdsp_data_structures/Structures/chowdsp_EnumMap.h b/modules/common/chowdsp_data_structures/Structures/chowdsp_EnumMap.h
@@ -126,7 +126,7 @@ struct EnumMap
             {
                 ++index;
                 ++iter;
-            } while (! iter->has_value() && index < std::tuple_size_v<Storage>);
+            } while (index < std::tuple_size_v<Storage> && ! iter->has_value());
 
             if (index < std::tuple_size_v<Storage>)
                 key = magic_enum::enum_value<Key> (index);

diff --git a/tests/common_tests/chowdsp_data_structures_test/EnumMapTest.cpp b/tests/common_tests/chowdsp_data_structures_test/EnumMapTest.cpp
@@ -74,7 +74,7 @@ TEST_CASE ("Enum Map Test", "[common][data-structures]")
         };
 
         size_t iter = 0;
-        for (auto [key, val] : std::as_const (map))
+        for (const auto& [key, val] : std::as_const (map))
         {
             jassert (iter < 2);
             if (iter == 0)
@@ -92,7 +92,7 @@ TEST_CASE ("Enum Map Test", "[common][data-structures]")
 
         iter = 0;
         for (auto [key, val] : map)
-            val = (int) iter++;
+            val = static_cast<int> (iter++);
         REQUIRE (map[Food::Apple] == 0);
         REQUIRE (map[Food::Green_Beans] == 1);
     }

diff --git a/tests/common_tests/chowdsp_data_structures_test/STLArenaAllocatorTest.cpp b/tests/common_tests/chowdsp_data_structures_test/STLArenaAllocatorTest.cpp
@@ -4,7 +4,7 @@
 TEST_CASE ("STL Arena Allocator Test", "[common][data-structures]")
 {
     using Arena = chowdsp::ArenaAllocator<>;
-    Arena arena { 128 };
+    Arena arena { 512 };
 
     using Alloc = chowdsp::STLArenaAllocator<int, Arena>;
     Alloc alloc { arena };