Browse Source

AP_HAL_SITL: fix ‘heap’ shadowing

mission-4.1.18
Pierre Kancir 6 years ago committed by Tom Pittenger
parent
commit
a700b647db
  1. 6
      libraries/AP_HAL_SITL/Util.cpp

6
libraries/AP_HAL_SITL/Util.cpp

@ -79,13 +79,13 @@ void *HALSITL::Util::allocate_heap_memory(size_t size) @@ -79,13 +79,13 @@ void *HALSITL::Util::allocate_heap_memory(size_t size)
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;
}
struct heap *heapp = (struct heap*)heap;
struct heap *heapp = (struct heap*)heap_ptr;
// extract appropriate headers
size_t old_size = 0;

Loading…
Cancel
Save