Merge from V6_main_20120808 08Aug12

[modules/med.git] / src / MEDMEM / MEDMEM_PorflowMeshDriver.hxx

diff --git a/src/MEDMEM/MEDMEM_PorflowMeshDriver.hxx b/src/MEDMEM/MEDMEM_PorflowMeshDriver.hxx
index 43ee432298b703f6006115efe6cf738f40490718..a1540acca3a131a1edf9c22058ae1970257df9fe 100644 (file)
--- a/src/MEDMEM/MEDMEM_PorflowMeshDriver.hxx
+++ b/src/MEDMEM/MEDMEM_PorflowMeshDriver.hxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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.
+// 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.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef PORFLOW_MESH_DRIVER_HXX
 #define PORFLOW_MESH_DRIVER_HXX
 
@@ -48,6 +49,7 @@
 
 
 namespace MEDMEM {
+class GMESH;
 class MESH;
 class FAMILY;
 class GROUP;
@@ -94,9 +96,9 @@ public :
   /*!
     Constructor.
   */
-  PORFLOW_MESH_DRIVER(const string & fileName,  
-                 MESH * ptrMesh, 
-                 MED_EN::med_mode_acces accessMode) ;
+  PORFLOW_MESH_DRIVER(const string &         fileName,  
+                      GMESH *                ptrMesh, 
+                      MED_EN::med_mode_acces accessMode) ;
   /*!
     Copy constructor.
   */
@@ -190,7 +192,7 @@ public :
   /*!
     Constructor.
   */
-  PORFLOW_MESH_WRONLY_DRIVER(const string & fileName, MESH * ptrMesh) ;
+  PORFLOW_MESH_WRONLY_DRIVER(const string & fileName, GMESH * ptrMesh) ;
   /*!
     Copy constructor.
   */