From c84e45d933a9b45810a3bb88f6873f4eddca0975 Mon Sep 17 00:00:00 2001
From: Jan Eilers <jan.eilers@arm.com>
Date: Wed, 19 Aug 2020 14:14:36 +0100
Subject: 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
---
 .../sample/SampleDynamicWorkloadFactory.hpp        | 44 ++++++++++++----------
 1 file changed, 24 insertions(+), 20 deletions(-)

(limited to 'src/dynamic/sample/SampleDynamicWorkloadFactory.hpp')

diff --git a/src/dynamic/sample/SampleDynamicWorkloadFactory.hpp b/src/dynamic/sample/SampleDynamicWorkloadFactory.hpp
index a80aa83215..4a2b657f5d 100644
--- a/src/dynamic/sample/SampleDynamicWorkloadFactory.hpp
+++ b/src/dynamic/sample/SampleDynamicWorkloadFactory.hpp
@@ -9,11 +9,11 @@
 #include <armnn/Optional.hpp>
 #include <backendsCommon/WorkloadFactory.hpp>
 
-namespace armnn
+namespace sdb // sample dynamic backend
 {
 
 // Sample Dynamic workload factory.
-class SampleDynamicWorkloadFactory : public IWorkloadFactory
+class SampleDynamicWorkloadFactory : public armnn::IWorkloadFactory
 {
 public:
     explicit SampleDynamicWorkloadFactory(const std::shared_ptr<SampleMemoryManager>& memoryManager);
@@ -21,45 +21,49 @@ public:
 
     ~SampleDynamicWorkloadFactory() {}
 
-    const BackendId& GetBackendId() const override;
+    const armnn::BackendId& GetBackendId() const override;
 
-    static bool IsLayerSupported(const IConnectableLayer& layer,
-                                 Optional<DataType> dataType,
+    static bool IsLayerSupported(const armnn::IConnectableLayer& layer,
+                                 armnn::Optional<armnn::DataType> dataType,
                                  std::string& outReasonIfUnsupported);
 
     bool SupportsSubTensors() const override { return false; }
 
     ARMNN_DEPRECATED_MSG("Use ITensorHandleFactory::CreateSubTensorHandle instead")
-    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
     {
         IgnoreUnused(parent, subTensorShape, subTensorOrigin);
         return nullptr;
     }
 
     ARMNN_DEPRECATED_MSG("Use ITensorHandleFactory::CreateTensorHandle instead")
-    std::unique_ptr<ITensorHandle> CreateTensorHandle(const TensorInfo& tensorInfo,
-                                                      const bool IsMemoryManaged = true) const override;
+    std::unique_ptr<armnn::ITensorHandle> CreateTensorHandle(
+            const armnn::TensorInfo& tensorInfo,
+            const bool IsMemoryManaged = true) const override;
 
     ARMNN_DEPRECATED_MSG("Use ITensorHandleFactory::CreateTensorHandle instead")
-    std::unique_ptr<ITensorHandle> CreateTensorHandle(const TensorInfo& tensorInfo,
-                                                      DataLayout dataLayout,
-                                                      const bool IsMemoryManaged = true) const override;
+    std::unique_ptr<armnn::ITensorHandle> CreateTensorHandle(
+            const armnn::TensorInfo& tensorInfo,
+            armnn::DataLayout dataLayout,
+            const bool IsMemoryManaged = true) const override;
 
-    std::unique_ptr<IWorkload> CreateAddition(const AdditionQueueDescriptor& descriptor,
-                                              const WorkloadInfo& info) const override;
+    std::unique_ptr<armnn::IWorkload> CreateAddition(
+            const armnn::AdditionQueueDescriptor& descriptor,
+            const armnn::WorkloadInfo& info) const override;
 
 
-    std::unique_ptr<IWorkload> CreateInput(const InputQueueDescriptor& descriptor,
-                                           const WorkloadInfo& info) const override;
+    std::unique_ptr<armnn::IWorkload> CreateInput(const armnn::InputQueueDescriptor& descriptor,
+                                                  const armnn::WorkloadInfo& info) const override;
 
-    std::unique_ptr<IWorkload> CreateOutput(const OutputQueueDescriptor& descriptor,
-                                            const WorkloadInfo& info) const override;
+    std::unique_ptr<armnn::IWorkload> CreateOutput(const armnn::OutputQueueDescriptor& descriptor,
+                                                   const armnn::WorkloadInfo& info) const override;
 
 private:
     mutable std::shared_ptr<SampleMemoryManager> m_MemoryManager;
 
 };
 
-} // namespace armnn
+} // namespace sdb
-- 
cgit v1.2.1