diff options
| author | 2015-02-18 22:18:47 -0800 | |
|---|---|---|
| committer | 2015-02-18 22:26:22 -0800 | |
| commit | 5efd149ad56efb2a00332af5a791b403e7f70273 (patch) | |
| tree | 90492d27a1c67a480f8675c269a63932cee28432 /src/common/mem_arena.cpp | |
| parent | Merge pull request #580 from lioncash/emplace (diff) | |
| download | yuzu-5efd149ad56efb2a00332af5a791b403e7f70273.tar.gz yuzu-5efd149ad56efb2a00332af5a791b403e7f70273.tar.xz yuzu-5efd149ad56efb2a00332af5a791b403e7f70273.zip | |
Remove the useless msg_handler compilation unit that was left over from Dolphin
Diffstat (limited to 'src/common/mem_arena.cpp')
| -rw-r--r-- | src/common/mem_arena.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/common/mem_arena.cpp b/src/common/mem_arena.cpp index a20361d6f..cc31a88cc 100644 --- a/src/common/mem_arena.cpp +++ b/src/common/mem_arena.cpp | |||
| @@ -218,7 +218,7 @@ u8* MemArena::Find4GBBase() | |||
| 218 | void* base = mmap(0, 0x10000000, PROT_READ | PROT_WRITE, | 218 | void* base = mmap(0, 0x10000000, PROT_READ | PROT_WRITE, |
| 219 | MAP_ANON | MAP_SHARED, -1, 0); | 219 | MAP_ANON | MAP_SHARED, -1, 0); |
| 220 | if (base == MAP_FAILED) { | 220 | if (base == MAP_FAILED) { |
| 221 | PanicAlert("Failed to map 256 MB of memory space: %s", strerror(errno)); | 221 | LOG_ERROR(Common_Memory, "Failed to map 256 MB of memory space: %s", strerror(errno)); |
| 222 | return 0; | 222 | return 0; |
| 223 | } | 223 | } |
| 224 | munmap(base, 0x10000000); | 224 | munmap(base, 0x10000000); |
| @@ -338,7 +338,7 @@ u8 *MemoryMap_Setup(const MemoryView *views, int num_views, u32 flags, MemArena | |||
| 338 | // address space. | 338 | // address space. |
| 339 | if (!Memory_TryBase(base, views, num_views, flags, arena)) | 339 | if (!Memory_TryBase(base, views, num_views, flags, arena)) |
| 340 | { | 340 | { |
| 341 | PanicAlert("MemoryMap_Setup: Failed finding a memory base."); | 341 | LOG_ERROR(Common_Memory, "MemoryMap_Setup: Failed finding a memory base."); |
| 342 | return 0; | 342 | return 0; |
| 343 | } | 343 | } |
| 344 | #elif defined(_WIN32) | 344 | #elif defined(_WIN32) |
| @@ -363,12 +363,11 @@ u8 *MemoryMap_Setup(const MemoryView *views, int num_views, u32 flags, MemArena | |||
| 363 | if (!Memory_TryBase(base, views, num_views, flags, arena)) | 363 | if (!Memory_TryBase(base, views, num_views, flags, arena)) |
| 364 | { | 364 | { |
| 365 | LOG_ERROR(Common_Memory, "MemoryMap_Setup: Failed finding a memory base."); | 365 | LOG_ERROR(Common_Memory, "MemoryMap_Setup: Failed finding a memory base."); |
| 366 | PanicAlert("MemoryMap_Setup: Failed finding a memory base."); | ||
| 367 | return 0; | 366 | return 0; |
| 368 | } | 367 | } |
| 369 | #endif | 368 | #endif |
| 370 | if (base_attempts) | 369 | if (base_attempts) |
| 371 | PanicAlert("No possible memory base pointer found!"); | 370 | LOG_ERROR(Common_Memory, "No possible memory base pointer found!"); |
| 372 | return base; | 371 | return base; |
| 373 | } | 372 | } |
| 374 | 373 | ||