From d59917473dd42091b6b1ecba61803d36cc3ce324 Mon Sep 17 00:00:00 2001 From: Hank Childs Date: Tue, 17 Sep 2019 23:12:23 -0700 Subject: [PATCH] rename half variable to avoid shadowing CUDA global --- vtkm/exec/cellmetrics/TypeOfCellTriangle.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vtkm/exec/cellmetrics/TypeOfCellTriangle.h b/vtkm/exec/cellmetrics/TypeOfCellTriangle.h index 154c4d3d9..071ca95dd 100644 --- a/vtkm/exec/cellmetrics/TypeOfCellTriangle.h +++ b/vtkm/exec/cellmetrics/TypeOfCellTriangle.h @@ -164,9 +164,9 @@ VTKM_EXEC Scalar GetTriangleArea(const CollectionOfPoints& pts) { const Vector L0 = GetTriangleL0(pts); const Vector L1 = GetTriangleL1(pts); - const Scalar half(0.5); + const Scalar hhalf(0.5); const Scalar crossProductMagnitude = vtkm::Sqrt(vtkm::MagnitudeSquared(vtkm::Cross(L0, L1))); - const Scalar area = half * crossProductMagnitude; + const Scalar area = hhalf * crossProductMagnitude; return area; }