From ce889189c1f8ef5b400a17f623dcb8b935d1102b Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 21 Oct 2015 11:23:12 -0200 Subject: [PATCH] Fix two more -Wshadow warnings https://bugzilla.mozilla.org/show_bug.cgi?id=1215894 --- src/hb-open-type-private.hh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh index e55d2e1bd..f053502de 100644 --- a/src/hb-open-type-private.hh +++ b/src/hb-open-type-private.hh @@ -399,9 +399,9 @@ struct Sanitizer struct hb_serialize_context_t { - inline hb_serialize_context_t (void *start, unsigned int size) + inline hb_serialize_context_t (void *start_, unsigned int size) { - this->start = (char *) start; + this->start = (char *) start_; this->end = this->start + size; this->ran_out_of_room = false; @@ -495,10 +495,10 @@ struct hb_serialize_context_t return reinterpret_cast (&obj); } - inline void truncate (void *head) + inline void truncate (void *new_head) { - assert (this->start < head && head <= this->head); - this->head = (char *) head; + assert (this->start < new_head && new_head <= this->head); + this->head = (char *) new_head; } unsigned int debug_depth;