mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-04 14:01:25 +12:00
Conflicts fixed
This commit is contained in:
parent
e86a849600
commit
05c6a96d27
22 changed files with 501 additions and 132 deletions
|
@ -15,7 +15,7 @@ public:
|
|||
{
|
||||
}
|
||||
|
||||
bool Push(T& data)
|
||||
bool Push(const T& data)
|
||||
{
|
||||
while (true)
|
||||
{
|
||||
|
@ -100,4 +100,4 @@ public:
|
|||
SMutexLocker lock(m_mutex);
|
||||
return m_data[(m_pos + pos) % SQSize];
|
||||
}
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue