From df3103622b7de05f4e35b22a2c94b4a46eab4efc Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Wed, 14 Nov 2018 13:16:56 +0000 Subject: COMPMID-1088: Use IMemoryRegion in interfaces where possible -Simplifies import memory interface -Changes the used of void** handles with appropriate interfaces. Change-Id: I5918c855c11f46352058864623336b352162a4b7 --- arm_compute/runtime/Memory.h | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'arm_compute/runtime/Memory.h') diff --git a/arm_compute/runtime/Memory.h b/arm_compute/runtime/Memory.h index 2dadccf254..6f5254a689 100644 --- a/arm_compute/runtime/Memory.h +++ b/arm_compute/runtime/Memory.h @@ -24,6 +24,8 @@ #ifndef __ARM_COMPUTE_MEMORY_H__ #define __ARM_COMPUTE_MEMORY_H__ +#include "arm_compute/runtime/IMemory.h" + #include "arm_compute/runtime/IMemoryRegion.h" #include @@ -32,7 +34,7 @@ namespace arm_compute { /** CPU implementation of memory object */ -class Memory +class Memory : public IMemory { public: /** Default Constructor */ @@ -58,24 +60,16 @@ public: Memory(Memory &&) noexcept = default; /** Allow instances of this class to be move assigned */ Memory &operator=(Memory &&) noexcept = default; - /** Region accessor - * - * @return Memory region - */ - IMemoryRegion *region(); - /** Region accessor - * - * @return Memory region - */ - IMemoryRegion *region() const; -private: - /** Creates empty region */ - void create_empty_region(); + // Inherited methods overridden: + IMemoryRegion *region() final; + IMemoryRegion *region() const final; + void set_region(IMemoryRegion *region) final; + void set_owned_region(std::unique_ptr region) final; private: IMemoryRegion *_region; std::shared_ptr _region_owned; }; -} +} // namespace arm_compute #endif /* __ARM_COMPUTE_MEMORY_H__ */ -- cgit v1.2.1