luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6256 from trunk to ogl-es branch

Browse Source 
(fixing OSX again)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6257 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:20:42 +00:00
parent ee3579015b
commit 1efc93d766
196 changed files with 832 additions and 991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/irrArray.h
View File

@@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine" and the "irrXML" project.
// For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h
#ifndef __IRR_ARRAY_H_INCLUDED__
#define __IRR_ARRAY_H_INCLUDED__
#ifndef IRR_ARRAY_H_INCLUDED
#define IRR_ARRAY_H_INCLUDED
#include "irrTypes.h"
#include "heapsort.h"
@@ -131,7 +131,7 @@ public:
\param index: Where position to insert the new element. */
void insert(const T& element, u32 index=0)
{
_IRR_DEBUG_BREAK_IF(index>used) // access violation
IRR_DEBUG_BREAK_IF(index>used) // access violation
if (used + 1 > allocated)
{
@@ -337,7 +337,7 @@ public:
//! Direct access operator
T& operator [](u32 index)
{
_IRR_DEBUG_BREAK_IF(index>=used) // access violation
IRR_DEBUG_BREAK_IF(index>=used) // access violation
return data[index];
}
@@ -346,7 +346,7 @@ public:
//! Direct const access operator
const T& operator [](u32 index) const
{
_IRR_DEBUG_BREAK_IF(index>=used) // access violation
IRR_DEBUG_BREAK_IF(index>=used) // access violation
return data[index];
}
@@ -355,7 +355,7 @@ public:
//! Gets last element.
T& getLast()
{
_IRR_DEBUG_BREAK_IF(!used) // access violation
IRR_DEBUG_BREAK_IF(!used) // access violation
return data[used-1];
}
@@ -364,7 +364,7 @@ public:
//! Gets last element
const T& getLast() const
{
_IRR_DEBUG_BREAK_IF(!used) // access violation
IRR_DEBUG_BREAK_IF(!used) // access violation
return data[used-1];
}
@@ -558,7 +558,7 @@ public:
\param index: Index of element to be erased. */
void erase(u32 index)
{
_IRR_DEBUG_BREAK_IF(index>=used) // access violation
IRR_DEBUG_BREAK_IF(index>=used) // access violation
for (u32 i=index+1; i<used; ++i)
{