From 4de83c5a6a57d0468d9f2f854c94bc4a760b66b6 Mon Sep 17 00:00:00 2001
From: Derek Lamberti <derek.lamberti@arm.com>
Date: Tue, 17 Mar 2020 13:40:18 +0000
Subject: Less code duplication in HAL 1.2

Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
Change-Id: Ic2e8964745a4323efb1e06d466c0699f17a70c55
---
 RequestThread.hpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'RequestThread.hpp')

diff --git a/RequestThread.hpp b/RequestThread.hpp
index 253d104c..79f309a3 100644
--- a/RequestThread.hpp
+++ b/RequestThread.hpp
@@ -21,7 +21,7 @@ namespace armnn_driver
 using TimePoint = std::chrono::steady_clock::time_point;
 static const TimePoint g_Min = std::chrono::steady_clock::time_point::min();
 
-template<template <typename HalVersion> class PreparedModel, typename HalVersion, typename Callback>
+template<template <typename HalVersion> class PreparedModel, typename HalVersion, typename CallbackContext>
 class RequestThread
 {
 public:
@@ -41,7 +41,7 @@ public:
                  std::shared_ptr<std::vector<::android::nn::RunTimePoolInfo>>& memPools,
                  std::shared_ptr<armnn::InputTensors>& inputTensors,
                  std::shared_ptr<armnn::OutputTensors>& outputTensors,
-                 Callback callback);
+                 CallbackContext callbackContext);
 
 private:
     RequestThread(const RequestThread&) = delete;
@@ -54,12 +54,12 @@ private:
                          std::shared_ptr<std::vector<::android::nn::RunTimePoolInfo>>& memPools,
                          std::shared_ptr<armnn::InputTensors>& inputTensors,
                          std::shared_ptr<armnn::OutputTensors>& outputTensors,
-                         Callback callback)
+                         CallbackContext callbackContext)
             : m_Model(model)
             , m_MemPools(memPools)
             , m_InputTensors(inputTensors)
             , m_OutputTensors(outputTensors)
-            , m_Callback(callback)
+            , m_CallbackContext(callbackContext)
         {
         }
 
@@ -67,9 +67,8 @@ private:
         std::shared_ptr<std::vector<::android::nn::RunTimePoolInfo>> m_MemPools;
         std::shared_ptr<armnn::InputTensors> m_InputTensors;
         std::shared_ptr<armnn::OutputTensors> m_OutputTensors;
-        Callback m_Callback;
+        CallbackContext m_CallbackContext;
     };
-
     enum class ThreadMsgType
     {
         EXIT,                   // exit the thread
-- 
cgit v1.2.1