Merge pull request #1 from RT-Thread/master

sync rtt

1 files changed, 6 insertions, 7 deletions

diff --git a/components/cplusplus/Thread.h b/components/cplusplus/Thread.h
index 9b6cf30884..b578659489 100644
--- a/components/cplusplus/Thread.h
+++ b/components/cplusplus/Thread.h
@@ -20,7 +20,7 @@ namespace rtthread
 class Thread
 {
 public:
-    typedef void (*thread_func_t) (void *param);
+    typedef void (*thread_func_t)(void *param);
 
     /** Allocate a new thread without starting execution
       @param   priority       initial priority of the thread function. (default: osPriorityNormal).
@@ -28,14 +28,14 @@ public:
       @param   stack_pointer  pointer to the stack area to be used by this thread (default: NULL).
     */
     Thread(rt_uint32_t stack_size = 2048,
-           rt_uint8_t  priority = (RT_THREAD_PRIORITY_MAX * 2)/3,
+           rt_uint8_t  priority = (RT_THREAD_PRIORITY_MAX * 2) / 3,
            rt_uint32_t tick = 20,
            const char *name = "th");
 
     Thread(void (*entry)(void *p),
            void *p = RT_NULL,
            rt_uint32_t stack_size = 2048,
-           rt_uint8_t  priority = (RT_THREAD_PRIORITY_MAX * 2)/3,
+           rt_uint8_t  priority = (RT_THREAD_PRIORITY_MAX * 2) / 3,
            rt_uint32_t tick = 20,
            const char *name = "th");
 
@@ -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;