sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/ByteArray: Fix compilation/infinite recursion

Browse Source 
Former-commit-id: 7e3dded8a79ca6110775891cf3f90f1ab5400483
This commit is contained in:
Lynix
2015-09-13 12:06:20 +02:00
parent ef511d9b11
commit 91ec7c7dce
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/Nazara/Core/ByteArray.inl
View File

@@ -102,17 +102,17 @@ inline NzByteArray NzByteArray::GetSubArray(const_iterator startPos, const_itera
inline NzByteArray::iterator NzByteArray::Insert(const_iterator pos, const void* buffer, size_type n)
{
return Insert(pos, static_cast<const_pointer>(buffer), static_cast<const_pointer>(buffer) + n);
return m_array.insert(pos, static_cast<const_pointer>(buffer), static_cast<const_pointer>(buffer) + n);
}
inline NzByteArray::iterator NzByteArray::Insert(const_iterator pos, const NzByteArray& other)
{
return Insert(pos, other.begin(), other.end());
return m_array.insert(pos, other.begin(), other.end());
}
inline NzByteArray::iterator NzByteArray::Insert(const_iterator pos, size_type n, const value_type byte)
inline NzByteArray::iterator NzByteArray::Insert(const_iterator pos, size_type n, value_type byte)
{
return Insert(pos, n, byte);
return m_array.insert(pos, n, byte);
}
template <class InputIterator>