Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_SITL: fix ‘heap’ shadowing

This commit is contained in:
Pierre Kancir 2019-04-08 14:03:45 +02:00 committed by Tom Pittenger
parent 47141562c0
commit a700b647db
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_HAL_SITL/Util.cpp
View File

@ -79,13 +79,13 @@ void *HALSITL::Util::allocate_heap_memory(size_t size)
return (void *)new_heap; return (void *)new_heap;
} }
void *HALSITL::Util::heap_realloc(void *heap, void *ptr, size_t new_size) void *HALSITL::Util::heap_realloc(void *heap_ptr, void *ptr, size_t new_size)
{ {
if (heap == nullptr) { if (heap_ptr == nullptr) {
return nullptr; return nullptr;
} }
struct heap *heapp = (struct heap*)heap; struct heap *heapp = (struct heap*)heap_ptr;
// extract appropriate headers // extract appropriate headers
size_t old_size = 0; size_t old_size = 0;