From 68d4a5eee0f248891d20d69b897201d105951aef Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 17 Dec 2018 00:02:42 -0500 Subject: [PATCH] [array] Add constructor from fixed-size array --- src/hb-array.hh | 1 + src/hb-iter.hh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/hb-array.hh b/src/hb-array.hh index 468c52fe2..ddeef0dfc 100644 --- a/src/hb-array.hh +++ b/src/hb-array.hh @@ -46,6 +46,7 @@ struct hb_array_t hb_array_t (const hb_array_t &o) : arrayZ (o.arrayZ), len (o.len) {} hb_array_t (hb_array_t o) : arrayZ (o.arrayZ), len (o.len) {} hb_array_t (Type *array_, unsigned int len_) : arrayZ (array_), len (len_) {} + template hb_array_t (Type (&array_)[len_]) : arrayZ (array_), len (len_) {} /* * Operators. diff --git a/src/hb-iter.hh b/src/hb-iter.hh index 5b6cbc4ea..5bf770ee5 100644 --- a/src/hb-iter.hh +++ b/src/hb-iter.hh @@ -54,7 +54,7 @@ struct Iter; template struct Iter { - explicit inline Iter (const T &c); + Iter (const T &c); }; #endif @@ -68,7 +68,7 @@ struct Iter Iter (T *array_, int length_) : array (array_), length (MAX (length_, 0)) {} template - explicit inline Iter (T (&array_)[length_]) : + Iter (T (&array_)[length_]) : array (array_), length (length_) {} /* Emptiness. */