aboutsummaryrefslogtreecommitdiff
path: root/zencore/include
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-09-19 22:35:12 +0200
committerStefan Boberg <[email protected]>2021-09-19 22:35:12 +0200
commitc86315ea955408659eb7ea32798693975e27b9b7 (patch)
tree1ed4be528a0d2f5556cb6137b85bea9238a61dbd /zencore/include
parentclang-format again (diff)
downloadzen-c86315ea955408659eb7ea32798693975e27b9b7.tar.xz
zen-c86315ea955408659eb7ea32798693975e27b9b7.zip
Changed so Windows also uses the portable std::mutex implementation and reworked some code which would not compile after the change
Diffstat (limited to 'zencore/include')
-rw-r--r--zencore/include/zencore/thread.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/zencore/include/zencore/thread.h b/zencore/include/zencore/thread.h
index e65867ec4..7889682cd 100644
--- a/zencore/include/zencore/thread.h
+++ b/zencore/include/zencore/thread.h
@@ -4,9 +4,7 @@
#include "zencore.h"
-#if !ZEN_PLATFORM_WINDOWS
-# include <shared_mutex>
-#endif
+#include <shared_mutex>
#include <vector>
@@ -66,11 +64,7 @@ public:
};
private:
-#if ZEN_PLATFORM_WINDOWS
- void* m_Srw = nullptr;
-#else
std::shared_mutex m_Mutex;
-#endif
};
/** Basic abstraction of a simple event synchronization mechanism (aka 'binary semaphore')