commit 71d7d91ba8ad9d71ec77f64d69f79c84c7e4e2a6
author android-build-prod (mdb) <android-build-team-robot@google.com> Fri Apr 27 18:08:06 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 27 18:08:06 2018 +0000
tree 2a3620d78c4cb40fb60b678dd6a0afc10f3c22f8
parent 86b9e6d4b631b2d544aa6bd59a158be66a88078b
parent 303afec4515f628fea6e6fe222c263808d9bd408

Merge "Replace hidl_enum_{iterator -> range}."

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 ||