Commit d2083b06 authored by Marco Serantoni's avatar Marco Serantoni
Browse files

[MacOSX] Fix for name collision with OSX headers, Maciej, Tomasz or others... 

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

include/geometry/rtree.h

+4 −4
Original line number Diff line number Diff line
@@ -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;