diff options
author | bunnei <bunneidev@gmail.com> | 2021-02-06 08:14:31 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2021-02-19 01:16:12 +0100 |
commit | 0d62f30b00fbfe598573ea8fd433bd64d7be3e5f (patch) | |
tree | 1645351165042095d108a5e43df263db604bbe1c /src/core/hle/service/time | |
parent | Merge pull request #5957 from lat9nq/update-dynarmic (diff) | |
download | yuzu-0d62f30b00fbfe598573ea8fd433bd64d7be3e5f.tar yuzu-0d62f30b00fbfe598573ea8fd433bd64d7be3e5f.tar.gz yuzu-0d62f30b00fbfe598573ea8fd433bd64d7be3e5f.tar.bz2 yuzu-0d62f30b00fbfe598573ea8fd433bd64d7be3e5f.tar.lz yuzu-0d62f30b00fbfe598573ea8fd433bd64d7be3e5f.tar.xz yuzu-0d62f30b00fbfe598573ea8fd433bd64d7be3e5f.tar.zst yuzu-0d62f30b00fbfe598573ea8fd433bd64d7be3e5f.zip |
Diffstat (limited to 'src/core/hle/service/time')
-rw-r--r-- | src/core/hle/service/time/time_sharedmemory.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/time/time_sharedmemory.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/time/time_sharedmemory.cpp b/src/core/hle/service/time/time_sharedmemory.cpp index e0ae9f874..4d8de81be 100644 --- a/src/core/hle/service/time/time_sharedmemory.cpp +++ b/src/core/hle/service/time/time_sharedmemory.cpp @@ -22,7 +22,7 @@ SharedMemory::SharedMemory(Core::System& system) : system(system) { SharedMemory::~SharedMemory() = default; -std::shared_ptr<Kernel::SharedMemory> SharedMemory::GetSharedMemoryHolder() const { +std::shared_ptr<Kernel::KSharedMemory> SharedMemory::GetSharedMemoryHolder() const { return shared_memory_holder; } diff --git a/src/core/hle/service/time/time_sharedmemory.h b/src/core/hle/service/time/time_sharedmemory.h index e0c3e63da..299680517 100644 --- a/src/core/hle/service/time/time_sharedmemory.h +++ b/src/core/hle/service/time/time_sharedmemory.h @@ -6,8 +6,8 @@ #include "common/common_types.h" #include "common/uuid.h" +#include "core/hle/kernel/k_shared_memory.h" #include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/shared_memory.h" #include "core/hle/service/time/clock_types.h" namespace Service::Time { @@ -18,7 +18,7 @@ public: ~SharedMemory(); // Return the shared memory handle - std::shared_ptr<Kernel::SharedMemory> GetSharedMemoryHolder() const; + std::shared_ptr<Kernel::KSharedMemory> GetSharedMemoryHolder() const; // TODO(ogniK): We have to properly simulate memory barriers, how are we going to do this? template <typename T, std::size_t Offset> @@ -63,7 +63,7 @@ public: void SetAutomaticCorrectionEnabled(bool is_enabled); private: - std::shared_ptr<Kernel::SharedMemory> shared_memory_holder; + std::shared_ptr<Kernel::KSharedMemory> shared_memory_holder; Core::System& system; Format shared_memory_format{}; }; |