summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-05-01 23:44:57 +0200
committerbunnei <bunneidev@gmail.com>2016-05-01 23:44:57 +0200
commit15d0e982678d6151bb058fbb8ea0f39b7ffa688a (patch)
tree716ea2ff8d136622183261274564eeb03aed5c5f /src/core
parentMerge pull request #1745 from JayFoxRox/fix-const_color (diff)
parentVideoCore: Run include-what-you-use and fix most includes. (diff)
downloadyuzu-15d0e982678d6151bb058fbb8ea0f39b7ffa688a.tar
yuzu-15d0e982678d6151bb058fbb8ea0f39b7ffa688a.tar.gz
yuzu-15d0e982678d6151bb058fbb8ea0f39b7ffa688a.tar.bz2
yuzu-15d0e982678d6151bb058fbb8ea0f39b7ffa688a.tar.lz
yuzu-15d0e982678d6151bb058fbb8ea0f39b7ffa688a.tar.xz
yuzu-15d0e982678d6151bb058fbb8ea0f39b7ffa688a.tar.zst
yuzu-15d0e982678d6151bb058fbb8ea0f39b7ffa688a.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/result.h1
-rw-r--r--src/core/hle/service/gsp_gpu.h1
-rw-r--r--src/core/hw/lcd.h2
-rw-r--r--src/core/settings.h3
-rw-r--r--src/core/tracer/recorder.h1
5 files changed, 4 insertions, 4 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/hw/lcd.h b/src/core/hw/lcd.h
index 3dd877fbf..57029c5e8 100644
--- a/src/core/hw/lcd.h
+++ b/src/core/hw/lcd.h
@@ -52,8 +52,6 @@ struct Regs {
return content[index];
}
-#undef ASSERT_MEMBER_SIZE
-
};
static_assert(std::is_standard_layout<Regs>::value, "Structure does not use standard layout");
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>