From 2f605badf3480e0f0c49aee98039e2ff2a4cd5f4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 25 Aug 2020 23:39:55 +0200 Subject: [PATCH] Fix g++ 4.8 -Wshadow for parameter/function conflicts Unlike the later versions, g++ 4.8 produces a -Wshadow when the name of a parameter is the same of the name of a method, so rename the (private) parameters to avoid this. --- include/wx/generic/grid.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index 935180d8cf..e46c81536e 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -1140,9 +1140,9 @@ private: { } - wxGridBlocks(iterator_impl begin, iterator_impl end) : - m_begin(begin), - m_end(end) + wxGridBlocks(iterator_impl ibegin, iterator_impl iend) : + m_begin(ibegin), + m_end(iend) { }