compilation fix for insert()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -120,17 +120,17 @@ public:
|
|||||||
return begin() + idx;
|
return begin() + idx;
|
||||||
}
|
}
|
||||||
iterator erase(iterator it)
|
iterator erase(iterator it)
|
||||||
{
|
{
|
||||||
size_type idx = it - begin();
|
size_type idx = it - begin();
|
||||||
RemoveAt(idx);
|
RemoveAt(idx);
|
||||||
return begin() + idx;
|
return begin() + idx;
|
||||||
}
|
}
|
||||||
|
|
||||||
iterator insert(iterator it, const value_type& v = value_type())
|
iterator insert(iterator it, const value_type& v = value_type())
|
||||||
{
|
{
|
||||||
wxCHECK2(Alloc(size() + 1), return 0);
|
wxCHECK2(Alloc(size() + 1), return 0);
|
||||||
size_type idx = it - begin();
|
size_type idx = it - begin();
|
||||||
InsertAt(new value_type(o), idx);
|
InsertAt(new value_type(v), idx);
|
||||||
return begin() + idx;
|
return begin() + idx;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -168,7 +168,7 @@ private:
|
|||||||
m_objects + idx + 1,
|
m_objects + idx + 1,
|
||||||
m_objects + idx,
|
m_objects + idx,
|
||||||
( m_size - idx ) * sizeof(value_type*) );
|
( m_size - idx ) * sizeof(value_type*) );
|
||||||
|
|
||||||
m_size++;
|
m_size++;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -183,7 +183,7 @@ private:
|
|||||||
( m_size - idx - 1 ) * sizeof(value_type*) );
|
( m_size - idx - 1 ) * sizeof(value_type*) );
|
||||||
m_size--;
|
m_size--;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RemoveAt(size_type idx, size_type count)
|
void RemoveAt(size_type idx, size_type count)
|
||||||
{
|
{
|
||||||
if (count == 0)
|
if (count == 0)
|
||||||
|
Reference in New Issue
Block a user