diff options
| author | Steven Moreland <smoreland@google.com> | 2018-10-26 15:34:01 -0700 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2018-10-29 17:21:45 -0700 |
| commit | 39d9f88b13c6dd5e4d332d332741fb9779ad1714 (patch) | |
| tree | 6889ac50a74fbe9cb2cdd7ff459c6088b51c58fe | |
| parent | 213914b33c6ffcbf021373219414dc258d59d06c (diff) | |
| download | libhidl-39d9f88b13c6dd5e4d332d332741fb9779ad1714.tar.gz | |
hidl_enum_range: support const/reverse iteration
This also moves the implementation to auto-generated code. Only the
values themselves are generated in auto-generated code.
Bug: 118395041
Test: hidl_test
Change-Id: I4ae3cf992a64012e431c0ade3fc4ac3645f96756
| -rw-r--r-- | base/include/hidl/HidlSupport.h | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/base/include/hidl/HidlSupport.h b/base/include/hidl/HidlSupport.h index 2d0dc25..43e84c0 100644 --- a/base/include/hidl/HidlSupport.h +++ b/base/include/hidl/HidlSupport.h @@ -997,12 +997,31 @@ std::string toString(const hidl_array<T, SIZE1, SIZE2, SIZES...> &a) { + details::toString(details::const_accessor<T, SIZE1, SIZE2, SIZES...>(a.data())); } +namespace details { +// Never instantiated. Used as a placeholder for template variables. +template <typename T> +struct hidl_invalid_type; + +// HIDL generates specializations of this for enums. See hidl_enum_range. +template <typename T, typename = std::enable_if_t<std::is_enum<T>::value>> +constexpr hidl_invalid_type<T> hidl_enum_values; +} // namespace details + /** - * Every HIDL generated enum generates an implementation of this function. + * Every HIDL generated enum supports this function. * E.x.: for(const auto v : hidl_enum_range<Enum>) { ... } */ template <typename T, typename = std::enable_if_t<std::is_enum<T>::value>> -struct hidl_enum_range; +struct hidl_enum_range { + constexpr auto begin() const { return std::begin(details::hidl_enum_values<T>); } + constexpr auto cbegin() const { return begin(); } + constexpr auto rbegin() const { return std::rbegin(details::hidl_enum_values<T>); } + constexpr auto crbegin() const { return rbegin(); } + constexpr auto end() const { return std::end(details::hidl_enum_values<T>); } + constexpr auto cend() const { return end(); } + constexpr auto rend() const { return std::rend(details::hidl_enum_values<T>); } + constexpr auto crend() const { return rend(); } +}; template <typename T, typename = std::enable_if_t<std::is_enum<T>::value>> struct hidl_enum_iterator { |