From 714ec20d9675ab2c7d5530ae57656635def4e30f Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Fri, 3 Jan 2020 11:04:27 +0100 Subject: [PATCH] Help centos7 C++ compiler --- src/INTERP_KERNEL/InterpolationCurve.hxx | 34 ++++++++++++++---------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/INTERP_KERNEL/InterpolationCurve.hxx b/src/INTERP_KERNEL/InterpolationCurve.hxx index 40eecfc03..34f7bf164 100755 --- a/src/INTERP_KERNEL/InterpolationCurve.hxx +++ b/src/INTERP_KERNEL/InterpolationCurve.hxx @@ -44,22 +44,28 @@ namespace INTERP_KERNEL std::function< void(const BBTree< MyMeshType::MY_SPACEDIM , typename MyMeshType::MyConnType>&, const double*, std::vector&) > bbtreeMethod); template typename MyMeshType::MyConnType interpolateMeshes(const MyMeshType& meshS, const MyMeshType& meshT, - MatrixType& result, const std::string& method) { return this->interpolateMeshesInternal(meshS,meshT,result,method,[](const BBTree< MyMeshType::MY_SPACEDIM , - typename MyMeshType::MyConnType>& bbtree, const double *bb, - std::vector& intersecting_elems) - { bbtree.getIntersectingElems(bb, intersecting_elems); }); } + MatrixType& result, const std::string& method) + { + std::function< void(const BBTree< MyMeshType::MY_SPACEDIM , typename MyMeshType::MyConnType>&, const double*, std::vector&) > bbtreeMethod = + [](const BBTree< MyMeshType::MY_SPACEDIM , typename MyMeshType::MyConnType>& bbtree, const double *bb, std::vector& intersecting_elems) + { bbtree.getIntersectingElems(bb, intersecting_elems); }; + return this->interpolateMeshesInternal(meshS,meshT,result,method,bbtreeMethod); + } + template typename MyMeshType::MyConnType interpolateMeshes0D(const MyMeshType& meshS, const MyMeshType& meshT, - MatrixType& result, const std::string& method) { return this->interpolateMeshesInternal(meshS,meshT,result,method,[](const BBTree< MyMeshType::MY_SPACEDIM , - typename MyMeshType::MyConnType>& bbtree, const double *bb, - std::vector& intersecting_elems) - { - double TMP[MyMeshType::MY_SPACEDIM]; - for(int i=0;i&, const double*, std::vector&) > bbtreeMethod = + [](const BBTree< MyMeshType::MY_SPACEDIM , typename MyMeshType::MyConnType>& bbtree, const double *bb, std::vector& intersecting_elems) + { + double TMP[MyMeshType::MY_SPACEDIM]; + for(int i=0;iinterpolateMeshesInternal(meshS,meshT,result,method,bbtreeMethod); + } }; } -- 2.39.2