commit 87e957d364da2329451ea2f0ee8711371fe733cd
author Steven Moreland <smoreland@google.com> Wed Apr 25 11:52:56 2018 -0700
committer Steven Moreland <smoreland@google.com> Wed Apr 25 11:52:56 2018 -0700
tree 068710727c7457e5290b4aee5a7f6a8b4db82511
parent 4ab7a849604401016b0825cf7864dac3a2486516

Replace hidl_enum_{iterator -> range}.

This class is technically an iterable object, not a range.

Bug: 78573628
Test: N/A
Change-Id: I9e31531d16ca132a8275a8204801b439ff31c02b

EnumType.cpp

diff --git a/EnumType.cpp b/EnumType.cpp
index 745604f..f3528e4 100644
--- a/EnumType.cpp
+++ b/EnumType.cpp
@@ -288,7 +288,7 @@
         elementCount += type->mValues.size();
     }
 
-    out << "template<> struct hidl_enum_iterator<" << getCppStackType() << ">\n";
+    out << "template<> struct hidl_enum_range<" << getCppStackType() << ">\n";
     out.block([&] {
         out << "const " << getCppStackType() << "* begin() { return static_begin(); }\n";
         out << "const " << getCppStackType() << "* end() { return begin() + " << elementCount

test/hidl_test/hidl_test_client.cpp

diff --git a/test/hidl_test/hidl_test_client.cpp b/test/hidl_test/hidl_test_client.cpp
index 718a32c..3cba059 100644
--- a/test/hidl_test/hidl_test_client.cpp
+++ b/test/hidl_test/hidl_test_client.cpp
@@ -138,7 +138,7 @@
 using std::to_string;
 
 template <typename T>
-using hidl_enum_iterator = ::android::hardware::hidl_enum_iterator<T>;
+using hidl_enum_range = ::android::hardware::hidl_enum_range<T>;
 
 template <typename T>
 static inline ::testing::AssertionResult isOk(const ::android::hardware::Return<T> &ret) {
@@ -472,30 +472,30 @@
     using SkipsValues = ::android::hardware::tests::foo::V1_0::EnumIterators::SkipsValues;
     using MultipleValues = ::android::hardware::tests::foo::V1_0::EnumIterators::MultipleValues;
 
-    for (const auto value : hidl_enum_iterator<Empty>()) {
+    for (const auto value : hidl_enum_range<Empty>()) {
         (void)value;
         EXPECT_TRUE(false) << "Empty iterator should not iterate";
     }
 
-    auto it1 = hidl_enum_iterator<Grandchild>().begin();
+    auto it1 = hidl_enum_range<Grandchild>().begin();
     EXPECT_EQ(Grandchild::A, *it1++);
     EXPECT_EQ(Grandchild::B, *it1++);
-    EXPECT_EQ(hidl_enum_iterator<Grandchild>().end(), it1);
+    EXPECT_EQ(hidl_enum_range<Grandchild>().end(), it1);
 
-    auto it2 = hidl_enum_iterator<SkipsValues>().begin();
+    auto it2 = hidl_enum_range<SkipsValues>().begin();
     EXPECT_EQ(SkipsValues::A, *it2++);
     EXPECT_EQ(SkipsValues::B, *it2++);
     EXPECT_EQ(SkipsValues::C, *it2++);
     EXPECT_EQ(SkipsValues::D, *it2++);
     EXPECT_EQ(SkipsValues::E, *it2++);
-    EXPECT_EQ(hidl_enum_iterator<SkipsValues>().end(), it2);
+    EXPECT_EQ(hidl_enum_range<SkipsValues>().end(), it2);
 
-    auto it3 = hidl_enum_iterator<MultipleValues>().begin();
+    auto it3 = hidl_enum_range<MultipleValues>().begin();
     EXPECT_EQ(MultipleValues::A, *it3++);
     EXPECT_EQ(MultipleValues::B, *it3++);
     EXPECT_EQ(MultipleValues::C, *it3++);
     EXPECT_EQ(MultipleValues::D, *it3++);
-    EXPECT_EQ(hidl_enum_iterator<MultipleValues>().end(), it3);
+    EXPECT_EQ(hidl_enum_range<MultipleValues>().end(), it3);
 }
 
 TEST_F(HidlTest, EnumToStringTest) {