X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FINTERP_KERNEL%2FInterpolation.hxx;h=0988c26ae62b06460c36aa428e57a9176c127e3e;hb=d426837c21eca9b56b9b8a7a7434aaf3969c8977;hp=a9402871fea95ce93fe8c4b0ddaed16d5134ea2f;hpb=7895e356ec72f6667cbe4423e580e5a0839916d7;p=tools%2Fmedcoupling.git diff --git a/src/INTERP_KERNEL/Interpolation.hxx b/src/INTERP_KERNEL/Interpolation.hxx index a9402871f..0988c26ae 100644 --- a/src/INTERP_KERNEL/Interpolation.hxx +++ b/src/INTERP_KERNEL/Interpolation.hxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D +// Copyright (C) 2007-2016 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 // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -40,14 +40,14 @@ namespace INTERP_KERNEL int interpolateMeshes(const MyMeshType& meshS, const MyMeshType& meshT, MatrixType& result) { return asLeaf().interpolateMeshes(meshS,meshT,result); } template - int fromIntegralUniform(const MyMeshType& meshT, MatrixType& result, const char *method) { return fromToIntegralUniform(false,meshT,result,method); } + int fromIntegralUniform(const MyMeshType& meshT, MatrixType& result, const std::string& method) { return fromToIntegralUniform(false,meshT,result,method); } template - int toIntegralUniform(const MyMeshType& meshS, MatrixType& result, const char *method) { return fromToIntegralUniform(true,meshS,result,method); } + int toIntegralUniform(const MyMeshType& meshS, MatrixType& result, const std::string& method) { return fromToIntegralUniform(true,meshS,result,method); } template static double CalculateCharacteristicSizeOfMeshes(const MyMeshType& myMeshS, const MyMeshType& myMeshT, const int printLevel); protected: template - int fromToIntegralUniform(bool fromTo, const MyMeshType& mesh, MatrixType& result, const char *method); + int fromToIntegralUniform(bool fromTo, const MyMeshType& mesh, MatrixType& result, const std::string& method); protected: TrueMainInterpolator& asLeaf() { return static_cast(*this); } };