summaryrefslogtreecommitdiff
path: root/components/cplusplus/Thread.h
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2019-12-21 06:40:47 +0800
committerGitHub <[email protected]>2019-12-21 06:40:47 +0800
commit0c11cd86717295bc4c41d7421e4119a62bbbfa11 (patch)
tree594994078d07de40ba37c47d5d5c536a51bfe0fc /components/cplusplus/Thread.h
parent3491b2f0f470d3834763b9d78071ce7804597c94 (diff)
parenta383385a3c0a676cee4471fd3cb4f372a36e1023 (diff)
Merge pull request #3274 from armink/lts-v3.1.x
Lts v3.1.x
Diffstat (limited to 'components/cplusplus/Thread.h')
-rw-r--r--components/cplusplus/Thread.h7
1 files changed, 3 insertions, 4 deletions
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;