commit 49336421f4a117cf5b4cb7fdff6ddb58d3a4317e
author android-build-prod (mdb) <android-build-team-robot@google.com> Fri Apr 27 11:22:45 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Apr 27 11:22:45 2018 -0700
tree 5c5b98e785e16a55b05d35a6cde3cc4b1254737d
parent 9ace0030155ea599435aba2c3ee6a71f31fae7a4
parent 030935b4a02c0950152432915c84ffb6826c6ff4

Merge "Replace hidl_enum_{iterator -> range}." am: 71d7d91ba8
am: 030935b4a0

Change-Id: I114e81425ba04519981121bb511732090fcdbd00

neuralnetworks/1.0/vts/functional/ValidateModel.cpp

diff --git a/neuralnetworks/1.0/vts/functional/ValidateModel.cpp b/neuralnetworks/1.0/vts/functional/ValidateModel.cpp
index 4f0697e..b813c39 100644
--- a/neuralnetworks/1.0/vts/functional/ValidateModel.cpp
+++ b/neuralnetworks/1.0/vts/functional/ValidateModel.cpp
@@ -283,7 +283,7 @@
         if (mutateOperationOperandTypeSkip(operand, model)) {
             continue;
         }
-        for (OperandType invalidOperandType : hidl_enum_iterator<OperandType>{}) {
+        for (OperandType invalidOperandType : hidl_enum_range<OperandType>{}) {
             // Do not test OEM types
             if (invalidOperandType == model.operands[operand].type ||
                 invalidOperandType == OperandType::OEM ||

neuralnetworks/1.1/vts/functional/ValidateModel.cpp

diff --git a/neuralnetworks/1.1/vts/functional/ValidateModel.cpp b/neuralnetworks/1.1/vts/functional/ValidateModel.cpp
index 3aa55f8..d6c6533 100644
--- a/neuralnetworks/1.1/vts/functional/ValidateModel.cpp
+++ b/neuralnetworks/1.1/vts/functional/ValidateModel.cpp
@@ -299,7 +299,7 @@
         if (mutateOperationOperandTypeSkip(operand, model)) {
             continue;
         }
-        for (OperandType invalidOperandType : hidl_enum_iterator<OperandType>{}) {
+        for (OperandType invalidOperandType : hidl_enum_range<OperandType>{}) {
             // Do not test OEM types
             if (invalidOperandType == model.operands[operand].type ||
                 invalidOperandType == OperandType::OEM ||