From 4875ee8a3ab95c4fbf1e09941d3f44d99a9a632b Mon Sep 17 00:00:00 2001 From: armink Date: Tue, 17 Dec 2019 20:11:46 +0800 Subject: Sync from master (75a3f3dd3a930eab1dc58fa0258a9d1605a0ac11) --- components/cplusplus/Thread.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'components/cplusplus/Thread.h') diff --git a/components/cplusplus/Thread.h b/components/cplusplus/Thread.h index 71ee50e1f9..b578659489 100644 --- a/components/cplusplus/Thread.h +++ b/components/cplusplus/Thread.h @@ -45,16 +45,15 @@ public: static void sleep(int32_t millisec); - void wait(int32_t millisec); - void join(int32_t millisec = -1); + rt_err_t wait(int32_t millisec); + rt_err_t join(int32_t millisec = -1); protected: - virtual void run(); + virtual void run(void *parameter); private: static void func(Thread *pThis); -private: rt_thread_t _thread; thread_func_t _entry; -- cgit v1.3.1