Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-03-03 12:14:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_Linux: Thread: fix warning regarding shadow member

Browse Source 
../../libraries/AP_HAL_Linux/Thread.cpp: In member function ‘void Linux::Thread::_poison_stack()’:
../../libraries/AP_HAL_Linux/Thread.cpp:63:20: warning: declaration of ‘start’ shadows a member of 'this' [-Wshadow]
     uint8_t *end, *start, *curr;
                    ^
This commit is contained in:
Lucas De Marchi 2016-05-19 12:07:56 -03:00
parent 684ac12dd6
commit 18af4da690
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AP_HAL_Linux/Thread.cpp
View File

@ -60,7 +60,7 @@ void Thread::_poison_stack()
pthread_attr_t attr;
size_t stack_size, guard_size;
void *stackp;
uint8_t *end, *start, *curr;
uint8_t *end, *begin, *curr;
uint32_t *p;
if (pthread_getattr_np(_ctx, &attr) != 0 ||
@ -72,7 +72,7 @@ void Thread::_poison_stack()
/* The stack either grows upward or downard. The guard part always
* protects the end */
end = (uint8_t *) stackp;
start = end + stack_size;
begin = end + stack_size;
curr = (uint8_t *) alloca(sizeof(uint32_t));
/* if curr is closer to @end, the stack actually grows from low to high
@ -80,8 +80,8 @@ void Thread::_poison_stack()
* early in the thread's life and close to the thread creation, assuming
* the actual stack size is greater than the guard size and the stack
* until now is resonably small */
if (abs(curr - start) > abs(curr - end)) {
std::swap(end, start);
if (abs(curr - begin) > abs(curr - end)) {
std::swap(end, begin);
end -= guard_size;
for (p = (uint32_t *) end; p > (uint32_t *) curr; p--) {
@ -95,7 +95,7 @@ void Thread::_poison_stack()
}
}
_stack_debug.start = (uint32_t *) start;
_stack_debug.start = (uint32_t *) begin;
_stack_debug.end = (uint32_t *) end;
}