From a5b6d9e22419016c678547bb2ba1865c15c6d7ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Kardos?= Date: Tue, 20 Feb 2024 16:00:34 +0100 Subject: [PATCH] fix compilation and formatting --- include/asyncpp/join.hpp | 2 +- include/asyncpp/shared_task.hpp | 2 +- include/asyncpp/task.hpp | 2 +- test/container/test_atomic_item.cpp | 2 +- test/memory/test_rc_ptr.cpp | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/asyncpp/join.hpp b/include/asyncpp/join.hpp index 0363e96..8c691a7 100644 --- a/include/asyncpp/join.hpp +++ b/include/asyncpp/join.hpp @@ -1,8 +1,8 @@ #pragma once #include "concepts.hpp" -#include "testing/suspension_point.hpp" #include "promise.hpp" +#include "testing/suspension_point.hpp" #include #include diff --git a/include/asyncpp/shared_task.hpp b/include/asyncpp/shared_task.hpp index 198ec9b..0c86502 100644 --- a/include/asyncpp/shared_task.hpp +++ b/include/asyncpp/shared_task.hpp @@ -81,7 +81,7 @@ namespace impl_shared_task { rc_ptr> m_awaited = nullptr; - awaitable(base base, rc_ptr> awaited) : base(std::move(base)), m_awaited(awaited) { + awaitable(base base, rc_ptr> awaited) : broadcast_event::awaitable(std::move(base)), m_awaited(awaited) { assert(m_awaited); } }; diff --git a/include/asyncpp/task.hpp b/include/asyncpp/task.hpp index 0652acb..f966dae 100644 --- a/include/asyncpp/task.hpp +++ b/include/asyncpp/task.hpp @@ -82,7 +82,7 @@ namespace impl_task { rc_ptr> m_awaited = nullptr; - awaitable(base base, rc_ptr> awaited) : base(std::move(base)), m_awaited(awaited) { + awaitable(base base, rc_ptr> awaited) : event::awaitable(std::move(base)), m_awaited(awaited) { assert(m_awaited); } }; diff --git a/test/container/test_atomic_item.cpp b/test/container/test_atomic_item.cpp index dec5fa7..5fcdd1a 100644 --- a/test/container/test_atomic_item.cpp +++ b/test/container/test_atomic_item.cpp @@ -88,7 +88,7 @@ TEST_CASE("Atomic item: push-push interleave", "[Atomic item]") { TEST_CASE("Atomic item: push-close interleave", "[Atomic item]") { - struct scenario: testing::validated_scenario { + struct scenario : testing::validated_scenario { item_t item; element e{ 1 }; element* volatile closed = nullptr; diff --git a/test/memory/test_rc_ptr.cpp b/test/memory/test_rc_ptr.cpp index ac7125d..78b003d 100644 --- a/test/memory/test_rc_ptr.cpp +++ b/test/memory/test_rc_ptr.cpp @@ -125,5 +125,4 @@ TEST_CASE("Refcounted pointer - dereference", "[Refcounted pointer]") { REQUIRE(ptr->destroyed == 10); REQUIRE((*ptr).destroyed == 10); REQUIRE(ptr.get()->destroyed == 10); - } \ No newline at end of file