From afcb250b3140fa2f37efa800f5346aabbde5db2a Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Tue, 22 Jul 2014 13:49:25 +0200 Subject: Fix a few warnings. Templates shouldn't be marked as inline if they aren't defined in the header. --- src/core/hle/config_mem.h | 6 +++--- src/core/hw/gpu.h | 4 ++-- src/core/hw/hw.h | 4 ++-- 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 @@ // Copyright 2014 Citra Emulator Project // Licensed under GPLv2 -// Refer to the license.txt file included. +// Refer to the license.txt file included. #pragma once -// Configuration memory stores various hardware/kernel configuration settings. This memory page is +// Configuration memory stores various hardware/kernel configuration settings. This memory page is // read-only for ARM11 processes. I'm guessing this would normally be written to by the firmware/ // bootrom. Because we're not emulating this, and essentially just "stubbing" the functionality, I'm // putting this as a subset of HLE for now. @@ -16,6 +16,6 @@ namespace ConfigMem { template -inline void Read(T &var, const u32 addr); +void Read(T &var, const u32 addr); } // 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); FramebufferLocation GetFramebufferLocation(u32 address); template -inline void Read(T &var, const u32 addr); +void Read(T &var, const u32 addr); template -inline void Write(u32 addr, const T data); +void Write(u32 addr, const T data); /// Update hardware void 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 @@ namespace HW { template -inline void Read(T &var, const u32 addr); +void Read(T &var, const u32 addr); template -inline void Write(u32 addr, const T data); +void Write(u32 addr, const T data); /// Update hardware void Update(); -- cgit v1.2.3