src/hb-object-private.hh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
New commits: commit 3b8fd9c48f4bde368bf2d465c148b9743a9216ee Author: Behdad Esfahbod <[email protected]> Date: Sun Jun 3 15:54:19 2012 -0400 Remove const from ref_count.ref_count According to Tom Hacohen this was breaking build with some compilers. In file included from hb-buffer-private.hh:35:0, from hb-ot-map-private.hh:32, from hb-ot-shape-private.hh:32, from hb-ot-shape.cc:29: hb-object-private.hh: In constructor '_hb_object_header_t::_hb_object_header_t()': hb-object-private.hh:97:8: error: uninitialized const member in 'struct hb_reference_count_t' hb-object-private.hh:51:25: note: 'hb_reference_count_t::ref_count' should be initialized In file included from hb-ot-shape.cc:33:0: hb-set-private.hh: In constructor '_hb_set_t::_hb_set_t()': hb-set-private.hh:37:8: note: synthesized method '_hb_object_header_t::_hb_object_header_t()' first required here hb-ot-shape.cc: In function 'void hb_ot_shape_glyphs_closure(hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int, hb_set_t*)': hb-ot-shape.cc:521:12: note: synthesized method '_hb_set_t::_hb_set_t()' first required here diff --git a/src/hb-object-private.hh b/src/hb-object-private.hh index 7f5b18b..e3c9d21 100644 --- a/src/hb-object-private.hh +++ b/src/hb-object-private.hh @@ -49,7 +49,7 @@ struct hb_reference_count_t { - const hb_atomic_int_t ref_count; + hb_atomic_int_t ref_count; #define HB_REFERENCE_COUNT_INVALID_VALUE ((hb_atomic_int_t) -1) #define HB_REFERENCE_COUNT_INVALID {HB_REFERENCE_COUNT_INVALID_VALUE} commit 70600dbf626808a30fb0fd8b7ae860e64d9ffe87 Author: Behdad Esfahbod <[email protected]> Date: Sun Jun 3 15:52:51 2012 -0400 Minor diff --git a/src/hb-object-private.hh b/src/hb-object-private.hh index 2be20d3..7f5b18b 100644 --- a/src/hb-object-private.hh +++ b/src/hb-object-private.hh @@ -47,7 +47,8 @@ /* reference_count */ -typedef struct { +struct hb_reference_count_t +{ const hb_atomic_int_t ref_count; #define HB_REFERENCE_COUNT_INVALID_VALUE ((hb_atomic_int_t) -1) @@ -59,13 +60,13 @@ typedef struct { inline bool is_invalid (void) const { return ref_count == HB_REFERENCE_COUNT_INVALID_VALUE; } -} hb_reference_count_t; +}; /* user_data */ -struct hb_user_data_array_t { - +struct hb_user_data_array_t +{ struct hb_user_data_item_t { hb_user_data_key_t *key; void *data; @@ -92,9 +93,8 @@ struct hb_user_data_array_t { /* object_header */ -typedef struct _hb_object_header_t hb_object_header_t; - -struct _hb_object_header_t { +struct hb_object_header_t +{ hb_reference_count_t ref_count; hb_user_data_array_t user_data; _______________________________________________ HarfBuzz mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/harfbuzz
