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

Explicitly declare iterators in the function templates

Browse Source
This commit is contained in:
Artur Wieczorek
2018-11-02 12:10:22 +01:00
parent dfb48b47f5
commit 63c602c3d2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/propgrid/propgrid.cpp
View File

@@ -144,7 +144,7 @@ static bool wxPGItemExistsInVector(const wxVector<T>& vector, const T& item)
#if wxUSE_STL #if wxUSE_STL
return std::find(vector.begin(), vector.end(), item) != vector.end(); return std::find(vector.begin(), vector.end(), item) != vector.end();
#else #else
for ( wxVector<T>::const_iterator it = vector.begin(); it != vector.end(); ++it ) for (typename wxVector<T>::const_iterator it = vector.begin(); it != vector.end(); ++it)
{ {
if ( *it == item ) if ( *it == item )
return true; return true;

6
src/propgrid/propgridpagestate.cpp
View File

@@ -48,13 +48,13 @@ template<typename T>
static void wxPGRemoveItemFromVector(wxVector<T>& vector, const T& item) static void wxPGRemoveItemFromVector(wxVector<T>& vector, const T& item)
{ {
#if wxUSE_STL #if wxUSE_STL
wxVector<T>::iterator it = std::find(vector.begin(), vector.end(), item); typename wxVector<T>::iterator it = std::find(vector.begin(), vector.end(), item);
if ( it != vector.end() ) if ( it != vector.end() )
{ {
vector.erase(it); vector.erase(it);
} }
#else #else
for (wxVector<T>::iterator it = vector.begin(); it != vector.end(); ++it) for (typename wxVector<T>::iterator it = vector.begin(); it != vector.end(); ++it)
{ {
if ( *it == item ) if ( *it == item )
{ {
@@ -72,7 +72,7 @@ static bool wxPGItemExistsInVector(const wxVector<T>& vector, const T& item)
#if wxUSE_STL #if wxUSE_STL
return std::find(vector.begin(), vector.end(), item) != vector.end(); return std::find(vector.begin(), vector.end(), item) != vector.end();
#else #else
for (wxVector<T>::const_iterator it = vector.begin(); it != vector.end(); ++it) for (typename wxVector<T>::const_iterator it = vector.begin(); it != vector.end(); ++it)
{ {
if ( *it == item ) if ( *it == item )
return true; return true;