Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modification for making Foonathan memory compatible with UWP #80

Merged
merged 5 commits into from
Jun 23, 2020
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Indentation fixes.
  • Loading branch information
quattrinili authored May 30, 2020

Verified

This commit was signed with the committer’s verified signature.
AArnott Andrew Arnott
commit 9fc0d8611a524479fc2466a6f3495d53441f150b
12 changes: 6 additions & 6 deletions src/virtual_memory.cpp
Original file line number Diff line number Diff line change
@@ -39,10 +39,10 @@ void* foonathan::memory::virtual_memory_reserve(std::size_t no_pages) noexcept
{
auto pages =
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
VirtualAlloc(nullptr, no_pages * virtual_memory_page_size, MEM_RESERVE, PAGE_READWRITE);
#else
VirtualAlloc(nullptr, no_pages * virtual_memory_page_size, MEM_RESERVE, PAGE_READWRITE);
#else
VirtualAllocFromApp(nullptr, no_pages * virtual_memory_page_size, MEM_RESERVE, PAGE_READWRITE);
#endif
#endif
return pages;
}

@@ -57,10 +57,10 @@ void* foonathan::memory::virtual_memory_commit(void* memory,
{
auto region =
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
VirtualAlloc(memory, no_pages * virtual_memory_page_size, MEM_COMMIT, PAGE_READWRITE);
#else
VirtualAlloc(memory, no_pages * virtual_memory_page_size, MEM_COMMIT, PAGE_READWRITE);
#else
VirtualAllocFromApp(memory, no_pages * virtual_memory_page_size, MEM_COMMIT, PAGE_READWRITE);
#endif
#endif
if (!region)
return nullptr;
FOONATHAN_MEMORY_ASSERT(region == memory);