Fix a few warnings.
Templates shouldn't be marked as inline if they aren't defined in the header.
This commit is contained in:
		
							parent
							
								
									2eb61dafc0
								
							
						
					
					
						commit
						afcb250b31
					
				@ -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 <typename T>
 | 
			
		||||
inline void Read(T &var, const u32 addr);
 | 
			
		||||
void Read(T &var, const u32 addr);
 | 
			
		||||
 | 
			
		||||
} // namespace
 | 
			
		||||
 | 
			
		||||
@ -235,10 +235,10 @@ u32 GetFramebufferAddr(const u32 address);
 | 
			
		||||
FramebufferLocation GetFramebufferLocation(u32 address);
 | 
			
		||||
 | 
			
		||||
template <typename T>
 | 
			
		||||
inline void Read(T &var, const u32 addr);
 | 
			
		||||
void Read(T &var, const u32 addr);
 | 
			
		||||
 | 
			
		||||
template <typename T>
 | 
			
		||||
inline void Write(u32 addr, const T data);
 | 
			
		||||
void Write(u32 addr, const T data);
 | 
			
		||||
 | 
			
		||||
/// Update hardware
 | 
			
		||||
void Update();
 | 
			
		||||
 | 
			
		||||
@ -9,10 +9,10 @@
 | 
			
		||||
namespace HW {
 | 
			
		||||
 | 
			
		||||
template <typename T>
 | 
			
		||||
inline void Read(T &var, const u32 addr);
 | 
			
		||||
void Read(T &var, const u32 addr);
 | 
			
		||||
 | 
			
		||||
template <typename T>
 | 
			
		||||
inline void Write(u32 addr, const T data);
 | 
			
		||||
void Write(u32 addr, const T data);
 | 
			
		||||
 | 
			
		||||
/// Update hardware
 | 
			
		||||
void Update();
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user