diff options
author | android-build-prod (mdb) | 2018-04-27 13:08:06 -0500 |
---|---|---|
committer | Gerrit Code Review | 2018-04-27 13:08:06 -0500 |
commit | 71d7d91ba8ad9d71ec77f64d69f79c84c7e4e2a6 (patch) | |
tree | 2a3620d78c4cb40fb60b678dd6a0afc10f3c22f8 | |
parent | 86b9e6d4b631b2d544aa6bd59a158be66a88078b (diff) | |
parent | 303afec4515f628fea6e6fe222c263808d9bd408 (diff) | |
download | platform-hardware-interfaces-71d7d91ba8ad9d71ec77f64d69f79c84c7e4e2a6.tar.gz platform-hardware-interfaces-71d7d91ba8ad9d71ec77f64d69f79c84c7e4e2a6.tar.xz platform-hardware-interfaces-71d7d91ba8ad9d71ec77f64d69f79c84c7e4e2a6.zip |
Merge "Replace hidl_enum_{iterator -> range}."
-rw-r--r-- | neuralnetworks/1.0/vts/functional/ValidateModel.cpp | 2 | ||||
-rw-r--r-- | neuralnetworks/1.1/vts/functional/ValidateModel.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/neuralnetworks/1.0/vts/functional/ValidateModel.cpp b/neuralnetworks/1.0/vts/functional/ValidateModel.cpp index 4f0697e9..b813c392 100644 --- a/neuralnetworks/1.0/vts/functional/ValidateModel.cpp +++ b/neuralnetworks/1.0/vts/functional/ValidateModel.cpp | |||
@@ -283,7 +283,7 @@ static void mutateOperationOperandTypeTest(const sp<IDevice>& device, const V1_0 | |||
283 | if (mutateOperationOperandTypeSkip(operand, model)) { | 283 | if (mutateOperationOperandTypeSkip(operand, model)) { |
284 | continue; | 284 | continue; |
285 | } | 285 | } |
286 | for (OperandType invalidOperandType : hidl_enum_iterator<OperandType>{}) { | 286 | for (OperandType invalidOperandType : hidl_enum_range<OperandType>{}) { |
287 | // Do not test OEM types | 287 | // Do not test OEM types |
288 | if (invalidOperandType == model.operands[operand].type || | 288 | if (invalidOperandType == model.operands[operand].type || |
289 | invalidOperandType == OperandType::OEM || | 289 | invalidOperandType == OperandType::OEM || |
diff --git a/neuralnetworks/1.1/vts/functional/ValidateModel.cpp b/neuralnetworks/1.1/vts/functional/ValidateModel.cpp index 3aa55f8c..d6c65330 100644 --- a/neuralnetworks/1.1/vts/functional/ValidateModel.cpp +++ b/neuralnetworks/1.1/vts/functional/ValidateModel.cpp | |||
@@ -299,7 +299,7 @@ static void mutateOperationOperandTypeTest(const sp<IDevice>& device, const V1_1 | |||
299 | if (mutateOperationOperandTypeSkip(operand, model)) { | 299 | if (mutateOperationOperandTypeSkip(operand, model)) { |
300 | continue; | 300 | continue; |
301 | } | 301 | } |
302 | for (OperandType invalidOperandType : hidl_enum_iterator<OperandType>{}) { | 302 | for (OperandType invalidOperandType : hidl_enum_range<OperandType>{}) { |
303 | // Do not test OEM types | 303 | // Do not test OEM types |
304 | if (invalidOperandType == model.operands[operand].type || | 304 | if (invalidOperandType == model.operands[operand].type || |
305 | invalidOperandType == OperandType::OEM || | 305 | invalidOperandType == OperandType::OEM || |