commit c84e45d933a9b45810a3bb88f6873f4eddca0975
author Jan Eilers <jan.eilers@arm.com> Wed Aug 19 14:14:36 2020 +0100
committer TeresaARM <teresa.charlinreyes@arm.com> Wed Aug 19 18:02:57 2020 +0000
tree 9692d2fd8b58a14466382433b5eec8c6c4e284de
parent a2493a0483f19fe9654be63a15badfb0834aaff6

IVGCVSW-5208 Wrap SampleDynamicBackend in own namespace

 * to prevent name clashes with armnn

Signed-off-by: Jan Eilers <jan.eilers@arm.com>
Change-Id: I10b394d47e58cec45bacd489938ee048b7c9776e

src/dynamic/sample/SampleDynamicTensorHandleFactory.hpp

diff --git a/src/dynamic/sample/SampleDynamicTensorHandleFactory.hpp b/src/dynamic/sample/SampleDynamicTensorHandleFactory.hpp
index 5f5e880..790eee1 100644
--- a/src/dynamic/sample/SampleDynamicTensorHandleFactory.hpp
+++ b/src/dynamic/sample/SampleDynamicTensorHandleFactory.hpp
@@ -9,36 +9,36 @@
 
 #include <armnn/backends/ITensorHandleFactory.hpp>
 
-namespace armnn
+namespace sdb // sample dynamic backend
 {
 
 constexpr const char * SampleDynamicTensorHandleFactoryId() { return "Arm/SampleDynamic/TensorHandleFactory"; }
 
-class SampleDynamicTensorHandleFactory : public ITensorHandleFactory
+class SampleDynamicTensorHandleFactory : public armnn::ITensorHandleFactory
 {
 
 public:
     SampleDynamicTensorHandleFactory(std::shared_ptr<SampleMemoryManager> mgr)
     : m_MemoryManager(mgr),
-      m_ImportFlags(static_cast<MemorySourceFlags>(MemorySource::Malloc)),
-      m_ExportFlags(static_cast<MemorySourceFlags>(MemorySource::Malloc))
+      m_ImportFlags(static_cast<armnn::MemorySourceFlags>(armnn::MemorySource::Malloc)),
+      m_ExportFlags(static_cast<armnn::MemorySourceFlags>(armnn::MemorySource::Malloc))
     {}
 
-    std::unique_ptr<ITensorHandle> CreateSubTensorHandle(ITensorHandle& parent,
-                                                         TensorShape const& subTensorShape,
-                                                         unsigned int const* subTensorOrigin) const override;
+    std::unique_ptr<armnn::ITensorHandle> CreateSubTensorHandle(armnn::ITensorHandle& parent,
+                                                                armnn::TensorShape const& subTensorShape,
+                                                                unsigned int const* subTensorOrigin) const override;
 
-    std::unique_ptr<ITensorHandle> CreateTensorHandle(const TensorInfo& tensorInfo) const override;
+    std::unique_ptr<armnn::ITensorHandle> CreateTensorHandle(const armnn::TensorInfo& tensorInfo) const override;
 
-    std::unique_ptr<ITensorHandle> CreateTensorHandle(const TensorInfo& tensorInfo,
-                                                      DataLayout dataLayout) const override;
+    std::unique_ptr<armnn::ITensorHandle> CreateTensorHandle(const armnn::TensorInfo& tensorInfo,
+                                                             armnn::DataLayout dataLayout) const override;
 
-    std::unique_ptr<ITensorHandle> CreateTensorHandle(const TensorInfo& tensorInfo,
-                                                      const bool IsMemoryManaged) const override;
+    std::unique_ptr<armnn::ITensorHandle> CreateTensorHandle(const armnn::TensorInfo& tensorInfo,
+                                                             const bool IsMemoryManaged) const override;
 
-    std::unique_ptr<ITensorHandle> CreateTensorHandle(const TensorInfo& tensorInfo,
-                                                      DataLayout dataLayout,
-                                                      const bool IsMemoryManaged) const override;
+    std::unique_ptr<armnn::ITensorHandle> CreateTensorHandle(const armnn::TensorInfo& tensorInfo,
+                                                             armnn::DataLayout dataLayout,
+                                                             const bool IsMemoryManaged) const override;
 
     static const FactoryId& GetIdStatic();
 
@@ -46,15 +46,15 @@
 
     bool SupportsSubTensors() const override;
 
-    MemorySourceFlags GetExportFlags() const override;
+    armnn::MemorySourceFlags GetExportFlags() const override;
 
-    MemorySourceFlags GetImportFlags() const override;
+    armnn::MemorySourceFlags GetImportFlags() const override;
 
 private:
     mutable std::shared_ptr<SampleMemoryManager> m_MemoryManager;
-    MemorySourceFlags m_ImportFlags;
-    MemorySourceFlags m_ExportFlags;
+    armnn::MemorySourceFlags m_ImportFlags;
+    armnn::MemorySourceFlags m_ExportFlags;
 };
 
-} // namespace armnn
+} // namespace sdb