From 0a8168cbf0c950d9693abfa75201a8ddf466594e Mon Sep 17 00:00:00 2001 From: Alexey Eremin Date: Thu, 2 May 2024 16:20:06 +0000 Subject: [PATCH] pw_thread: Fix remaining compilability issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Compilability was broken by https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/205760. Change-Id: Ic133703c89ee6cb0382757fc23d5c3d9a8a79e05 Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/207971 Lint: Lint 🤖 Presubmit-Verified: CQ Bot Account Commit-Queue: Alexey Eremin Reviewed-by: Wyatt Hepler --- pw_thread_zephyr/public/pw_thread_zephyr/context.h | 2 +- pw_thread_zephyr/thread.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pw_thread_zephyr/public/pw_thread_zephyr/context.h b/pw_thread_zephyr/public/pw_thread_zephyr/context.h index bbdfede17..086050dee 100644 --- a/pw_thread_zephyr/public/pw_thread_zephyr/context.h +++ b/pw_thread_zephyr/public/pw_thread_zephyr/context.h @@ -94,7 +94,7 @@ class StaticContext : public Context { : stack_(stack), available_stack_size_(available_stack_size) {} private: - friend Thread; + friend Context; z_thread_stack_element* stack() { return stack_; } size_t available_stack_size() { return available_stack_size_; } diff --git a/pw_thread_zephyr/thread.cc b/pw_thread_zephyr/thread.cc index 9ea5a840c..284099bcd 100644 --- a/pw_thread_zephyr/thread.cc +++ b/pw_thread_zephyr/thread.cc @@ -63,7 +63,7 @@ void Context::CreateThread(const zephyr::Options& options, native_type_out->set_thread_done(false); native_type_out->set_thread_routine(std::move(thread_fn)); - native_type_out->const k_tid_t task_handle = + const k_tid_t task_handle = k_thread_create(&native_type_out->thread_info(), options.static_context()->stack(), options.static_context()->available_stack_size(),