diff options
| author | Xusong Wang <xusongw@google.com> | 2022-02-09 19:47:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-09 19:47:27 +0000 |
| commit | f5ad7c56c9703293f9cc70c13c1bed4152e1e33d (patch) | |
| tree | 056f4a0cf37fed5eb134a530e8c8256837551b58 /neuralnetworks/aidl/utils/src/Conversions.cpp | |
| parent | 5194b3538c62b8e2e2b83e087d0e74fca20a147e (diff) | |
| parent | aba49d051252dbb15f7f8ec07462cad0e5039019 (diff) | |
Merge "Address ANAPIC review comments -- hal." am: 8b389e1123 am: 706652c817 am: cfa3838085 am: aba49d0512
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1957303
Change-Id: I88834c87adc1958cfd6cc68929d38eaad43c2d93
Diffstat (limited to 'neuralnetworks/aidl/utils/src/Conversions.cpp')
| -rw-r--r-- | neuralnetworks/aidl/utils/src/Conversions.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/neuralnetworks/aidl/utils/src/Conversions.cpp b/neuralnetworks/aidl/utils/src/Conversions.cpp index 9b897c43ac..83fda10ce2 100644 --- a/neuralnetworks/aidl/utils/src/Conversions.cpp +++ b/neuralnetworks/aidl/utils/src/Conversions.cpp @@ -614,7 +614,7 @@ struct overloaded : Ts... { using Ts::operator()...; }; template <class... Ts> -overloaded(Ts...)->overloaded<Ts...>; +overloaded(Ts...) -> overloaded<Ts...>; #ifdef __ANDROID__ nn::GeneralResult<common::NativeHandle> aidlHandleFromNativeHandle( @@ -1190,4 +1190,8 @@ nn::GeneralResult<std::vector<int32_t>> toSigned(const std::vector<uint32_t>& ve return std::vector<int32_t>(vec.begin(), vec.end()); } +std::vector<uint8_t> toVec(const std::array<uint8_t, IDevice::BYTE_SIZE_OF_CACHE_TOKEN>& token) { + return std::vector<uint8_t>(token.begin(), token.end()); +} + } // namespace aidl::android::hardware::neuralnetworks::utils |