Merge branch 'abn/fix_intersec' into V7_main

[modules/med.git] / src / MEDCouplingCorba / MEDCouplingCMeshServant.hxx

diff --git a/src/MEDCouplingCorba/MEDCouplingCMeshServant.hxx b/src/MEDCouplingCorba/MEDCouplingCMeshServant.hxx
index bd53bda56732f0ef5196238d0ed4480175991856..91d2ac6ed1d67221ea9e863ee76328536c5b7a82 100644 (file)
--- a/src/MEDCouplingCorba/MEDCouplingCMeshServant.hxx
+++ b/src/MEDCouplingCorba/MEDCouplingCMeshServant.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2014  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
@@ -16,6 +16,7 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// Author : Anthony Geay (CEA/DEN)
 
 #ifndef __MEDCOUPLINGCMESHSERVANT_HXX__
 #define __MEDCOUPLINGCMESHSERVANT_HXX__
@@ -23,14 +24,14 @@
 #include "SALOMEconfig.h"
 
 #include CORBA_SERVER_HEADER(MEDCouplingCorbaServant)
-#include "MEDCouplingMeshServant.hxx"
+#include "MEDCouplingStructuredMeshServant.hxx"
 #include "MEDCouplingCorba.hxx"
 
 namespace ParaMEDMEM
 {
   class MEDCouplingCMesh;
 
-  class MEDCOUPLINGCORBA_EXPORT MEDCouplingCMeshServant : MEDCouplingMeshServant, public virtual POA_SALOME_MED::MEDCouplingCMeshCorbaInterface
+  class MEDCOUPLINGCORBA_EXPORT MEDCouplingCMeshServant : MEDCouplingStructuredMeshServant, public virtual POA_SALOME_MED::MEDCouplingCMeshCorbaInterface
   {
   public:
     typedef MEDCouplingCMesh CppType;