diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-02-27 19:46:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-27 19:46:10 -0500 |
| commit | 22432668be6d34b5a5275bcc631cadf512f36bf9 (patch) | |
| tree | 88aeebd3448ad8fa701914839c0b1f3c876c62ac /src/core/hle/service/hid/hid.h | |
| parent | 50575c317e9d92d5c269bf7920cbbd286d50f476 (diff) | |
| parent | 975186ad4d7c67b22f580986979d0520530b41c3 (diff) | |
Merge pull request #9859 from liamwhite/tmem-use
service: avoid direct pointer access of transfer memory objects
Diffstat (limited to 'src/core/hle/service/hid/hid.h')
| -rw-r--r-- | src/core/hle/service/hid/hid.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index 8fc9ed88a..9ace83129 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h @@ -61,9 +61,15 @@ public: private: template <typename T> void MakeController(HidController controller, u8* shared_memory) { - controllers[static_cast<std::size_t>(controller)] = - std::make_unique<T>(system.HIDCore(), shared_memory); + if constexpr (std::is_constructible_v<T, Core::System&, u8*>) { + controllers[static_cast<std::size_t>(controller)] = + std::make_unique<T>(system, shared_memory); + } else { + controllers[static_cast<std::size_t>(controller)] = + std::make_unique<T>(system.HIDCore(), shared_memory); + } } + template <typename T> void MakeControllerWithServiceContext(HidController controller, u8* shared_memory) { controllers[static_cast<std::size_t>(controller)] = |