From 359f6f58eecf20ceedeafacbed4a69024af0f82a Mon Sep 17 00:00:00 2001 From: Kp Date: Wed, 1 Jun 2016 01:52:45 +0000 Subject: [PATCH] Fix -Wshadow warning in visited_segment_bitarray_t::bitproxy_t bitproxy_t inherits a method named `shift` and its constructor took a parameter named `shift`. This is unambiguous in the language, but causes a warning from gcc's -Wshadow in gcc before 5.x. Rename the parameter to eliminate the warning. Reported-by: Mako88 --- common/main/segment.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/main/segment.h b/common/main/segment.h index 6c23debd6..668ddf014 100644 --- a/common/main/segment.h +++ b/common/main/segment.h @@ -366,8 +366,8 @@ class visited_segment_bitarray_t : public visited_segment_mask_t }; struct bitproxy_t : public tmpl_bitproxy_t { - bitproxy_t(array_t::reference byte, unsigned shift) : - tmpl_bitproxy_t(byte, shift) + bitproxy_t(array_t::reference byte, unsigned s) : + tmpl_bitproxy_t(byte, s) { } bitproxy_t& operator=(bool b)