From 63c602c3d268bdbaf6d98d9ca743af2c9278e508 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Fri, 2 Nov 2018 12:10:22 +0100 Subject: [PATCH] Explicitly declare iterators in the function templates --- src/propgrid/propgrid.cpp | 2 +- src/propgrid/propgridpagestate.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index 826317cb4d..9ea2aeba5f 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -144,7 +144,7 @@ static bool wxPGItemExistsInVector(const wxVector& vector, const T& item) #if wxUSE_STL return std::find(vector.begin(), vector.end(), item) != vector.end(); #else - for ( wxVector::const_iterator it = vector.begin(); it != vector.end(); ++it ) + for (typename wxVector::const_iterator it = vector.begin(); it != vector.end(); ++it) { if ( *it == item ) return true; diff --git a/src/propgrid/propgridpagestate.cpp b/src/propgrid/propgridpagestate.cpp index 9833b65dc9..be18422604 100644 --- a/src/propgrid/propgridpagestate.cpp +++ b/src/propgrid/propgridpagestate.cpp @@ -48,13 +48,13 @@ template static void wxPGRemoveItemFromVector(wxVector& vector, const T& item) { #if wxUSE_STL - wxVector::iterator it = std::find(vector.begin(), vector.end(), item); + typename wxVector::iterator it = std::find(vector.begin(), vector.end(), item); if ( it != vector.end() ) { vector.erase(it); } #else - for (wxVector::iterator it = vector.begin(); it != vector.end(); ++it) + for (typename wxVector::iterator it = vector.begin(); it != vector.end(); ++it) { if ( *it == item ) { @@ -72,7 +72,7 @@ static bool wxPGItemExistsInVector(const wxVector& vector, const T& item) #if wxUSE_STL return std::find(vector.begin(), vector.end(), item) != vector.end(); #else - for (wxVector::const_iterator it = vector.begin(); it != vector.end(); ++it) + for (typename wxVector::const_iterator it = vector.begin(); it != vector.end(); ++it) { if ( *it == item ) return true;