commit 090fe56dc6ef5f7afa297f2cb200418a520a2026
author Behdad Esfahbod <behdad@behdad.org> Fri Jan 25 15:34:03 2019 +0100
committer Behdad Esfahbod <behdad@behdad.org> Fri Jan 25 16:06:52 2019 +0100
tree 76e07be9da614bf3ca35b24f7dd59aafe1ff0843
parent 21c0713a1cf4b42b5dfa8fb9bdf1c1935a481b00
parent 06358ae9746ae72c0917e8a5f294d14fd695f380

Merge branch 'master' into iter

src/hb-array.hh

diff --git a/src/hb-array.hh b/src/hb-array.hh
index 6fd362f..62075c4 100644
--- a/src/hb-array.hh
+++ b/src/hb-array.hh
@@ -55,7 +55,7 @@
    * Iterator implementation.
    */
   typedef Type& __item_t__;
-  enum { is_random_access_iterator = true };
+  static constexpr bool is_random_access_iterator = true;
   Type& __item_at__ (unsigned i) const
   {
     if (unlikely (i >= length)) return CrapOrNull (Type);
@@ -200,8 +200,8 @@
 {
   typedef hb_iter_t<hb_sorted_array_t<Type>, Type&> iter_base_t;
   HB_ITER_USING (iter_base_t);
-  enum { is_random_access_iterator = true };
-  enum { is_sorted_iterator = true };
+  static constexpr bool is_random_access_iterator = true;
+  static constexpr bool is_sorted_iterator = true;
 
   hb_sorted_array_t () : hb_array_t<Type> () {}
   hb_sorted_array_t (const hb_array_t<Type> &o) : hb_array_t<Type> (o) {}