piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8530 from s-daveb/master

Browse Source 
MacOS: Fixes configuration hang; bump MacOS SDK.
This commit is contained in:
Connor McLaughlin
2020-01-13 20:21:08 +10:00
committed by GitHub
parent 1701363854 002761d949
commit ae6d3be449
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Common/Config/Config.cpp
View File

@ -5,11 +5,7 @@
#include <algorithm>
#include <list>
#include <map>
#if __APPLE__
#include <mutex>
#else
#include <shared_mutex>
#endif
#include "Common/Config/Config.h"
@ -21,19 +17,10 @@ static Layers s_layers;
static std::list<ConfigChangedCallback> s_callbacks;
static u32 s_callback_guards = 0;
// Mac supports shared_mutex since 10.12 and we're targeting 10.10,
// so only use unique locks there...
#if __APPLE__
static std::mutex s_layers_rw_lock;
using ReadLock = std::unique_lock<std::mutex>;
using WriteLock = std::unique_lock<std::mutex>;
#else
static std::shared_mutex s_layers_rw_lock;
using ReadLock = std::shared_lock<std::shared_mutex>;
using WriteLock = std::unique_lock<std::shared_mutex>;
#endif
static void AddLayerInternal(std::shared_ptr<Layer> layer)
{