commit e242f2dc646f41e9162aaaf74e057ce39fcb92df
author Jim Flynn <jim.flynn@arm.com> Wed May 22 14:24:13 2019 +0100
committer Jim Flynn <jim.flynn@arm.com> Tue May 28 17:50:33 2019 +0100
tree d6c49b559c34d1d306b1e901501dded1c18f71c5
parent 2f2778f36e59537bbd47fb8b21e73c6c5a949584

IVGCVSW-3119 Rename MergerLayer to ConcatLayer

!android-nn-driver:1210

Change-Id: I940b3b9e421c92bfd55ae996f7bc54ac077f2604
Signed-off-by: Jim Flynn <jim.flynn@arm.com>

src/backends/cl/ClWorkloadFactory.hpp

diff --git a/src/backends/cl/ClWorkloadFactory.hpp b/src/backends/cl/ClWorkloadFactory.hpp
index e00672f..2722171 100644
--- a/src/backends/cl/ClWorkloadFactory.hpp
+++ b/src/backends/cl/ClWorkloadFactory.hpp
@@ -97,7 +97,7 @@
     std::unique_ptr<IWorkload> CreateL2Normalization(const L2NormalizationQueueDescriptor& descriptor,
                                                      const WorkloadInfo& info) const override;
 
-    std::unique_ptr<IWorkload> CreateConcat(const MergerQueueDescriptor& descriptor,
+    std::unique_ptr<IWorkload> CreateConcat(const ConcatQueueDescriptor& descriptor,
                                             const WorkloadInfo& info) const override;
 
     std::unique_ptr<IWorkload> CreateConstant(const ConstantQueueDescriptor& descriptor,