From f6363458bcaa117298305fc220069092c7a42b48 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 28 May 2009 09:49:20 +0000 Subject: [PATCH] avoid g++ 4.3 warnings about conflict between parameter and method names (closes #10843) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/string.h | 8 ++++---- include/wx/vector.h | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/wx/string.h b/include/wx/string.h index 65e29e10ec..c5658d9fc4 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -1004,8 +1004,8 @@ public: { return iterator(str(), wxStringOperations::AddToIter(m_cur, -n)); } private: - iterator(wxString *str, underlying_iterator ptr) - : m_cur(ptr), m_node(str, &m_cur) {} + iterator(wxString *wxstr, underlying_iterator ptr) + : m_cur(ptr), m_node(wxstr, &m_cur) {} wxString* str() const { return const_cast(m_node.m_str); } @@ -1049,8 +1049,8 @@ public: private: // for internal wxString use only: - const_iterator(const wxString *str, underlying_iterator ptr) - : m_cur(ptr), m_node(str, &m_cur) {} + const_iterator(const wxString *wxstr, underlying_iterator ptr) + : m_cur(ptr), m_node(wxstr, &m_cur) {} const wxString* str() const { return m_node.m_str; } diff --git a/include/wx/vector.h b/include/wx/vector.h index ab07ca0f4a..5375f9c5df 100644 --- a/include/wx/vector.h +++ b/include/wx/vector.h @@ -169,19 +169,19 @@ public: wxVector() : m_size(0), m_capacity(0), m_values(NULL) {} - wxVector(size_type size) + wxVector(size_type p_size) : m_size(0), m_capacity(0), m_values(NULL) { - reserve(size); - for ( size_t n = 0; n < size; n++ ) + reserve(p_size); + for ( size_t n = 0; n < p_size; n++ ) push_back(value_type()); } - wxVector(size_type size, const value_type& v) + wxVector(size_type p_size, const value_type& v) : m_size(0), m_capacity(0), m_values(NULL) { - reserve(size); - for ( size_t n = 0; n < size; n++ ) + reserve(p_size); + for ( size_t n = 0; n < p_size; n++ ) push_back(v); }