haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MacOSX] Fix for name collision with OSX headers, Maciej, Tomasz or others feel free to rework if you want/like

This commit is contained in:
Marco Serantoni 2014-04-27 16:28:37 +02:00
parent 4456840a1f
commit d2083b0671
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/geometry/rtree.h
View File

@ -32,10 +32,10 @@
#define ASSERT assert // RTree uses ASSERT( condition )
#ifndef Min
#define Min std::min
#define rMin std::min
#endif // Min
#ifndef Max
#define Max std::max
#define rMax std::max
#endif // Max
//
@ -1326,8 +1326,8 @@ typename RTREE_QUAL::Rect RTREE_QUAL::CombineRect( Rect* a_rectA, Rect* a_rectB
for( int index = 0; index < NUMDIMS; ++index )
{
newRect.m_min[index] = Min( a_rectA->m_min[index], a_rectB->m_min[index] );
newRect.m_max[index] = Max( a_rectA->m_max[index], a_rectB->m_max[index] );
newRect.m_min[index] = rMin( a_rectA->m_min[index], a_rectB->m_min[index] );
newRect.m_max[index] = rMax( a_rectA->m_max[index], a_rectB->m_max[index] );
}
return newRect;