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

Core/ByteArray: Fix compilation/infinite recursion 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/Nazara/Core/ByteArray.hpp
View File

@ -21,18 +21,18 @@ class NAZARA_CORE_API NzByteArray : public NzHashable
public: public:
// types: // types:
using allocator_type = typename Container::allocator_type; using allocator_type = Container::allocator_type;
using const_iterator = typename Container::const_iterator; using const_iterator = Container::const_iterator;
using const_reference = typename Container::const_reference; using const_reference = Container::const_reference;
using const_pointer = typename Container::const_pointer; using const_pointer = Container::const_pointer;
using const_reverse_iterator = typename Container::const_reverse_iterator; using const_reverse_iterator = Container::const_reverse_iterator;
using difference_type = typename Container::difference_type; using difference_type = Container::difference_type;
using pointer = typename Container::pointer; using pointer = Container::pointer;
using iterator = typename Container::iterator; using iterator = Container::iterator;
using reference = typename Container::reference; using reference = Container::reference;
using reverse_iterator = typename Container::reverse_iterator; using reverse_iterator = Container::reverse_iterator;
using size_type = typename Container::size_type; using size_type = Container::size_type;
using value_type = typename Container::value_type; using value_type = Container::value_type;
// construct/destroy: // construct/destroy:
inline NzByteArray() = default; inline NzByteArray() = default;
@ -70,7 +70,7 @@ class NAZARA_CORE_API NzByteArray : public NzHashable
inline iterator Insert(const_iterator pos, const void* buffer, size_type n); inline iterator Insert(const_iterator pos, const void* buffer, size_type n);
inline iterator Insert(const_iterator pos, const NzByteArray& other); inline iterator Insert(const_iterator pos, const NzByteArray& other);
inline iterator Insert(const_iterator pos, size_type n, const value_type byte); inline iterator Insert(const_iterator pos, size_type n, value_type byte);
template <class InputIterator> iterator Insert(const_iterator pos, InputIterator first, InputIterator last); template <class InputIterator> iterator Insert(const_iterator pos, InputIterator first, InputIterator last);
inline bool IsEmpty() const noexcept; inline bool IsEmpty() const noexcept;

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) 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) 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> template <class InputIterator>