commit 8b287c23f5141102555ba869a34397ec720a3e4f
author Matteo Martincigh <matteo.martincigh@arm.com> Fri Sep 07 09:25:10 2018 +0100
committer Matthew Bentham <matthew.bentham@arm.com> Tue Sep 18 12:40:42 2018 +0100
tree 4a60d9c806669aad06816414601ac532946d6878
parent 77605826a353981d41f0ee346850d411770535f8

IVGCVSW-1806 More Android NN Driver refactoring

 * Changed #if defined to #ifdef
 * Simplified the Android ML namespace resolution
 * Fixed the relative path in some include directives

Change-Id: I46e46faff98559c8042c1a4b8b82007f462df57d

ModelToINetworkConverter.cpp

diff --git a/ModelToINetworkConverter.cpp b/ModelToINetworkConverter.cpp
index 1a63280..8bf84e9 100644
--- a/ModelToINetworkConverter.cpp
+++ b/ModelToINetworkConverter.cpp
@@ -167,7 +167,7 @@
 
 template class ModelToINetworkConverter<hal_1_0::HalPolicy>;
 
-#if defined(ARMNN_ANDROID_NN_V1_1)
+#ifdef ARMNN_ANDROID_NN_V1_1
 template class ModelToINetworkConverter<hal_1_1::HalPolicy>;
 #endif