diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-28 00:26:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-28 00:26:01 +0100 |
| commit | b7b39786840a41a057f531ed13b64e26366befac (patch) | |
| tree | b78a2e0bc0b3f49e82e148e8edb741930ff0ce55 /core/io/file_access_network.h | |
| parent | e66d519286693a03bf59eaba0a5f29c1c9b15d64 (diff) | |
| parent | 18fbdbb456c07a56b358bea2e392765fbcbb3283 (diff) | |
| download | redot-engine-b7b39786840a41a057f531ed13b64e26366befac.tar.gz | |
Merge pull request #36556 from RandomShaper/rework_mutex
Reimplement `Mutex` with C++'s `<mutex>` (plus more)
Diffstat (limited to 'core/io/file_access_network.h')
| -rw-r--r-- | core/io/file_access_network.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/io/file_access_network.h b/core/io/file_access_network.h index f329abf7c5..38d9b8e8a6 100644 --- a/core/io/file_access_network.h +++ b/core/io/file_access_network.h @@ -52,8 +52,8 @@ class FileAccessNetworkClient { SemaphoreOld *sem; Thread *thread; bool quit; - Mutex *mutex; - Mutex *blockrequest_mutex; + Mutex mutex; + Mutex blockrequest_mutex; Map<int, FileAccessNetwork *> accesses; Ref<StreamPeerTCP> client; int last_id; @@ -87,7 +87,7 @@ class FileAccessNetwork : public FileAccess { SemaphoreOld *sem; SemaphoreOld *page_sem; - Mutex *buffer_mutex; + Mutex buffer_mutex; bool opened; size_t total_size; mutable size_t pos; |