commit 9e80cd2195e64902951c3207b0d2aa82fe77c61f
author Matthew Bentham <matthew.bentham@arm.com> Fri May 03 22:54:36 2019 +0100
committer Matteo Martincigh <matteo.martincigh@arm.com> Tue May 07 08:24:25 2019 +0000
tree 659baacd57a99854817f5556224ee44a00beaff9
parent 912b36224f19952663ebd3edc2a69d9031662fd1

IVGCVSW-2911 More Q compatiblity

Changes needed to RequestThread and ArmnnPreparedModel
to compile in the Q environment

Change-Id: Ib072afa1fe6a6a1b0931df79cec76cfac8b21f0c
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>

ArmnnPreparedModel.cpp

diff --git a/ArmnnPreparedModel.cpp b/ArmnnPreparedModel.cpp
index edb1c93..f183caf 100644
--- a/ArmnnPreparedModel.cpp
+++ b/ArmnnPreparedModel.cpp
@@ -27,7 +27,7 @@
 {
 using namespace armnn_driver;
 
-void NotifyCallbackAndCheck(const ::android::sp<IExecutionCallback>& callback, ErrorStatus errorStatus,
+void NotifyCallbackAndCheck(const ::android::sp<V1_0::IExecutionCallback>& callback, ErrorStatus errorStatus,
                             std::string callingFunction)
 {
     Return<void> returned = callback->notify(errorStatus);
@@ -141,7 +141,7 @@
 
 template<typename HalVersion>
 Return<ErrorStatus> ArmnnPreparedModel<HalVersion>::execute(const Request& request,
-                                                            const ::android::sp<IExecutionCallback>& callback)
+                                                            const ::android::sp<V1_0::IExecutionCallback>& callback)
 {
     ALOGV("ArmnnPreparedModel::execute(): %s", GetModelSummary(m_Model).c_str());
     m_RequestCount++;
@@ -230,7 +230,7 @@
         std::shared_ptr<std::vector<::android::nn::RunTimePoolInfo>>& pMemPools,
         std::shared_ptr<armnn::InputTensors>& pInputTensors,
         std::shared_ptr<armnn::OutputTensors>& pOutputTensors,
-        const ::android::sp<IExecutionCallback>& callback)
+        const ::android::sp<V1_0::IExecutionCallback>& callback)
 {
     ALOGV("ArmnnPreparedModel::ExecuteGraph(...)");