From e242f2dc646f41e9162aaaf74e057ce39fcb92df Mon Sep 17 00:00:00 2001
From: Jim Flynn <jim.flynn@arm.com>
Date: Wed, 22 May 2019 14:24:13 +0100
Subject: IVGCVSW-3119 Rename MergerLayer to ConcatLayer

!android-nn-driver:1210

Change-Id: I940b3b9e421c92bfd55ae996f7bc54ac077f2604
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
---
 src/armnn/DynamicQuantizationVisitor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/armnn/DynamicQuantizationVisitor.cpp')

diff --git a/src/armnn/DynamicQuantizationVisitor.cpp b/src/armnn/DynamicQuantizationVisitor.cpp
index 9b33fb7642..d4e0c9006c 100644
--- a/src/armnn/DynamicQuantizationVisitor.cpp
+++ b/src/armnn/DynamicQuantizationVisitor.cpp
@@ -242,8 +242,8 @@ void DynamicQuantizationVisitor::VisitConstantLayer(const IConnectableLayer* lay
     SetRange(layer, 0, min, max);
 }
 
-void DynamicQuantizationVisitor::VisitMergerLayer(const IConnectableLayer* layer,
-                                                  const OriginsDescriptor& mergerDescriptor,
+void DynamicQuantizationVisitor::VisitConcatLayer(const IConnectableLayer* layer,
+                                                  const ConcatDescriptor& originsDescriptor,
                                                   const char* name)
 {
     float min = std::numeric_limits<float>::max();
-- 
cgit v1.2.1