summaryrefslogtreecommitdiff
path: root/neuralnetworks/aidl/utils/src/Utils.cpp
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-03-01 01:07:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-01 01:07:50 +0000
commitbbd66d27a0515d1d9994adb3d8a43f6c71e8badc (patch)
tree2174e98d14c17454fc0b229ce247b34694569f92 /neuralnetworks/aidl/utils/src/Utils.cpp
parent3d4ad82586fb124a083df433a4f0636719587603 (diff)
parent5eb895c04727f1a8efa2f827a4ff0ceece93d6eb (diff)
Merge "Cast to the underlying type for union tags" am: 6cd0d474b2 am: 5eb895c047
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1999055 Change-Id: I9023258edf659c7994e1f7762b170b232962994e
Diffstat (limited to 'neuralnetworks/aidl/utils/src/Utils.cpp')
-rw-r--r--neuralnetworks/aidl/utils/src/Utils.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/neuralnetworks/aidl/utils/src/Utils.cpp b/neuralnetworks/aidl/utils/src/Utils.cpp
index 03407be4ce..76a0b07d86 100644
--- a/neuralnetworks/aidl/utils/src/Utils.cpp
+++ b/neuralnetworks/aidl/utils/src/Utils.cpp
@@ -88,7 +88,7 @@ nn::GeneralResult<Memory> clone(const Memory& memory) {
return Memory::make<Memory::Tag::hardwareBuffer>(std::move(handle));
}
}
- return (NN_ERROR() << "Unrecognized Memory::Tag: " << memory.getTag())
+ return (NN_ERROR() << "Unrecognized Memory::Tag: " << underlyingType(memory.getTag()))
.
operator nn::GeneralResult<Memory>();
}
@@ -103,7 +103,7 @@ nn::GeneralResult<RequestMemoryPool> clone(const RequestMemoryPool& requestPool)
}
// Using explicit type conversion because std::variant inside the RequestMemoryPool confuses the
// compiler.
- return (NN_ERROR() << "Unrecognized request pool tag: " << requestPool.getTag())
+ return (NN_ERROR() << "Unrecognized request pool tag: " << underlyingType(requestPool.getTag()))
.
operator nn::GeneralResult<RequestMemoryPool>();
}