summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-04-30 17:34:51 +0200
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-04-30 18:02:41 +0200
commit691a42fe98954c247a8b7e9305a3e9ca5c04d40c (patch)
tree52b6a286b6609675cbc69c63b3aa9f695ea95f0f /src/core
parentLCD: Remove unneeded #undef with no matching #define. (diff)
downloadyuzu-691a42fe98954c247a8b7e9305a3e9ca5c04d40c.tar
yuzu-691a42fe98954c247a8b7e9305a3e9ca5c04d40c.tar.gz
yuzu-691a42fe98954c247a8b7e9305a3e9ca5c04d40c.tar.bz2
yuzu-691a42fe98954c247a8b7e9305a3e9ca5c04d40c.tar.lz
yuzu-691a42fe98954c247a8b7e9305a3e9ca5c04d40c.tar.xz
yuzu-691a42fe98954c247a8b7e9305a3e9ca5c04d40c.tar.zst
yuzu-691a42fe98954c247a8b7e9305a3e9ca5c04d40c.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/result.h1
-rw-r--r--src/core/hle/service/gsp_gpu.h1
-rw-r--r--src/core/settings.h3
-rw-r--r--src/core/tracer/recorder.h1
4 files changed, 4 insertions, 2 deletions
diff --git a/src/core/hle/result.h b/src/core/hle/result.h
index 53931a106..3fc1ab4ee 100644
--- a/src/core/hle/result.h
+++ b/src/core/hle/result.h
@@ -5,7 +5,6 @@
#pragma once
#include <new>
-#include <type_traits>
#include <utility>
#include "common/assert.h"
diff --git a/src/core/hle/service/gsp_gpu.h b/src/core/hle/service/gsp_gpu.h
index 55a993bb8..3b4b678a3 100644
--- a/src/core/hle/service/gsp_gpu.h
+++ b/src/core/hle/service/gsp_gpu.h
@@ -10,6 +10,7 @@
#include "common/bit_field.h"
#include "common/common_types.h"
+#include "core/hle/result.h"
#include "core/hle/service/service.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/settings.h b/src/core/settings.h
index 04c0a47f9..ce2a31164 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -6,7 +6,8 @@
#include <string>
#include <array>
-#include <common/file_util.h>
+
+#include "common/common_types.h"
namespace Settings {
diff --git a/src/core/tracer/recorder.h b/src/core/tracer/recorder.h
index a42ccc45f..febf883c8 100644
--- a/src/core/tracer/recorder.h
+++ b/src/core/tracer/recorder.h
@@ -4,6 +4,7 @@
#pragma once
+#include <string>
#include <unordered_map>
#include <vector>