Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid g++ 4.3 warnings about conflict between parameter and method names (closes #10843)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-05-28 09:49:20 +00:00
parent fa2b06e7b1
commit f6363458bc
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/string.h
View File

@@ -1004,8 +1004,8 @@ public:
{ return iterator(str(), wxStringOperations::AddToIter(m_cur, -n)); } { return iterator(str(), wxStringOperations::AddToIter(m_cur, -n)); }
private: private:
iterator(wxString *str, underlying_iterator ptr) iterator(wxString *wxstr, underlying_iterator ptr)
: m_cur(ptr), m_node(str, &m_cur) {} : m_cur(ptr), m_node(wxstr, &m_cur) {}
wxString* str() const { return const_cast<wxString*>(m_node.m_str); } wxString* str() const { return const_cast<wxString*>(m_node.m_str); }
@@ -1049,8 +1049,8 @@ public:
private: private:
// for internal wxString use only: // for internal wxString use only:
const_iterator(const wxString *str, underlying_iterator ptr) const_iterator(const wxString *wxstr, underlying_iterator ptr)
: m_cur(ptr), m_node(str, &m_cur) {} : m_cur(ptr), m_node(wxstr, &m_cur) {}
const wxString* str() const { return m_node.m_str; } const wxString* str() const { return m_node.m_str; }

12
include/wx/vector.h
View File

@@ -169,19 +169,19 @@ public:
wxVector() : m_size(0), m_capacity(0), m_values(NULL) {} 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) : m_size(0), m_capacity(0), m_values(NULL)
{ {
reserve(size); reserve(p_size);
for ( size_t n = 0; n < size; n++ ) for ( size_t n = 0; n < p_size; n++ )
push_back(value_type()); 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) : m_size(0), m_capacity(0), m_values(NULL)
{ {
reserve(size); reserve(p_size);
for ( size_t n = 0; n < size; n++ ) for ( size_t n = 0; n < p_size; n++ )
push_back(v); push_back(v);
} }