summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/frontend/framebuffer_layout.cpp2
-rw-r--r--src/core/hle/kernel/hle_ipc.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/core/frontend/framebuffer_layout.cpp b/src/core/frontend/framebuffer_layout.cpp
index 8551858d1..18ec4d2ed 100644
--- a/src/core/frontend/framebuffer_layout.cpp
+++ b/src/core/frontend/framebuffer_layout.cpp
@@ -2,6 +2,8 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <cmath>
6
5#include "common/assert.h" 7#include "common/assert.h"
6#include "core/frontend/framebuffer_layout.h" 8#include "core/frontend/framebuffer_layout.h"
7 9
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h
index 8c26285e5..42941d151 100644
--- a/src/core/hle/kernel/hle_ipc.h
+++ b/src/core/hle/kernel/hle_ipc.h
@@ -154,13 +154,13 @@ public:
154 template<typename T> 154 template<typename T>
155 SharedPtr<T> GetCopyObject(size_t index) { 155 SharedPtr<T> GetCopyObject(size_t index) {
156 ASSERT(index < copy_objects.size()); 156 ASSERT(index < copy_objects.size());
157 return DynamicObjectCast(copy_objects[index]); 157 return DynamicObjectCast<T>(copy_objects[index]);
158 } 158 }
159 159
160 template<typename T> 160 template<typename T>
161 SharedPtr<T> GetMoveObject(size_t index) { 161 SharedPtr<T> GetMoveObject(size_t index) {
162 ASSERT(index < move_objects.size()); 162 ASSERT(index < move_objects.size());
163 return DynamicObjectCast(move_objects[index]); 163 return DynamicObjectCast<T>(move_objects[index]);
164 } 164 }
165 165
166 void AddMoveObject(SharedPtr<Object> object) { 166 void AddMoveObject(SharedPtr<Object> object) {