From defb4f00cf2e529a5cf10620e936bc18ae0e4de5 Mon Sep 17 00:00:00 2001 From: Kenneth Moreland Date: Wed, 30 Apr 2014 09:47:22 -0600 Subject: [PATCH] Fix CLANG errors and warnings for FunctionInterface. --- vtkm/internal/FunctionInterface.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vtkm/internal/FunctionInterface.h b/vtkm/internal/FunctionInterface.h index 62e36b64f..665f0cf98 100644 --- a/vtkm/internal/FunctionInterface.h +++ b/vtkm/internal/FunctionInterface.h @@ -226,6 +226,7 @@ struct IdentityFunctor { const TransformFunctor &transform) \ { \ (void)parameters; \ + (void)transform; \ result.Value = \ transform( \ f(BOOST_PP_ENUM_SHIFTED(NumParamsPlusOne, VTK_M_DO_INVOKE_TPARAM, ))); \ @@ -242,6 +243,7 @@ struct IdentityFunctor { const TransformFunctor &transform) \ { \ (void)parameters; \ + (void)transform; \ f(BOOST_PP_ENUM_SHIFTED(NumParamsPlusOne, VTK_M_DO_INVOKE_TPARAM, )); \ } #define VTK_M_DO_INVOKE_REPEAT(z, NumParams, data) \ @@ -551,7 +553,7 @@ public: typename ReplaceType::type replacedFuncInterface; detail::FunctionInterfaceCopyParameters:: Copy(replacedFuncInterface.Parameters, this->Parameters); - replacedFuncInterface.SetParameter(newParameter); + replacedFuncInterface.template SetParameter(newParameter); detail::FunctionInterfaceCopyParameters:: Copy(replacedFuncInterface.Parameters, this->Parameters); return replacedFuncInterface;