Merge branch 'master' into feature/savestates-2

2020-04-16 19:03:49 +01:00
parent 3a651ac9fc 49a686faee
commit 9cd669db84
14 changed files with 130 additions and 106 deletions
--- a/src/core/arm/arm_interface.h
+++ b/src/core/arm/arm_interface.h
@@ -15,6 +15,10 @@
 #include "core/core_timing.h"
 #include "core/memory.h"

+namespace Memory {
+struct PageTable;
+};
+
 /// Generic ARM11 CPU interface
 class ARM_Interface : NonCopyable {
 public: