Skip to content

Commit

Permalink
Do not shadow variable, use deprecated MAP_ANON if MAP_ANONYMOUS is n…
Browse files Browse the repository at this point in the history
…ot defined.
  • Loading branch information
paveljanik authored and str4d committed Jul 31, 2020
1 parent 088219f commit d0df44f
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions src/support/lockedpool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ void* Arena::alloc(size_t size)

for (auto& chunk: chunks) {
if (!chunk.second.isInUse() && size <= chunk.second.getSize()) {
char* base = chunk.first;
char* _base = chunk.first;
size_t leftover = chunk.second.getSize() - size;
if (leftover > 0) { // Split chunk
chunks.emplace(base + size, Chunk(leftover, false));
chunks.emplace(_base + size, Chunk(leftover, false));
chunk.second.setSize(size);
}
chunk.second.setInUse(true);
return reinterpret_cast<void*>(base);
return reinterpret_cast<void*>(_base);
}
}
return nullptr;
Expand Down Expand Up @@ -224,6 +224,13 @@ PosixLockedPageAllocator::PosixLockedPageAllocator()
page_size = sysconf(_SC_PAGESIZE);
#endif
}

// Some systems (at least OS X) do not define MAP_ANONYMOUS yet and define
// MAP_ANON which is deprecated
#ifndef MAP_ANONYMOUS
#define MAP_ANONYMOUS MAP_ANON
#endif

void *PosixLockedPageAllocator::AllocateLocked(size_t len, bool *lockingSuccess)
{
void *addr;
Expand Down

0 comments on commit d0df44f

Please sign in to comment.