diff options
| author | Chris Johns <chrisj@rtems.org> | 2022-08-19 16:50:24 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2022-08-22 08:30:00 +1000 |
| commit | a329579ed5ef8e7d75e41b43e62b040007835b75 (patch) | |
| tree | a83edd08d08440f87dc8e983010044c4c8eaca2b /cpukit/include/rtems/score | |
| parent | cpukit/include: Fixes for C++ (diff) | |
| download | rtems-a329579ed5ef8e7d75e41b43e62b040007835b75.tar.bz2 | |
cpukit/include: Fix including in C++
UPdates #4706
Diffstat (limited to 'cpukit/include/rtems/score')
| -rw-r--r-- | cpukit/include/rtems/score/scheduleredfimpl.h | 4 | ||||
| -rw-r--r-- | cpukit/include/rtems/score/tls.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cpukit/include/rtems/score/scheduleredfimpl.h b/cpukit/include/rtems/score/scheduleredfimpl.h index 06a35ae95f..3e180c0526 100644 --- a/cpukit/include/rtems/score/scheduleredfimpl.h +++ b/cpukit/include/rtems/score/scheduleredfimpl.h @@ -120,7 +120,7 @@ RTEMS_INLINE_ROUTINE bool _Scheduler_EDF_Less( Priority_Control prio_left; Priority_Control prio_right; - the_left = left; + the_left = (const Priority_Control*) left; the_right = RTEMS_CONTAINER_OF( right, Scheduler_EDF_Node, Node ); prio_left = *the_left; @@ -148,7 +148,7 @@ RTEMS_INLINE_ROUTINE bool _Scheduler_EDF_Priority_less_equal( Priority_Control prio_left; Priority_Control prio_right; - the_left = left; + the_left = (const Priority_Control*) left; the_right = RTEMS_CONTAINER_OF( right, Scheduler_EDF_Node, Node ); prio_left = *the_left; diff --git a/cpukit/include/rtems/score/tls.h b/cpukit/include/rtems/score/tls.h index f3bcb2c96a..3881af2b11 100644 --- a/cpukit/include/rtems/score/tls.h +++ b/cpukit/include/rtems/score/tls.h @@ -241,7 +241,7 @@ static inline void *_TLS_TCB_at_area_begin_initialize( void *tls_area ) { void *tls_block = (char *) tls_area + _TLS_Get_thread_control_block_area_size( (uintptr_t) _TLS_Alignment ); - TLS_Thread_control_block *tcb = tls_area; + TLS_Thread_control_block *tcb = (TLS_Thread_control_block*) tls_area; uintptr_t aligned_size = _TLS_Align_up( (uintptr_t) _TLS_Size ); TLS_Dynamic_thread_vector *dtv = (TLS_Dynamic_thread_vector *) ((char *) tls_block + aligned_size); |