From 329dc9963580bf379bc54e7ed9261841563a7b04 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 15 Apr 2019 13:06:35 -0400 Subject: [PATCH] common/memory_hook: Apply nodiscard where applicable --- src/common/memory_hook.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/common/memory_hook.h b/src/common/memory_hook.h index adaa4c2c5f..ce8b418c87 100644 --- a/src/common/memory_hook.h +++ b/src/common/memory_hook.h @@ -26,21 +26,22 @@ class MemoryHook { public: virtual ~MemoryHook(); - virtual std::optional IsValidAddress(VAddr addr) = 0; + [[nodiscard]] virtual std::optional IsValidAddress(VAddr addr) = 0; - virtual std::optional Read8(VAddr addr) = 0; - virtual std::optional Read16(VAddr addr) = 0; - virtual std::optional Read32(VAddr addr) = 0; - virtual std::optional Read64(VAddr addr) = 0; + [[nodiscard]] virtual std::optional Read8(VAddr addr) = 0; + [[nodiscard]] virtual std::optional Read16(VAddr addr) = 0; + [[nodiscard]] virtual std::optional Read32(VAddr addr) = 0; + [[nodiscard]] virtual std::optional Read64(VAddr addr) = 0; - virtual bool ReadBlock(VAddr src_addr, void* dest_buffer, std::size_t size) = 0; + [[nodiscard]] virtual bool ReadBlock(VAddr src_addr, void* dest_buffer, std::size_t size) = 0; - virtual bool Write8(VAddr addr, u8 data) = 0; - virtual bool Write16(VAddr addr, u16 data) = 0; - virtual bool Write32(VAddr addr, u32 data) = 0; - virtual bool Write64(VAddr addr, u64 data) = 0; + [[nodiscard]] virtual bool Write8(VAddr addr, u8 data) = 0; + [[nodiscard]] virtual bool Write16(VAddr addr, u16 data) = 0; + [[nodiscard]] virtual bool Write32(VAddr addr, u32 data) = 0; + [[nodiscard]] virtual bool Write64(VAddr addr, u64 data) = 0; - virtual bool WriteBlock(VAddr dest_addr, const void* src_buffer, std::size_t size) = 0; + [[nodiscard]] virtual bool WriteBlock(VAddr dest_addr, const void* src_buffer, + std::size_t size) = 0; }; using MemoryHookPointer = std::shared_ptr;