diff options
| author | Chris Johns <chrisj@rtems.org> | 2022-08-19 15:22:17 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2022-08-22 08:30:00 +1000 |
| commit | f5233fe51c24d7806badd8fc72aa86899e0afafa (patch) | |
| tree | 373a5780d225da17175351a2da2c2953c8f50140 /cpukit/include/rtems | |
| parent | spec/librtemscpu: Fix installed headers (diff) | |
| download | rtems-f5233fe51c24d7806badd8fc72aa86899e0afafa.tar.bz2 | |
cpukit/include: Fixes for C++
Updates #4706
Diffstat (limited to 'cpukit/include/rtems')
| -rw-r--r-- | cpukit/include/rtems/capture.h | 4 | ||||
| -rw-r--r-- | cpukit/include/rtems/score/priority.h | 4 | ||||
| -rw-r--r-- | cpukit/include/rtems/score/priorityimpl.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cpukit/include/rtems/capture.h b/cpukit/include/rtems/capture.h index c37d652211..4ab638ec24 100644 --- a/cpukit/include/rtems/capture.h +++ b/cpukit/include/rtems/capture.h @@ -838,7 +838,7 @@ rtems_capture_task_flags (rtems_tcb* tcb) static inline rtems_capture_control* rtems_capture_task_control (rtems_tcb* tcb) { - return tcb->Capture.control; + return (rtems_capture_control*) tcb->Capture.control; } /** @@ -853,7 +853,7 @@ rtems_capture_task_control (rtems_tcb* tcb) static inline uint32_t rtems_capture_task_control_flags (rtems_tcb* tcb) { - rtems_capture_control* control = tcb->Capture.control; + rtems_capture_control* control = rtems_capture_task_control (tcb); if (!control) return 0; return control->flags; diff --git a/cpukit/include/rtems/score/priority.h b/cpukit/include/rtems/score/priority.h index 6f6cc12bac..aa29fef8c0 100644 --- a/cpukit/include/rtems/score/priority.h +++ b/cpukit/include/rtems/score/priority.h @@ -45,12 +45,12 @@ #include <rtems/score/cpu.h> #include <rtems/score/rbtree.h> -struct _Scheduler_Control; - #ifdef __cplusplus extern "C" { #endif +struct _Scheduler_Control; + /** * @defgroup RTEMSScorePriority Priority Handler * diff --git a/cpukit/include/rtems/score/priorityimpl.h b/cpukit/include/rtems/score/priorityimpl.h index 55cddf53be..5a9a1673f6 100644 --- a/cpukit/include/rtems/score/priorityimpl.h +++ b/cpukit/include/rtems/score/priorityimpl.h @@ -403,7 +403,7 @@ RTEMS_INLINE_ROUTINE bool _Priority_Less( const Priority_Control *the_left; const Priority_Node *the_right; - the_left = left; + the_left = (const Priority_Control*) left; the_right = RTEMS_CONTAINER_OF( right, Priority_Node, Node.RBTree ); return *the_left < the_right->priority; |