From cd7a2cd807e9c33367c0b4ed002dfabff1fbdb4c Mon Sep 17 00:00:00 2001 From: Jon Evans Date: Sat, 27 Feb 2021 20:01:14 -0500 Subject: [PATCH] Fix shadowing fix that caused logic bug and different shadowing --- pcbnew/pcb_expr_evaluator.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pcbnew/pcb_expr_evaluator.cpp b/pcbnew/pcb_expr_evaluator.cpp index b65230ed0d..6ed24bd421 100644 --- a/pcbnew/pcb_expr_evaluator.cpp +++ b/pcbnew/pcb_expr_evaluator.cpp @@ -207,10 +207,10 @@ static void insideCourtyard( LIBEVAL::CONTEXT* aCtx, void* self ) if( i != board->m_InsideCourtyardCache.end() ) return i->second; - bool insideFootprint = realInsideFootprint( footprint ); + bool isInside = realInsideFootprint( footprint ); - board->m_InsideCourtyardCache[ key ] = result; - return insideFootprint; + board->m_InsideCourtyardCache[ key ] = isInside; + return isInside; }; if( arg->AsString() == "A" ) @@ -388,10 +388,10 @@ static void insideArea( LIBEVAL::CONTEXT* aCtx, void* self ) if( i != board->m_InsideAreaCache.end() ) return i->second; - bool result = realInsideZone( zone ); + bool isInside = realInsideZone( zone ); - board->m_InsideAreaCache[ key ] = result; - return result; + board->m_InsideAreaCache[ key ] = isInside; + return isInside; }; if( arg->AsString() == "A" )