From 75748822a0554d031ff4665dd231e4210aa1f0e3 Mon Sep 17 00:00:00 2001 From: Murray Stevenson <50844517+murraystevenson@users.noreply.github.com> Date: Tue, 9 Dec 2025 17:17:44 -0800 Subject: [PATCH] CurvesPrimitiveEvaluator : Fix build on macOS 6fa3f5402b30bd68b3e7236ad7945af66a80c461 introduced `CurvesPrimitiveEvaluator::Result::linear()`, which Clang considers to be shadowing the `linear` template parameter of `CurvesPrimitiveEvaluator::Result::init()`. This fix takes the simple approach and renames the template parameters. --- include/IECoreScene/CurvesPrimitiveEvaluator.h | 2 +- src/IECoreScene/CurvesPrimitiveEvaluator.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/IECoreScene/CurvesPrimitiveEvaluator.h b/include/IECoreScene/CurvesPrimitiveEvaluator.h index 2154557533..0c309a5f5e 100644 --- a/include/IECoreScene/CurvesPrimitiveEvaluator.h +++ b/include/IECoreScene/CurvesPrimitiveEvaluator.h @@ -97,7 +97,7 @@ class IECORESCENE_API CurvesPrimitiveEvaluator : public PrimitiveEvaluator typedef void (Result::*InitFunction)( unsigned curveIndex, float v, const CurvesPrimitiveEvaluator *evaluator ); - template + template void init( unsigned curveIndex, float v, const CurvesPrimitiveEvaluator *evaluator ); template diff --git a/src/IECoreScene/CurvesPrimitiveEvaluator.cpp b/src/IECoreScene/CurvesPrimitiveEvaluator.cpp index 3191c8e5e3..b25e5672a9 100644 --- a/src/IECoreScene/CurvesPrimitiveEvaluator.cpp +++ b/src/IECoreScene/CurvesPrimitiveEvaluator.cpp @@ -241,7 +241,7 @@ half CurvesPrimitiveEvaluator::Result::halfPrimVar( const PrimitiveVariable &pv return primVar( pv, m_coefficients.data() ); } -template +template void CurvesPrimitiveEvaluator::Result::init( unsigned curveIndex, float v, const CurvesPrimitiveEvaluator *evaluator ) { m_curveIndex = curveIndex; @@ -251,9 +251,9 @@ void CurvesPrimitiveEvaluator::Result::init( unsigned curveIndex, float v, const const CubicBasisf &basis = evaluator->m_curvesPrimitive->basis(); unsigned numSegments = 0; - if( linear ) + if( Linear ) { - if( periodic ) + if( Periodic ) { numSegments = numVertices; } @@ -264,7 +264,7 @@ void CurvesPrimitiveEvaluator::Result::init( unsigned curveIndex, float v, const } else { - if( periodic ) + if( Periodic ) { numSegments = numVertices / basis.step; } @@ -281,14 +281,14 @@ void CurvesPrimitiveEvaluator::Result::init( unsigned curveIndex, float v, const unsigned o = evaluator->m_vertexDataOffsets[m_curveIndex]; unsigned i = segment * basis.step; - if( linear ) + if( Linear ) { m_coefficients[0] = 1.0f - m_segmentV; m_coefficients[1] = m_segmentV; m_derivativeCoefficients[0] = -1.0f; m_derivativeCoefficients[1] = 1.0f; m_vertexDataIndices[0] = m_varyingDataIndices[0] = o + i; - if( periodic ) + if( Periodic ) { m_vertexDataIndices[1] = m_varyingDataIndices[1] = o + ( ( i + 1 ) % numVertices ); } @@ -302,7 +302,7 @@ void CurvesPrimitiveEvaluator::Result::init( unsigned curveIndex, float v, const basis.coefficients( m_segmentV, m_coefficients.data() ); basis.derivativeCoefficients( m_segmentV, m_derivativeCoefficients.data() ); - if( periodic ) + if( Periodic ) { m_vertexDataIndices[0] = o + i; m_vertexDataIndices[1] = o + ( ( i + 1 ) % numVertices );