commit b9cb84484b29ca588661b542bf8f93a8fb14edc1
author Derek Lamberti <derek.lamberti@arm.com> Thu Nov 28 13:34:48 2019 +0000
committer Derek Lamberti <derek.lamberti@arm.com> Fri Nov 29 11:25:10 2019 +0000
tree 81026c0ecc081a90a23ada8ce1e7b8b38c7e1e43
parent 00d6ed157bb83330da5dbfb3737b0e5dcd3fbeb0

Catch std::exception instead of armnn::Exception

Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
Change-Id: I89ae4f3b607ccb83f1bf16e085c805d5fc5cf89c

ArmnnPreparedModel_1_2.cpp

diff --git a/ArmnnPreparedModel_1_2.cpp b/ArmnnPreparedModel_1_2.cpp
index a7997c7..a1e481d 100644
--- a/ArmnnPreparedModel_1_2.cpp
+++ b/ArmnnPreparedModel_1_2.cpp
@@ -314,9 +314,9 @@
             pOutputTensors->emplace_back(i, outputTensor);
         }
     }
-    catch (armnn::Exception& e)
+    catch (std::exception& e)
     {
-        ALOGW("armnn::Exception caught while preparing for EnqueueWorkload: %s", e.what());
+        ALOGW("Exception caught while preparing for EnqueueWorkload: %s", e.what());
         cb(ErrorStatus::GENERAL_FAILURE, {}, g_NoTiming);
         return Void();
     }
@@ -345,9 +345,9 @@
             return Void();
         }
     }
-    catch (armnn::Exception& e)
+    catch (std::exception& e)
     {
-        ALOGW("armnn::Exception caught from EnqueueWorkload: %s", e.what());
+        ALOGW("Exception caught from EnqueueWorkload: %s", e.what());
         cb(ErrorStatus::GENERAL_FAILURE, {}, g_NoTiming);
         return Void();
     }
@@ -531,9 +531,9 @@
             return;
         }
     }
-    catch (armnn::Exception& e)
+    catch (std::exception& e)
     {
-        ALOGW("armnn::Exception caught from EnqueueWorkload: %s", e.what());
+        ALOGW("Exception caught from EnqueueWorkload: %s", e.what());
         cb.callback(ErrorStatus::GENERAL_FAILURE, {}, g_NoTiming,
                 "ArmnnPreparedModel_1_2::ExecuteGraph");
         return;
@@ -594,9 +594,9 @@
             return false;
         }
     }
-    catch (armnn::Exception& e)
+    catch (std::exception& e)
     {
-        ALOGW("ExecuteWithDummyInputs: armnn::Exception caught from EnqueueWorkload: %s", e.what());
+        ALOGW("ExecuteWithDummyInputs: Exception caught from EnqueueWorkload: %s", e.what());
         return false;
     }
     return true;
@@ -707,9 +707,9 @@
             }
         }
     }
-    catch (armnn::Exception& e)
+    catch (std::exception& e)
     {
-        ALOGW("armnn::Exception caught while preparing for EnqueueWorkload: %s", e.what());
+        ALOGW("Exception caught while preparing for EnqueueWorkload: %s", e.what());
         callback(ErrorStatus::GENERAL_FAILURE, {}, g_NoTiming, "ArmnnPreparedModel_1_2::execute");
         return ErrorStatus::GENERAL_FAILURE;
     }