diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-01 00:44:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-01 00:44:53 +0000 |
| commit | 5eb895c04727f1a8efa2f827a4ff0ceece93d6eb (patch) | |
| tree | f0d28421b144bb96a14acfc63ca74f8550497cd6 /neuralnetworks/aidl/utils/src/Utils.cpp | |
| parent | fe02196facbf68d2e4e63c256f4fad5d6256caf5 (diff) | |
| parent | 6cd0d474b2974d1e3d5754605e073ce72e9b8947 (diff) | |
Merge "Cast to the underlying type for union tags" am: 6cd0d474b2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1999055
Change-Id: I5421fe3e9acd67b38ae0371cb3f938e5eeeac7f4
Diffstat (limited to 'neuralnetworks/aidl/utils/src/Utils.cpp')
| -rw-r--r-- | neuralnetworks/aidl/utils/src/Utils.cpp | 4 |
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>(); } |