Merge "Switch from `count` to `N` for template due to ambiguity with `std::count`" am: 3db19cfa0b am: 2324c8b96c
Original change: https://android-review.googlesource.com/c/platform/system/security/+/1363328
Change-Id: I27a7b07d5057b7f936798dc6891984457f7304e5
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