zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge #9063: Do not shadow variable, use deprecated MAP_ANON if MAP_ANONYMOUS is not defined 

4a9f3c5 Do not shadow variable, use deprecated MAP_ANON if MAP_ANONYMOUS is not defined. (Pavel Janík)
This commit is contained in:
Wladimir J. van der Laan 2016-11-02 14:40:51 +01:00
parent f8723d2318 4a9f3c50cc
commit f2a6e8243f
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/support/lockedpool.cpp
View File

@ -64,14 +64,14 @@ void* Arena::alloc(size_t size)
for (auto& chunk: chunks) { for (auto& chunk: chunks) {
if (!chunk.second.isInUse() && size <= chunk.second.getSize()) { if (!chunk.second.isInUse() && size <= chunk.second.getSize()) {
char* base = chunk.first; char* _base = chunk.first;
size_t leftover = chunk.second.getSize() - size; size_t leftover = chunk.second.getSize() - size;
if (leftover > 0) { // Split chunk 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.setSize(size);
} }
chunk.second.setInUse(true); chunk.second.setInUse(true);
return reinterpret_cast<void*>(base); return reinterpret_cast<void*>(_base);
} }
} }
return nullptr; return nullptr;
@ -224,6 +224,13 @@ PosixLockedPageAllocator::PosixLockedPageAllocator()
page_size = sysconf(_SC_PAGESIZE); page_size = sysconf(_SC_PAGESIZE);
#endif #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 *PosixLockedPageAllocator::AllocateLocked(size_t len, bool *lockingSuccess)
{ {
void *addr; void *addr;