From e242f2dc646f41e9162aaaf74e057ce39fcb92df Mon Sep 17 00:00:00 2001 From: Jim Flynn 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 --- src/armnn/LayerSupport.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/armnn/LayerSupport.cpp') diff --git a/src/armnn/LayerSupport.cpp b/src/armnn/LayerSupport.cpp index 5867fab039..5324e5f2fe 100644 --- a/src/armnn/LayerSupport.cpp +++ b/src/armnn/LayerSupport.cpp @@ -137,9 +137,9 @@ bool IsConcatSupported(const BackendId& backend, char* reasonIfUnsupported, size_t reasonIfUnsupportedMaxLength) { - ARMNN_NO_DEPRECATE_WARN_BEGIN - return IsMergerSupported(backend, inputs, output, descriptor, reasonIfUnsupported, reasonIfUnsupportedMaxLength); - ARMNN_NO_DEPRECATE_WARN_END + BOOST_ASSERT(inputs.size() > 0); + + FORWARD_LAYER_SUPPORT_FUNC(backend, IsConcatSupported, inputs, output, descriptor); } bool IsConstantSupported(const BackendId& backend, -- cgit v1.2.1