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

19
include/irrMap.h
View File

@@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_MAP_H_INCLUDED__
#define __IRR_MAP_H_INCLUDED__
#ifndef IRR_MAP_H_INCLUDED
#define IRR_MAP_H_INCLUDED
#include "irrTypes.h"
#include "irrMath.h"
@@ -185,7 +185,7 @@ class map
Node& operator*()
{
_IRR_DEBUG_BREAK_IF(atEnd()) // access violation
IRR_DEBUG_BREAK_IF(atEnd()) // access violation
return *Cur;
}
@@ -333,7 +333,7 @@ class map
const Node& operator*()
{
_IRR_DEBUG_BREAK_IF(atEnd()) // access violation
IRR_DEBUG_BREAK_IF(atEnd()) // access violation
return *Cur;
}
@@ -472,7 +472,7 @@ class map
Node& operator* ()
{
_IRR_DEBUG_BREAK_IF(atEnd()) // access violation
IRR_DEBUG_BREAK_IF(atEnd()) // access violation
return *getNode();
}
@@ -571,7 +571,7 @@ class map
Node& operator* ()
{
_IRR_DEBUG_BREAK_IF(atEnd()) // access violation
IRR_DEBUG_BREAK_IF(atEnd()) // access violation
return *getNode();
}
@@ -639,7 +639,7 @@ class map
Node* node = Tree.find(Key);
// Not found
_IRR_DEBUG_BREAK_IF(node==0) // access violation
IRR_DEBUG_BREAK_IF(node==0) // access violation
return node->getValue();
}
@@ -881,7 +881,7 @@ class map
}
//! \deprecated Use empty() instead. This method may be removed by Irrlicht 1.9
_IRR_DEPRECATED_ bool isEmpty() const
IRR_DEPRECATED bool isEmpty() const
{
return empty();
}
@@ -1110,5 +1110,4 @@ class map
} // end namespace core
} // end namespace irr
#endif // __IRR_MAP_H_INCLUDED__
#endif // IRR_MAP_H_INCLUDED