diff options
| author | Derek Lamberti <derek.lamberti@arm.com> | 2020-01-21 13:43:21 +0000 |
|---|---|---|
| committer | Derek Lamberti <derek.lamberti@arm.com> | 2020-01-21 13:43:21 +0000 |
| commit | 41e92b085aa543cba57610135168185632ed0799 (patch) | |
| tree | 324d3528108fef62fe6e06487ec61051589243b7 | |
| parent | e9d4220f84c14c57503958a3766a62c9bb0b254e (diff) | |
| download | armnn-41e92b085aa543cba57610135168185632ed0799.tar.gz | |
IVGCVSW-4364 Only apply deprecated attribute where available
Change-Id: Ifde03ea6d9057db0949acad95560be8852c05f73
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
| -rw-r--r-- | include/armnn/Deprecated.hpp | 10 | ||||
| -rw-r--r-- | include/armnn/Types.hpp | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/include/armnn/Deprecated.hpp b/include/armnn/Deprecated.hpp index fbe0cf9055..73871772bc 100644 --- a/include/armnn/Deprecated.hpp +++ b/include/armnn/Deprecated.hpp @@ -40,4 +40,12 @@ func; \ ARMNN_NO_DEPRECATE_WARN_END #define ARMNN_DEPRECATED [[deprecated]] -#define ARMNN_DEPRECATED_MSG(message) [[deprecated(message)]]
\ No newline at end of file +#define ARMNN_DEPRECATED_MSG(message) [[deprecated(message)]] + +#if defined(__GNUC__) && (__GNUC__ <= 6) +# define ARMNN_DEPRECATED_ENUM +# define ARMNN_DEPRECATED_ENUM_MSG(message) +#else +# define ARMNN_DEPRECATED_ENUM ARMNN_DEPRECATED +# define ARMNN_DEPRECATED_ENUM_MSG(message) ARMNN_DEPRECATED_MSG(message) +#endif
\ No newline at end of file diff --git a/include/armnn/Types.hpp b/include/armnn/Types.hpp index e5a7fc0987..5ea214e1dc 100644 --- a/include/armnn/Types.hpp +++ b/include/armnn/Types.hpp @@ -40,8 +40,8 @@ enum class DataType QuantizedSymm8PerAxis = 6, QSymmS8 = 7, - QuantisedAsymm8 ARMNN_DEPRECATED_MSG("Use DataType::QAsymmU8 instead.") = QAsymmU8, - QuantisedSymm16 ARMNN_DEPRECATED_MSG("Use DataType::QSymmS16 instead.") = QSymmS16 + QuantisedAsymm8 ARMNN_DEPRECATED_ENUM_MSG("Use DataType::QAsymmU8 instead.") = QAsymmU8, + QuantisedSymm16 ARMNN_DEPRECATED_ENUM_MSG("Use DataType::QSymmS16 instead.") = QSymmS16 }; enum class DataLayout |