diff options
| author | 2019-04-05 23:39:52 -0400 | |
|---|---|---|
| committer | 2019-04-05 23:39:52 -0400 | |
| commit | e86b26cd2b263f3d5d97352f87a31dc65bd3cead (patch) | |
| tree | d4b57743c0b88165e796a126bfd21e9d6090a67a /src/core/hle | |
| parent | Merge pull request #2347 from lioncash/trunc (diff) | |
| parent | core: Add missing override specifiers where applicable (diff) | |
| download | yuzu-e86b26cd2b263f3d5d97352f87a31dc65bd3cead.tar.gz yuzu-e86b26cd2b263f3d5d97352f87a31dc65bd3cead.tar.xz yuzu-e86b26cd2b263f3d5d97352f87a31dc65bd3cead.zip | |
Merge pull request #2334 from lioncash/override
core: Add missing override specifiers where applicable
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/service/audio/audin_u.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/audio/audrec_u.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/nvdrv/devices/nvdisp_disp0.h | 2 | ||||
| -rw-r--r-- | src/core/hle/service/nvdrv/interface.h | 2 | ||||
| -rw-r--r-- | src/core/hle/service/nvdrv/nvmemp.h | 2 | ||||
| -rw-r--r-- | src/core/hle/service/service.h | 2 | ||||
| -rw-r--r-- | src/core/hle/service/set/set_cal.h | 2 | ||||
| -rw-r--r-- | src/core/hle/service/ssl/ssl.cpp | 1 | ||||
| -rw-r--r-- | src/core/hle/service/vi/vi.cpp | 4 |
9 files changed, 5 insertions, 18 deletions
diff --git a/src/core/hle/service/audio/audin_u.cpp b/src/core/hle/service/audio/audin_u.cpp index 088410564..e5daefdde 100644 --- a/src/core/hle/service/audio/audin_u.cpp +++ b/src/core/hle/service/audio/audin_u.cpp | |||
| @@ -2,9 +2,6 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "common/logging/log.h" | ||
| 6 | #include "core/hle/ipc_helpers.h" | ||
| 7 | #include "core/hle/kernel/hle_ipc.h" | ||
| 8 | #include "core/hle/service/audio/audin_u.h" | 5 | #include "core/hle/service/audio/audin_u.h" |
| 9 | 6 | ||
| 10 | namespace Service::Audio { | 7 | namespace Service::Audio { |
| @@ -33,7 +30,6 @@ public: | |||
| 33 | 30 | ||
| 34 | RegisterHandlers(functions); | 31 | RegisterHandlers(functions); |
| 35 | } | 32 | } |
| 36 | ~IAudioIn() = default; | ||
| 37 | }; | 33 | }; |
| 38 | 34 | ||
| 39 | AudInU::AudInU() : ServiceFramework("audin:u") { | 35 | AudInU::AudInU() : ServiceFramework("audin:u") { |
diff --git a/src/core/hle/service/audio/audrec_u.cpp b/src/core/hle/service/audio/audrec_u.cpp index 6956a2e64..1a5aed9ed 100644 --- a/src/core/hle/service/audio/audrec_u.cpp +++ b/src/core/hle/service/audio/audrec_u.cpp | |||
| @@ -2,9 +2,6 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "common/logging/log.h" | ||
| 6 | #include "core/hle/ipc_helpers.h" | ||
| 7 | #include "core/hle/kernel/hle_ipc.h" | ||
| 8 | #include "core/hle/service/audio/audrec_u.h" | 5 | #include "core/hle/service/audio/audrec_u.h" |
| 9 | 6 | ||
| 10 | namespace Service::Audio { | 7 | namespace Service::Audio { |
| @@ -30,7 +27,6 @@ public: | |||
| 30 | 27 | ||
| 31 | RegisterHandlers(functions); | 28 | RegisterHandlers(functions); |
| 32 | } | 29 | } |
| 33 | ~IFinalOutputRecorder() = default; | ||
| 34 | }; | 30 | }; |
| 35 | 31 | ||
| 36 | AudRecU::AudRecU() : ServiceFramework("audrec:u") { | 32 | AudRecU::AudRecU() : ServiceFramework("audrec:u") { |
diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h index ace71169f..12f3ef825 100644 --- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h +++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h | |||
| @@ -18,7 +18,7 @@ class nvmap; | |||
| 18 | class nvdisp_disp0 final : public nvdevice { | 18 | class nvdisp_disp0 final : public nvdevice { |
| 19 | public: | 19 | public: |
| 20 | explicit nvdisp_disp0(std::shared_ptr<nvmap> nvmap_dev); | 20 | explicit nvdisp_disp0(std::shared_ptr<nvmap> nvmap_dev); |
| 21 | ~nvdisp_disp0(); | 21 | ~nvdisp_disp0() override; |
| 22 | 22 | ||
| 23 | u32 ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) override; | 23 | u32 ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) override; |
| 24 | 24 | ||
diff --git a/src/core/hle/service/nvdrv/interface.h b/src/core/hle/service/nvdrv/interface.h index fe311b069..5b4889910 100644 --- a/src/core/hle/service/nvdrv/interface.h +++ b/src/core/hle/service/nvdrv/interface.h | |||
| @@ -17,7 +17,7 @@ namespace Service::Nvidia { | |||
| 17 | class NVDRV final : public ServiceFramework<NVDRV> { | 17 | class NVDRV final : public ServiceFramework<NVDRV> { |
| 18 | public: | 18 | public: |
| 19 | NVDRV(std::shared_ptr<Module> nvdrv, const char* name); | 19 | NVDRV(std::shared_ptr<Module> nvdrv, const char* name); |
| 20 | ~NVDRV(); | 20 | ~NVDRV() override; |
| 21 | 21 | ||
| 22 | private: | 22 | private: |
| 23 | void Open(Kernel::HLERequestContext& ctx); | 23 | void Open(Kernel::HLERequestContext& ctx); |
diff --git a/src/core/hle/service/nvdrv/nvmemp.h b/src/core/hle/service/nvdrv/nvmemp.h index 5a4dfc1f9..6eafb1346 100644 --- a/src/core/hle/service/nvdrv/nvmemp.h +++ b/src/core/hle/service/nvdrv/nvmemp.h | |||
| @@ -11,7 +11,7 @@ namespace Service::Nvidia { | |||
| 11 | class NVMEMP final : public ServiceFramework<NVMEMP> { | 11 | class NVMEMP final : public ServiceFramework<NVMEMP> { |
| 12 | public: | 12 | public: |
| 13 | NVMEMP(); | 13 | NVMEMP(); |
| 14 | ~NVMEMP(); | 14 | ~NVMEMP() override; |
| 15 | 15 | ||
| 16 | private: | 16 | private: |
| 17 | void Cmd0(Kernel::HLERequestContext& ctx); | 17 | void Cmd0(Kernel::HLERequestContext& ctx); |
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h index 830790269..abbfe5524 100644 --- a/src/core/hle/service/service.h +++ b/src/core/hle/service/service.h | |||
| @@ -90,7 +90,7 @@ private: | |||
| 90 | Kernel::HLERequestContext& ctx); | 90 | Kernel::HLERequestContext& ctx); |
| 91 | 91 | ||
| 92 | ServiceFrameworkBase(const char* service_name, u32 max_sessions, InvokerFn* handler_invoker); | 92 | ServiceFrameworkBase(const char* service_name, u32 max_sessions, InvokerFn* handler_invoker); |
| 93 | ~ServiceFrameworkBase(); | 93 | ~ServiceFrameworkBase() override; |
| 94 | 94 | ||
| 95 | void RegisterHandlersBase(const FunctionInfoBase* functions, std::size_t n); | 95 | void RegisterHandlersBase(const FunctionInfoBase* functions, std::size_t n); |
| 96 | void ReportUnimplementedFunction(Kernel::HLERequestContext& ctx, const FunctionInfoBase* info); | 96 | void ReportUnimplementedFunction(Kernel::HLERequestContext& ctx, const FunctionInfoBase* info); |
diff --git a/src/core/hle/service/set/set_cal.h b/src/core/hle/service/set/set_cal.h index 583036eac..a0677e815 100644 --- a/src/core/hle/service/set/set_cal.h +++ b/src/core/hle/service/set/set_cal.h | |||
| @@ -11,7 +11,7 @@ namespace Service::Set { | |||
| 11 | class SET_CAL final : public ServiceFramework<SET_CAL> { | 11 | class SET_CAL final : public ServiceFramework<SET_CAL> { |
| 12 | public: | 12 | public: |
| 13 | explicit SET_CAL(); | 13 | explicit SET_CAL(); |
| 14 | ~SET_CAL(); | 14 | ~SET_CAL() override; |
| 15 | }; | 15 | }; |
| 16 | 16 | ||
| 17 | } // namespace Service::Set | 17 | } // namespace Service::Set |
diff --git a/src/core/hle/service/ssl/ssl.cpp b/src/core/hle/service/ssl/ssl.cpp index f671f355e..f7f87a958 100644 --- a/src/core/hle/service/ssl/ssl.cpp +++ b/src/core/hle/service/ssl/ssl.cpp | |||
| @@ -64,7 +64,6 @@ public: | |||
| 64 | }; | 64 | }; |
| 65 | RegisterHandlers(functions); | 65 | RegisterHandlers(functions); |
| 66 | } | 66 | } |
| 67 | ~ISslContext() = default; | ||
| 68 | 67 | ||
| 69 | private: | 68 | private: |
| 70 | void SetOption(Kernel::HLERequestContext& ctx) { | 69 | void SetOption(Kernel::HLERequestContext& ctx) { |
diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index b77cb495d..4e17249a9 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp | |||
| @@ -498,7 +498,6 @@ public: | |||
| 498 | }; | 498 | }; |
| 499 | RegisterHandlers(functions); | 499 | RegisterHandlers(functions); |
| 500 | } | 500 | } |
| 501 | ~IHOSBinderDriver() = default; | ||
| 502 | 501 | ||
| 503 | private: | 502 | private: |
| 504 | enum class TransactionId { | 503 | enum class TransactionId { |
| @@ -692,7 +691,6 @@ public: | |||
| 692 | }; | 691 | }; |
| 693 | RegisterHandlers(functions); | 692 | RegisterHandlers(functions); |
| 694 | } | 693 | } |
| 695 | ~ISystemDisplayService() = default; | ||
| 696 | 694 | ||
| 697 | private: | 695 | private: |
| 698 | void SetLayerZ(Kernel::HLERequestContext& ctx) { | 696 | void SetLayerZ(Kernel::HLERequestContext& ctx) { |
| @@ -818,7 +816,6 @@ public: | |||
| 818 | }; | 816 | }; |
| 819 | RegisterHandlers(functions); | 817 | RegisterHandlers(functions); |
| 820 | } | 818 | } |
| 821 | ~IManagerDisplayService() = default; | ||
| 822 | 819 | ||
| 823 | private: | 820 | private: |
| 824 | void CloseDisplay(Kernel::HLERequestContext& ctx) { | 821 | void CloseDisplay(Kernel::HLERequestContext& ctx) { |
| @@ -884,7 +881,6 @@ private: | |||
| 884 | class IApplicationDisplayService final : public ServiceFramework<IApplicationDisplayService> { | 881 | class IApplicationDisplayService final : public ServiceFramework<IApplicationDisplayService> { |
| 885 | public: | 882 | public: |
| 886 | explicit IApplicationDisplayService(std::shared_ptr<NVFlinger::NVFlinger> nv_flinger); | 883 | explicit IApplicationDisplayService(std::shared_ptr<NVFlinger::NVFlinger> nv_flinger); |
| 887 | ~IApplicationDisplayService() = default; | ||
| 888 | 884 | ||
| 889 | private: | 885 | private: |
| 890 | enum class ConvertedScaleMode : u64 { | 886 | enum class ConvertedScaleMode : u64 { |