summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Tony Wasserka2014-07-22 13:49:25 +0200
committerGravatar Tony Wasserka2014-07-23 00:44:31 +0200
commitafcb250b3140fa2f37efa800f5346aabbde5db2a (patch)
tree2a80ff39f2d165d75b73a608a4d22ab055129a83 /src
parentGPU: Clarify display transfer code. (diff)
downloadyuzu-afcb250b3140fa2f37efa800f5346aabbde5db2a.tar.gz
yuzu-afcb250b3140fa2f37efa800f5346aabbde5db2a.tar.xz
yuzu-afcb250b3140fa2f37efa800f5346aabbde5db2a.zip
Fix a few warnings.
Templates shouldn't be marked as inline if they aren't defined in the header.
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/config_mem.h6
-rw-r--r--src/core/hw/gpu.h4
-rw-r--r--src/core/hw/hw.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hle/config_mem.h b/src/core/hle/config_mem.h
index da396a3e6..fa01b5cdb 100644
--- a/src/core/hle/config_mem.h
+++ b/src/core/hle/config_mem.h
@@ -1,10 +1,10 @@
1// Copyright 2014 Citra Emulator Project 1// Copyright 2014 Citra Emulator Project
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#pragma once 5#pragma once
6 6
7// Configuration memory stores various hardware/kernel configuration settings. This memory page is 7// Configuration memory stores various hardware/kernel configuration settings. This memory page is
8// read-only for ARM11 processes. I'm guessing this would normally be written to by the firmware/ 8// read-only for ARM11 processes. I'm guessing this would normally be written to by the firmware/
9// bootrom. Because we're not emulating this, and essentially just "stubbing" the functionality, I'm 9// bootrom. Because we're not emulating this, and essentially just "stubbing" the functionality, I'm
10// putting this as a subset of HLE for now. 10// putting this as a subset of HLE for now.
@@ -16,6 +16,6 @@
16namespace ConfigMem { 16namespace ConfigMem {
17 17
18template <typename T> 18template <typename T>
19inline void Read(T &var, const u32 addr); 19void Read(T &var, const u32 addr);
20 20
21} // namespace 21} // namespace
diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h
index 3078e4142..42f18a0e7 100644
--- a/src/core/hw/gpu.h
+++ b/src/core/hw/gpu.h
@@ -235,10 +235,10 @@ u32 GetFramebufferAddr(const u32 address);
235FramebufferLocation GetFramebufferLocation(u32 address); 235FramebufferLocation GetFramebufferLocation(u32 address);
236 236
237template <typename T> 237template <typename T>
238inline void Read(T &var, const u32 addr); 238void Read(T &var, const u32 addr);
239 239
240template <typename T> 240template <typename T>
241inline void Write(u32 addr, const T data); 241void Write(u32 addr, const T data);
242 242
243/// Update hardware 243/// Update hardware
244void Update(); 244void Update();
diff --git a/src/core/hw/hw.h b/src/core/hw/hw.h
index 92e9304ca..1055ed94f 100644
--- a/src/core/hw/hw.h
+++ b/src/core/hw/hw.h
@@ -9,10 +9,10 @@
9namespace HW { 9namespace HW {
10 10
11template <typename T> 11template <typename T>
12inline void Read(T &var, const u32 addr); 12void Read(T &var, const u32 addr);
13 13
14template <typename T> 14template <typename T>
15inline void Write(u32 addr, const T data); 15void Write(u32 addr, const T data);
16 16
17/// Update hardware 17/// Update hardware
18void Update(); 18void Update();