Merge branch 'main' into franziska-wegner/2023/december/tests/datastr…

…uctures/mappingbinaryheap
franziska-wegner · Dec 8, 2023 · c64155f · c64155f
2 parents 4a1e388 + b51d7b5
commit c64155f
Show file tree

Hide file tree

Showing 4 changed files with 1,216 additions and 4 deletions.
diff --git a/include/DataStructures/Container/Queues/BinaryHeap.hpp b/include/DataStructures/Container/Queues/BinaryHeap.hpp
@@ -1209,7 +1209,6 @@ class BinaryHeapLoopDifferentiation<HeapType const, ExecutionPolicy::parallel> {
 
 #else // OPENMP_AVAILABLE
 
-namespace internal {
 template<typename HeapType>
 class BinaryHeapLoopDifferentiation<HeapType, ExecutionPolicy::parallel>
     : public BinaryHeapLoopDifferentiation<HeapType, ExecutionPolicy::sequential> {

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -12,9 +12,9 @@ add_test(NAME TestBound COMMAND TestBound)
 # target_link_libraries(TestStdQueue EGOA gtest gtest_main gmock_main)
 # add_test(NAME TestStdQueue COMMAND TestStdQueue)
 
-# add_executable(TestBinaryHeap DataStructures/Container/TestBinaryHeap.cpp)
-# target_link_libraries(TestBinaryHeap EGOA gtest gtest_main gmock_main)
-# add_test(NAME TestBinaryHeap COMMAND TestBinaryHeap)
+add_executable(TestBinaryHeap DataStructures/Container/TestBinaryHeap.cpp)
+target_link_libraries(TestBinaryHeap EGOA gtest gtest_main gmock_main)
+add_test(NAME TestBinaryHeap COMMAND TestBinaryHeap)
 
 # add_executable(TestMappingBinaryHeap DataStructures/Container/TestMappingBinaryHeap.cpp)
 # target_link_libraries(TestMappingBinaryHeap EGOA gtest gtest_main gmock_main)