RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-04 22:19:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix small merge mistake

Browse source
This commit is contained in:
Bigpet 2014-02-23 18:13:08 +01:00
commit 1be8563fdb
47 changed files with 3065 additions and 785 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Utilities/IdManager.h
View file

@ -35,11 +35,11 @@ public:
struct ID
{
std::string m_name;
u8 m_attr;
u32 m_attr;
IDData* m_data;
template<typename T>
ID(const std::string& name, T* data, const u8 attr)
ID(const std::string& name, T* data, const u32 attr)
: m_name(name)
, m_attr(attr)
{
@ -97,7 +97,7 @@ public:
}
template<typename T = char>
ID_TYPE GetNewID(const std::string& name = "", T* data = nullptr, const u8 attr = 0)
ID_TYPE GetNewID(const std::string& name = "", T* data = nullptr, const u32 attr = 0)
{
std::lock_guard<std::mutex> lock(m_mtx_main);