diff options
| author | 2019-04-04 12:16:56 -0400 | |
|---|---|---|
| committer | 2019-04-04 12:19:44 -0400 | |
| commit | 5b0a9f8ba8452373a4bf0a84d1c5c3734bd04d3c (patch) | |
| tree | 0d7b041cdfabd0e7317b3dc28d52f0ebf9d0445e | |
| parent | Merge pull request #2330 from lioncash/pragma (diff) | |
| download | yuzu-5b0a9f8ba8452373a4bf0a84d1c5c3734bd04d3c.tar.gz yuzu-5b0a9f8ba8452373a4bf0a84d1c5c3734bd04d3c.tar.xz yuzu-5b0a9f8ba8452373a4bf0a84d1c5c3734bd04d3c.zip | |
core: Add missing override specifiers where applicable
Applies the override specifier where applicable. In the case of
destructors that are defaulted in their definition, they can
simply be removed.
This also removes the unnecessary inclusions being done in audin_u and
audrec_u, given their close proximity.
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 1 | ||||
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.h | 4 | ||||
| -rw-r--r-- | src/core/arm/unicorn/arm_unicorn.h | 2 | ||||
| -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 | ||||
| -rw-r--r-- | src/core/loader/xci.h | 2 |
13 files changed, 9 insertions, 23 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 4fdc12f11..f64e4c6a6 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp | |||
| @@ -26,7 +26,6 @@ using Vector = Dynarmic::A64::Vector; | |||
| 26 | class ARM_Dynarmic_Callbacks : public Dynarmic::A64::UserCallbacks { | 26 | class ARM_Dynarmic_Callbacks : public Dynarmic::A64::UserCallbacks { |
| 27 | public: | 27 | public: |
| 28 | explicit ARM_Dynarmic_Callbacks(ARM_Dynarmic& parent) : parent(parent) {} | 28 | explicit ARM_Dynarmic_Callbacks(ARM_Dynarmic& parent) : parent(parent) {} |
| 29 | ~ARM_Dynarmic_Callbacks() = default; | ||
| 30 | 29 | ||
| 31 | u8 MemoryRead8(u64 vaddr) override { | 30 | u8 MemoryRead8(u64 vaddr) override { |
| 32 | return Memory::Read8(vaddr); | 31 | return Memory::Read8(vaddr); |
diff --git a/src/core/arm/dynarmic/arm_dynarmic.h b/src/core/arm/dynarmic/arm_dynarmic.h index aada1e862..81e0b4ac0 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.h +++ b/src/core/arm/dynarmic/arm_dynarmic.h | |||
| @@ -29,7 +29,7 @@ class ARM_Dynarmic final : public ARM_Interface { | |||
| 29 | public: | 29 | public: |
| 30 | ARM_Dynarmic(Timing::CoreTiming& core_timing, ExclusiveMonitor& exclusive_monitor, | 30 | ARM_Dynarmic(Timing::CoreTiming& core_timing, ExclusiveMonitor& exclusive_monitor, |
| 31 | std::size_t core_index); | 31 | std::size_t core_index); |
| 32 | ~ARM_Dynarmic(); | 32 | ~ARM_Dynarmic() override; |
| 33 | 33 | ||
| 34 | void MapBackingMemory(VAddr address, std::size_t size, u8* memory, | 34 | void MapBackingMemory(VAddr address, std::size_t size, u8* memory, |
| 35 | Kernel::VMAPermission perms) override; | 35 | Kernel::VMAPermission perms) override; |
| @@ -76,7 +76,7 @@ private: | |||
| 76 | class DynarmicExclusiveMonitor final : public ExclusiveMonitor { | 76 | class DynarmicExclusiveMonitor final : public ExclusiveMonitor { |
| 77 | public: | 77 | public: |
| 78 | explicit DynarmicExclusiveMonitor(std::size_t core_count); | 78 | explicit DynarmicExclusiveMonitor(std::size_t core_count); |
| 79 | ~DynarmicExclusiveMonitor(); | 79 | ~DynarmicExclusiveMonitor() override; |
| 80 | 80 | ||
| 81 | void SetExclusive(std::size_t core_index, VAddr addr) override; | 81 | void SetExclusive(std::size_t core_index, VAddr addr) override; |
| 82 | void ClearExclusive() override; | 82 | void ClearExclusive() override; |
diff --git a/src/core/arm/unicorn/arm_unicorn.h b/src/core/arm/unicorn/arm_unicorn.h index dbd6955ea..f313b7394 100644 --- a/src/core/arm/unicorn/arm_unicorn.h +++ b/src/core/arm/unicorn/arm_unicorn.h | |||
| @@ -18,7 +18,7 @@ namespace Core { | |||
| 18 | class ARM_Unicorn final : public ARM_Interface { | 18 | class ARM_Unicorn final : public ARM_Interface { |
| 19 | public: | 19 | public: |
| 20 | explicit ARM_Unicorn(Timing::CoreTiming& core_timing); | 20 | explicit ARM_Unicorn(Timing::CoreTiming& core_timing); |
| 21 | ~ARM_Unicorn(); | 21 | ~ARM_Unicorn() override; |
| 22 | 22 | ||
| 23 | void MapBackingMemory(VAddr address, std::size_t size, u8* memory, | 23 | void MapBackingMemory(VAddr address, std::size_t size, u8* memory, |
| 24 | Kernel::VMAPermission perms) override; | 24 | Kernel::VMAPermission perms) override; |
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 af40a1815..de1a40689 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 566cd6006..f73891b6e 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 { |
diff --git a/src/core/loader/xci.h b/src/core/loader/xci.h index d6995b61e..436f7387c 100644 --- a/src/core/loader/xci.h +++ b/src/core/loader/xci.h | |||
| @@ -22,7 +22,7 @@ class AppLoader_NCA; | |||
| 22 | class AppLoader_XCI final : public AppLoader { | 22 | class AppLoader_XCI final : public AppLoader { |
| 23 | public: | 23 | public: |
| 24 | explicit AppLoader_XCI(FileSys::VirtualFile file); | 24 | explicit AppLoader_XCI(FileSys::VirtualFile file); |
| 25 | ~AppLoader_XCI(); | 25 | ~AppLoader_XCI() override; |
| 26 | 26 | ||
| 27 | /** | 27 | /** |
| 28 | * Returns the type of the file | 28 | * Returns the type of the file |