diff options
| author |  Yuri Kunde Schlesner | 2015-07-10 16:36:12 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-07-10 16:36:12 -0700 |
| commit | 867c28ae03b3b2883713896765f3ff76eaf90a19 (patch) | |
| tree | 8ff8cf3ab24d2f167c19217efb8175a8841c0359 /src/core/mem_map.cpp | |
| parent | Merge pull request #906 from aroulin/loader-format-specifier-warning (diff) | |
| parent | Core: Cleanup hw includes. (diff) | |
| download | yuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.tar.gz yuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.tar.xz yuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.zip | |
Merge pull request #876 from linkmauve/include-cleanups
Cleanup includes, mostly in common
Diffstat (limited to 'src/core/mem_map.cpp')
| -rw-r--r-- | src/core/mem_map.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp index bf814b945..d8cae50dd 100644 --- a/src/core/mem_map.cpp +++ b/src/core/mem_map.cpp | |||
| @@ -3,13 +3,14 @@ | |||
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include <map> | 5 | #include <map> |
| 6 | #include <memory> | ||
| 7 | #include <utility> | ||
| 8 | #include <vector> | ||
| 6 | 9 | ||
| 7 | #include "common/common_types.h" | 10 | #include "common/common_types.h" |
| 8 | #include "common/logging/log.h" | 11 | #include "common/logging/log.h" |
| 9 | 12 | ||
| 10 | #include "core/hle/config_mem.h" | 13 | #include "core/hle/config_mem.h" |
| 11 | #include "core/hle/kernel/kernel.h" | ||
| 12 | #include "core/hle/kernel/shared_memory.h" | ||
| 13 | #include "core/hle/kernel/vm_manager.h" | 14 | #include "core/hle/kernel/vm_manager.h" |
| 14 | #include "core/hle/result.h" | 15 | #include "core/hle/result.h" |
| 15 | #include "core/hle/shared_page.h" | 16 | #include "core/hle/shared_page.h" |