From c0e98f4481cdac834a653b775af41e310c543d65 Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Fri, 10 Feb 2023 13:59:20 +0100 Subject: [PATCH] base: fix conversion errors of smp timeout test The cpu affinity index is an int no unsigned long within the interface definition. Ref genodelabs/genode#4344 --- repos/base/src/test/timeout_smp/main.cc | 6 +++--- repos/base/src/test/timeout_smp/target.mk | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/repos/base/src/test/timeout_smp/main.cc b/repos/base/src/test/timeout_smp/main.cc index 70d7a1dfea..8946f7da1d 100644 --- a/repos/base/src/test/timeout_smp/main.cc +++ b/repos/base/src/test/timeout_smp/main.cc @@ -42,7 +42,7 @@ class Test_thread Env &env, TYPE &object, Method method, - unsigned long cpu_idx, + int cpu_idx, Affinity::Space affinity_space) : Thread { @@ -80,7 +80,7 @@ class Test_smp_2 unsigned long _count_3 { 0 }; unsigned long _count_4 { 0 }; unsigned long _count_5 { 0 }; - unsigned long _cpu_idx { 1 }; + int _cpu_idx { 1 }; bool volatile _timeouts_discarded { false }; bool _done_called { false }; Mutex _done_mutex { }; @@ -211,7 +211,7 @@ class Test_smp_1 Env &_env; unsigned long &_nr_of_errors; - unsigned long _cpu_idx { 1 }; + int _cpu_idx { 1 }; bool _max_nr_of_handle_calls_reached { false }; Timer::Connection _timeout_timer { _env }; Timer::Connection _sleep_timer { _env }; diff --git a/repos/base/src/test/timeout_smp/target.mk b/repos/base/src/test/timeout_smp/target.mk index e7820bfbd8..e8f4eaf79e 100644 --- a/repos/base/src/test/timeout_smp/target.mk +++ b/repos/base/src/test/timeout_smp/target.mk @@ -1,5 +1,3 @@ TARGET = test-timeout_smp SRC_CC = main.cc LIBS = base - -CC_CXX_WARN_STRICT_CONVERSION =