| commit | 2324c8b96ccd4d24a8538793064d0831b6949d6d | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jul 24 18:39:44 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 24 18:39:44 2020 +0000 |
| tree | f265c14031335612571a5d9a0207ce109bf77639 | |
| parent | 8b10eced4b46f0031fe2f7c38688e60b7d3bcb70 [diff] | |
| parent | 3db19cfa0b1f245e6da284a01516d11172e076e8 [diff] |
Merge "Switch from `count` to `N` for template due to ambiguity with `std::count`" am: 3db19cfa0b Original change: https://android-review.googlesource.com/c/platform/system/security/+/1363328 Change-Id: Ic6c23ecb8804ac4099c60ab5be7b241079117310
diff --git a/keystore/KeyStore.h b/keystore/KeyStore.h index 0027ec8..7841a80 100644 --- a/keystore/KeyStore.h +++ b/keystore/KeyStore.h
@@ -62,9 +62,9 @@ } // namespace keystore namespace std { -template <typename T, size_t count> struct tuple_size<keystore::Devices<T, count>> { +template <typename T, size_t N> struct tuple_size<keystore::Devices<T, N>> { public: - static constexpr size_t value = std::tuple_size<std::array<T, count>>::value; + static constexpr size_t value = std::tuple_size<std::array<T, N>>::value; }; } // namespace std