summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/address_arbiter.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-07-31 14:06:09 +0200
committerLioncash <mathew1800@gmail.com>2018-07-31 16:15:17 +0200
commita2304fad16d7a89741241ca8215a21bd02cce5e7 (patch)
treeb7fc29c08a4534090b39427c6709f1391147adab /src/core/hle/kernel/address_arbiter.cpp
parentMerge pull request #855 from bunnei/cubeb (diff)
downloadyuzu-a2304fad16d7a89741241ca8215a21bd02cce5e7.tar
yuzu-a2304fad16d7a89741241ca8215a21bd02cce5e7.tar.gz
yuzu-a2304fad16d7a89741241ca8215a21bd02cce5e7.tar.bz2
yuzu-a2304fad16d7a89741241ca8215a21bd02cce5e7.tar.lz
yuzu-a2304fad16d7a89741241ca8215a21bd02cce5e7.tar.xz
yuzu-a2304fad16d7a89741241ca8215a21bd02cce5e7.tar.zst
yuzu-a2304fad16d7a89741241ca8215a21bd02cce5e7.zip
Diffstat (limited to 'src/core/hle/kernel/address_arbiter.cpp')
-rw-r--r--src/core/hle/kernel/address_arbiter.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp
index 233fdab25..6a10efab1 100644
--- a/src/core/hle/kernel/address_arbiter.cpp
+++ b/src/core/hle/kernel/address_arbiter.cpp
@@ -2,15 +2,17 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <algorithm>
+#include <vector>
+
#include "common/assert.h"
-#include "common/common_funcs.h"
#include "common/common_types.h"
#include "core/core.h"
#include "core/hle/kernel/errors.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/process.h"
#include "core/hle/kernel/thread.h"
-#include "core/hle/lock.h"
+#include "core/hle/result.h"
#include "core/memory.h"
namespace Kernel {