Fix two more -Wshadow warnings

https://bugzilla.mozilla.org/show_bug.cgi?id=1215894
This commit is contained in:
Behdad Esfahbod 2015-10-21 11:23:12 -02:00
parent 4a6b1eedbb
commit ce889189c1

View File

@ -399,9 +399,9 @@ struct Sanitizer
struct hb_serialize_context_t 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->end = this->start + size;
this->ran_out_of_room = false; this->ran_out_of_room = false;
@ -495,10 +495,10 @@ struct hb_serialize_context_t
return reinterpret_cast<Type *> (&obj); return reinterpret_cast<Type *> (&obj);
} }
inline void truncate (void *head) inline void truncate (void *new_head)
{ {
assert (this->start < head && head <= this->head); assert (this->start < new_head && new_head <= this->head);
this->head = (char *) head; this->head = (char *) new_head;
} }
unsigned int debug_depth; unsigned int debug_depth;