From: Behdad Esfahbod Date: Fri, 9 Nov 2018 15:01:50 +0000 (-0500) Subject: Fix a few MSVC 2008 warnings X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f97fe9956274d9de4e7813d7f2e850d9ffd8224;p=platform%2Fupstream%2FlibHarfBuzzSharp.git Fix a few MSVC 2008 warnings https://github.com/harfbuzz/harfbuzz/issues/1374 --- diff --git a/src/hb-set.hh b/src/hb-set.hh index 21a2252..c47f77b 100644 --- a/src/hb-set.hh +++ b/src/hb-set.hh @@ -375,8 +375,8 @@ struct hb_set_t if (!resize (count)) return; population = other->population; - memcpy (pages, other->pages, count * sizeof (pages[0])); - memcpy (page_map, other->page_map, count * sizeof (page_map[0])); + memcpy (pages, other->pages, count * pages.item_size); + memcpy (page_map, other->page_map, count * page_map.item_size); } inline bool is_equal (const hb_set_t *other) const diff --git a/src/hb-vector.hh b/src/hb-vector.hh index fe06add..7056a5b 100644 --- a/src/hb-vector.hh +++ b/src/hb-vector.hh @@ -34,6 +34,9 @@ template struct hb_vector_t { + typedef Type ItemType; + enum { item_size = sizeof (Type) }; + HB_NO_COPY_ASSIGN_TEMPLATE2 (hb_vector_t, Type, StaticSize); inline hb_vector_t (void) { init (); } inline ~hb_vector_t (void) { fini (); }