diff --git a/src/hb-array.hh b/src/hb-array.hh index aa9508fc5..5af474bce 100644 --- a/src/hb-array.hh +++ b/src/hb-array.hh @@ -56,19 +56,19 @@ struct hb_array_t : hb_iter_with_fallback_t, Type&> hb_array_t& operator= (const hb_array_t&) = default; hb_array_t& operator= (hb_array_t&&) = default; - hb_array_t (std::nullptr_t) : hb_array_t () {} - hb_array_t (Type *array_, unsigned int length_) : arrayZ (array_), length (length_) {} + constexpr hb_array_t (std::nullptr_t) : hb_array_t () {} + constexpr hb_array_t (Type *array_, unsigned int length_) : arrayZ (array_), length (length_) {} template - hb_array_t (Type (&array_)[length_]) : hb_array_t (array_, length_) {} + constexpr hb_array_t (Type (&array_)[length_]) : hb_array_t (array_, length_) {} template - hb_array_t (const hb_array_t &o) : + constexpr hb_array_t (const hb_array_t &o) : hb_iter_with_fallback_t (), arrayZ (o.arrayZ), length (o.length), backwards_length (o.backwards_length) {} template - hb_array_t& operator = (const hb_array_t &o) + constexpr hb_array_t& operator = (const hb_array_t &o) { arrayZ = o.arrayZ; length = o.length; backwards_length = o.backwards_length; return *this; } /* @@ -314,19 +314,19 @@ struct hb_sorted_array_t : hb_sorted_array_t& operator= (const hb_sorted_array_t&) = default; hb_sorted_array_t& operator= (hb_sorted_array_t&&) = default; - hb_sorted_array_t (std::nullptr_t) : hb_sorted_array_t () {} - hb_sorted_array_t (Type *array_, unsigned int length_) : hb_array_t (array_, length_) {} + constexpr hb_sorted_array_t (std::nullptr_t) : hb_sorted_array_t () {} + constexpr hb_sorted_array_t (Type *array_, unsigned int length_) : hb_array_t (array_, length_) {} template - hb_sorted_array_t (Type (&array_)[length_]) : hb_array_t (array_) {} + constexpr hb_sorted_array_t (Type (&array_)[length_]) : hb_array_t (array_) {} template - hb_sorted_array_t (const hb_array_t &o) : + constexpr hb_sorted_array_t (const hb_array_t &o) : hb_iter_t (), hb_array_t (o) {} template - hb_sorted_array_t& operator = (const hb_array_t &o) + constexpr hb_sorted_array_t& operator = (const hb_array_t &o) { hb_array_t (*this) = o; return *this; } /* Iterator implementation. */