cherry-pick between a669 and 19a96 of V7_main

[tools/medcoupling.git] / src / INTERP_KERNEL / InterpolationPlanar.hxx

diff --git a/src/INTERP_KERNEL/InterpolationPlanar.hxx b/src/INTERP_KERNEL/InterpolationPlanar.hxx
index c30cd81f44002fafae6db004726d68c102a9b2e8..744846e67464e1a92e673c278b0fad34ae055f1b 100755 (executable)
--- a/src/INTERP_KERNEL/InterpolationPlanar.hxx
+++ b/src/INTERP_KERNEL/InterpolationPlanar.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013  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
@@ -16,6 +16,7 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// Author : Anthony Geay (CEA/DEN)
 
 #ifndef __INTERPOLATIONPLANAR_HXX__
 #define __INTERPOLATIONPLANAR_HXX__
@@ -42,7 +43,7 @@ namespace INTERP_KERNEL
     
     // Main function to interpolate triangular and quadratic meshes
     template<class MyMeshType, class MatrixType>
-    int interpolateMeshes(const MyMeshType& meshS, const MyMeshType& meshT, MatrixType& result, const char *method);
+    int interpolateMeshes(const MyMeshType& meshS, const MyMeshType& meshT, MatrixType& result, const std::string& method);
   public:
     bool doRotate() const { return asLeafInterpPlanar().doRotate(); }
     double medianPlane() const { return asLeafInterpPlanar().medianPlane(); }