TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix -Wshadow warning in visited_segment_bitarray_t::bitproxy_t

Browse source 
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 <https://github.com/dxx-rebirth/dxx-rebirth/issues/200>
This commit is contained in:
Kp 2016-06-01 01:52:45 +00:00
parent aa4ad79fbe
commit 359f6f58ee
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/main/segment.h
View file

@ -366,8 +366,8 @@ class visited_segment_bitarray_t : public visited_segment_mask_t<bool, 1>
};
struct bitproxy_t : public tmpl_bitproxy_t<array_t::reference>
{
bitproxy_t(array_t::reference byte, unsigned shift) :
tmpl_bitproxy_t<array_t::reference>(byte, shift)
bitproxy_t(array_t::reference byte, unsigned s) :
tmpl_bitproxy_t<array_t::reference>(byte, s)
{
}
bitproxy_t& operator=(bool b)