From fc598e15ff30bc375c95c9536d4a56662d867926 Mon Sep 17 00:00:00 2001
From: Matteo Martincigh <matteo.martincigh@arm.com>
Date: Tue, 14 May 2019 10:36:13 +0100
Subject: Use the new deprecation API

 * Used the new ARMNN_DEPRECATED_MSG macro instead of @deprecated
 * Refactored the code to no longer use the deprecated methods where
   applicable

!android-nn-driver:1126

Change-Id: Ib0578d3d6fc5a763f5fb922f67ba91fafc7796f6
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
---
 include/armnn/INetwork.hpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/armnn/INetwork.hpp b/include/armnn/INetwork.hpp
index bae6e94955..ef8524377d 100644
--- a/include/armnn/INetwork.hpp
+++ b/include/armnn/INetwork.hpp
@@ -11,6 +11,7 @@
 #include <armnn/Optional.hpp>
 #include <armnn/TensorFwd.hpp>
 #include <armnn/Types.hpp>
+#include <armnn/Deprecated.hpp>
 
 #include <memory>
 #include <vector>
@@ -121,12 +122,12 @@ public:
                                                      const Optional<ConstTensor>& biases,
                                                      const char* name = nullptr) = 0;
 
-    /// @deprecated
+    ARMNN_DEPRECATED_MSG("This AddConvolution2dLayer overload is deprecated")
     virtual IConnectableLayer* AddConvolution2dLayer(const Convolution2dDescriptor& convolution2dDescriptor,
                                                      const ConstTensor& weights,
                                                      const char* name = nullptr) = 0;
 
-    /// @deprecated
+    ARMNN_DEPRECATED_MSG("This AddConvolution2dLayer overload is deprecated")
     virtual IConnectableLayer* AddConvolution2dLayer(const Convolution2dDescriptor& convolution2dDescriptor,
                                                      const ConstTensor& weights,
                                                      const ConstTensor& biases,
@@ -144,13 +145,13 @@ public:
         const Optional<ConstTensor>& biases,
         const char* name = nullptr) = 0;
 
-    /// @deprecated
+    ARMNN_DEPRECATED_MSG("This AddDepthwiseConvolution2dLayer overload is deprecated")
     virtual IConnectableLayer* AddDepthwiseConvolution2dLayer(
         const DepthwiseConvolution2dDescriptor& convolution2dDescriptor,
         const ConstTensor& weights,
         const char* name = nullptr) = 0;
 
-    /// @deprecated
+    ARMNN_DEPRECATED_MSG("This AddDepthwiseConvolution2dLayer overload is deprecated")
     virtual IConnectableLayer* AddDepthwiseConvolution2dLayer(
         const DepthwiseConvolution2dDescriptor& convolution2dDescriptor,
         const ConstTensor& weights,
@@ -182,12 +183,12 @@ public:
                                                       const Optional<ConstTensor>& biases,
                                                       const char* name = nullptr) = 0;
 
-    /// @deprecated
+    ARMNN_DEPRECATED_MSG("This AddFullyConnectedLayer overload is deprecated")
     virtual IConnectableLayer* AddFullyConnectedLayer(const FullyConnectedDescriptor& fullyConnectedDescriptor,
                                                       const ConstTensor& weights,
                                                       const char* name = nullptr) = 0;
 
-    /// @deprecated
+    ARMNN_DEPRECATED_MSG("This AddFullyConnectedLayer overload is deprecated")
     virtual IConnectableLayer* AddFullyConnectedLayer(const FullyConnectedDescriptor& fullyConnectedDescriptor,
                                                       const ConstTensor& weights,
                                                       const ConstTensor& biases,
-- 
cgit v1.2.1