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

Fix previous commit oopsies

This commit is contained in:
Lynix 2017-10-14 18:27:37 +02:00
parent 683b09144d
commit 46cf06f446
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Core/MemoryHelper.hpp
View File

@ -74,8 +74,8 @@ namespace Nz
const_iterator cbegin() const noexcept;
const_iterator cend() const noexcept;
const_iterator crbegin() const noexcept;
const_iterator crend() const noexcept;
const_reverse_iterator crbegin() const noexcept;
const_reverse_iterator crend() const noexcept;
T* data() noexcept;
const T* data() const noexcept;

28
include/Nazara/Core/MemoryHelper.inl
View File

@ -127,37 +127,37 @@ namespace Nz
template<typename T>
typename StackArray<T>::iterator StackArray<T>::begin() noexcept
{
return &m_ptr[0];
return iterator(&m_ptr[0]);
}
template<typename T>
typename StackArray<T>::const_iterator StackArray<T>::begin() const noexcept
{
return &m_ptr[0];
return const_iterator(&m_ptr[0]);
}
template<typename T>
typename StackArray<T>::const_iterator StackArray<T>::cbegin() const noexcept
{
return &m_ptr[0];
return const_iterator(&m_ptr[0]);
}
template<typename T>
typename StackArray<T>::const_iterator StackArray<T>::cend() const noexcept
{
return &m_ptr[m_size];
return const_iterator(&m_ptr[m_size]);
}
template<typename T>
typename StackArray<T>::const_iterator StackArray<T>::crbegin() const noexcept
typename StackArray<T>::const_reverse_iterator StackArray<T>::crbegin() const noexcept
{
return &m_ptr[m_size];
return const_reverse_iterator(&m_ptr[m_size]);
}
template<typename T>
typename StackArray<T>::const_iterator StackArray<T>::crend() const noexcept
typename StackArray<T>::const_reverse_iterator StackArray<T>::crend() const noexcept
{
return &m_ptr[0];
return const_reverse_iterator(&m_ptr[0]);
}
template<typename T>
@ -181,13 +181,13 @@ namespace Nz
template<typename T>
typename StackArray<T>::iterator StackArray<T>::end() noexcept
{
return &m_ptr[m_size];
return iterator(&m_ptr[m_size]);
}
template<typename T>
typename StackArray<T>::const_iterator StackArray<T>::end() const noexcept
{
return &m_ptr[m_size];
return const_iterator(&m_ptr[m_size]);
}
template<typename T>
@ -217,25 +217,25 @@ namespace Nz
template<typename T>
typename StackArray<T>::reverse_iterator StackArray<T>::rbegin() noexcept
{
return m_ptr[m_size];
return reverse_iterator(&m_ptr[m_size]);
}
template<typename T>
typename StackArray<T>::const_reverse_iterator StackArray<T>::rbegin() const noexcept
{
return m_ptr[m_size];
return reverse_iterator(&m_ptr[m_size]);
}
template<typename T>
typename StackArray<T>::reverse_iterator StackArray<T>::rend() noexcept
{
return m_ptr[0];
return reverse_iterator(&m_ptr[0]);
}
template<typename T>
typename StackArray<T>::const_reverse_iterator StackArray<T>::rend() const noexcept
{
return m_ptr[0];
return reverse_iterator(&m_ptr[0]);
}
template<typename T>

2
src/Nazara/Renderer/Renderer.cpp
View File

@ -1762,7 +1762,7 @@ namespace Nz
glGetProgramiv(program, GL_ACTIVE_UNIFORM_MAX_LENGTH, &maxLength);
maxLength++;
StackAllocation<GLchar> nameBuffer = NazaraStackAllocation(GLchar, maxLength + 1);
StackArray<GLchar> nameBuffer = NazaraStackAllocation(GLchar, maxLength + 1);
for (GLint i = 0; i < count; i++)
{
GLint size;