Skip to content

Commit 53b3089

Browse files
authored
Merge pull request #4399 from zhangsz0516/zhangsz_0228
[update][kernel]规范rt_object_t强制转换的使用,消除上次提交的编译警告
2 parents b087b2d + 72d7f6c commit 53b3089

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/thread.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,6 @@ RTM_EXPORT(rt_thread_startup);
358358
*/
359359
rt_err_t rt_thread_detach(rt_thread_t thread)
360360
{
361-
rt_base_t lock;
362-
363361
/* thread check */
364362
RT_ASSERT(thread != RT_NULL);
365363
RT_ASSERT(rt_object_get_type((rt_object_t)thread) == RT_Object_Class_Thread);

src/timer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ void rt_timer_init(rt_timer_t timer,
201201
RT_ASSERT(timer != RT_NULL);
202202

203203
/* timer object initialization */
204-
rt_object_init((rt_object_t)timer, RT_Object_Class_Timer, name);
204+
rt_object_init(&(timer->parent), RT_Object_Class_Timer, name);
205205

206206
_rt_timer_init(timer, timeout, parameter, time, flag);
207207
}
@@ -298,7 +298,7 @@ rt_err_t rt_timer_delete(rt_timer_t timer)
298298
/* enable interrupt */
299299
rt_hw_interrupt_enable(level);
300300

301-
rt_object_delete((rt_object_t)timer);
301+
rt_object_delete(&(timer->parent));
302302

303303
return RT_EOK;
304304
}

0 commit comments

Comments
 (0)