summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorGravatar Liam2023-03-07 20:03:24 -0500
committerGravatar Liam2023-03-07 20:05:19 -0500
commitba4213d956ff138ec6392dc4145970e8a3cd1ba6 (patch)
tree3454be719887e09c5745887cab59c89e11dc28ef /src/core/hle/kernel
parentMerge pull request #9889 from Morph1984/time-is-ticking (diff)
downloadyuzu-ba4213d956ff138ec6392dc4145970e8a3cd1ba6.tar.gz
yuzu-ba4213d956ff138ec6392dc4145970e8a3cd1ba6.tar.xz
yuzu-ba4213d956ff138ec6392dc4145970e8a3cd1ba6.zip
general: fix type inconsistencies
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/k_address_space_info.cpp4
-rw-r--r--src/core/hle/kernel/k_address_space_info.h2
-rw-r--r--src/core/hle/kernel/k_device_address_space.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/k_address_space_info.cpp b/src/core/hle/kernel/k_address_space_info.cpp
index 97972ebae..c36eb5dc4 100644
--- a/src/core/hle/kernel/k_address_space_info.cpp
+++ b/src/core/hle/kernel/k_address_space_info.cpp
@@ -44,11 +44,11 @@ const KAddressSpaceInfo& GetAddressSpaceInfo(size_t width, KAddressSpaceInfo::Ty
44 44
45} // namespace 45} // namespace
46 46
47uintptr_t KAddressSpaceInfo::GetAddressSpaceStart(size_t width, KAddressSpaceInfo::Type type) { 47std::size_t KAddressSpaceInfo::GetAddressSpaceStart(size_t width, KAddressSpaceInfo::Type type) {
48 return GetAddressSpaceInfo(width, type).address; 48 return GetAddressSpaceInfo(width, type).address;
49} 49}
50 50
51size_t KAddressSpaceInfo::GetAddressSpaceSize(size_t width, KAddressSpaceInfo::Type type) { 51std::size_t KAddressSpaceInfo::GetAddressSpaceSize(size_t width, KAddressSpaceInfo::Type type) {
52 return GetAddressSpaceInfo(width, type).size; 52 return GetAddressSpaceInfo(width, type).size;
53} 53}
54 54
diff --git a/src/core/hle/kernel/k_address_space_info.h b/src/core/hle/kernel/k_address_space_info.h
index 69e9d77f2..9a26f6b90 100644
--- a/src/core/hle/kernel/k_address_space_info.h
+++ b/src/core/hle/kernel/k_address_space_info.h
@@ -18,7 +18,7 @@ struct KAddressSpaceInfo final {
18 Count, 18 Count,
19 }; 19 };
20 20
21 static u64 GetAddressSpaceStart(std::size_t width, Type type); 21 static std::size_t GetAddressSpaceStart(std::size_t width, Type type);
22 static std::size_t GetAddressSpaceSize(std::size_t width, Type type); 22 static std::size_t GetAddressSpaceSize(std::size_t width, Type type);
23 23
24 const std::size_t bit_width{}; 24 const std::size_t bit_width{};
diff --git a/src/core/hle/kernel/k_device_address_space.h b/src/core/hle/kernel/k_device_address_space.h
index 4709df995..b4a014c38 100644
--- a/src/core/hle/kernel/k_device_address_space.h
+++ b/src/core/hle/kernel/k_device_address_space.h
@@ -21,9 +21,9 @@ public:
21 ~KDeviceAddressSpace(); 21 ~KDeviceAddressSpace();
22 22
23 Result Initialize(u64 address, u64 size); 23 Result Initialize(u64 address, u64 size);
24 void Finalize(); 24 void Finalize() override;
25 25
26 bool IsInitialized() const { 26 bool IsInitialized() const override {
27 return m_is_initialized; 27 return m_is_initialized;
28 } 28 }
29 static void PostDestroy(uintptr_t arg) {} 29 static void PostDestroy(uintptr_t arg) {}