From 3c4dc538db43b3b5da793e4bd62b90e838d036b8 Mon Sep 17 00:00:00 2001 From: Keir Mierle Date: Fri, 28 Jul 2023 22:49:26 +0000 Subject: [PATCH] pw_sync_freertos: Fix ODR violation in tests Change-Id: I0ef58f9b472a58126f342c5edcae9123b1f41483 Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/160795 Commit-Queue: Keir Mierle Reviewed-by: Ewout van Bekkum --- pw_sync_freertos/timed_thread_notification_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pw_sync_freertos/timed_thread_notification_test.cc b/pw_sync_freertos/timed_thread_notification_test.cc index 322b8b5275..000b8d71b6 100644 --- a/pw_sync_freertos/timed_thread_notification_test.cc +++ b/pw_sync_freertos/timed_thread_notification_test.cc @@ -39,7 +39,7 @@ using pw::thread::Thread; // the FreeRTOS optimized TimedThreadNotification backend. #if INCLUDE_vTaskSuspend == 1 -class NotificationAcquirer : public thread::ThreadCore { +class TimedNotificationAcquirer : public thread::ThreadCore { public: void WaitUntilRunning() { started_notification_.acquire(); } void Release() { unblock_notification_.release(); } @@ -68,7 +68,7 @@ class NotificationAcquirer : public thread::ThreadCore { }; TEST(TimedThreadNotification, AcquireWithoutSuspend) { - NotificationAcquirer notification_acquirer; + TimedNotificationAcquirer notification_acquirer; // TODO(b/290860904): Replace TestOptionsThread0 with TestThreadContext. Thread thread = Thread(thread::test::TestOptionsThread0(), notification_acquirer); @@ -91,7 +91,7 @@ TEST(TimedThreadNotification, AcquireWithoutSuspend) { } TEST(TimedThreadNotification, AcquireWithSuspend) { - NotificationAcquirer notification_acquirer; + TimedNotificationAcquirer notification_acquirer; Thread thread = Thread(thread::test::TestOptionsThread0(), notification_acquirer);