X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FINTERP_KERNEL%2FInterpolation2D3D.hxx;h=dbdb34ed75c4e1bf170cfc3345af41d64009f2d9;hb=4c22ba01f2901896d1ec9ca302640f4d7e50d147;hp=0a68b1151079ef72ca7755d6ce2132334dd7a657;hpb=9f966e0ed55cc976b59a17318a7be82445529eda;p=tools%2Fmedcoupling.git diff --git a/src/INTERP_KERNEL/Interpolation2D3D.hxx b/src/INTERP_KERNEL/Interpolation2D3D.hxx index 0a68b1151..dbdb34ed7 100644 --- a/src/INTERP_KERNEL/Interpolation2D3D.hxx +++ b/src/INTERP_KERNEL/Interpolation2D3D.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D +// Copyright (C) 2007-2020 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -27,6 +27,7 @@ #include "Interpolation.hxx" #include "NormalizedUnstructuredMesh.hxx" #include "InterpolationOptions.hxx" +#include "MCIdType.hxx" namespace INTERP_KERNEL { @@ -42,12 +43,12 @@ namespace INTERP_KERNEL class Interpolation2D3D : public Interpolation { public: - typedef std::map > DuplicateFacesType; + typedef std::map > DuplicateFacesType; INTERPKERNEL_EXPORT Interpolation2D3D(); INTERPKERNEL_EXPORT Interpolation2D3D(const InterpolationOptions& io); template - int interpolateMeshes(const MyMeshType& srcMesh, + typename MyMeshType::MyConnType interpolateMeshes(const MyMeshType& srcMesh, const MyMeshType& targetMesh, MyMatrixType& matrix, const std::string& method);