X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_MEDSupport_i.hxx;h=15cf3b8f4fa8ce0e021d98ccb22aae14114c4ed6;hp=5be60dda40e76743c8110b3b4d7bde3168ed6334;hb=127d2277c6a516d0e9fadd77b4ef0b0c6286cf17;hpb=341338ff083c4c6f4ab2839c626833818c2b6c42

diff --git a/src/SMESH_I/SMESH_MEDSupport_i.hxx b/src/SMESH_I/SMESH_MEDSupport_i.hxx
index 5be60dda4..15cf3b8f4 100644
--- a/src/SMESH_I/SMESH_MEDSupport_i.hxx
+++ b/src/SMESH_I/SMESH_MEDSupport_i.hxx
@@ -1,32 +1,33 @@
-// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses
-//
-// Copyright (C) 2003 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.
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// 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.
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// 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
+//  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.
 //
-// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//  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
 //
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses
 // File : SMESH_MEDSupport_i.hxx
 // Module : SMESH
-
+//
 #ifndef _MED_SMESH_MEDSUPPORT_I_HXX_
 #define _MED_SMESH_MEDSUPPORT_I_HXX_
 
+#include "SMESH.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(MED)
 #include <string>
@@ -37,17 +38,17 @@
 #include "SMDS_MeshNode.hxx"
 
 #include "SMESH_MEDSupport_i.hxx"
-
+#include "SALOME_GenericObj_i.hh"
 class SMESH_subMesh_i;
 
-class SMESH_MEDSupport_i:
-	public POA_SALOME_MED::SUPPORT, public PortableServer::RefCountServantBase
+class SMESH_I_EXPORT SMESH_MEDSupport_i:
+	public virtual POA_SALOME_MED::SUPPORT, public virtual SALOME::GenericObj_i
 {
   public:
 
 // Constructors and associated internal methods
 	SMESH_MEDSupport_i(SMESH_subMesh_i * sm,
-		string name, string description, SALOME_MED::medEntityMesh entity);
+		std::string name, std::string description, SALOME_MED::medEntityMesh entity);
 	SMESH_MEDSupport_i(const SMESH_MEDSupport_i & s);
 
 // IDL Methods
@@ -66,6 +67,13 @@ class SMESH_MEDSupport_i:
 	getNumber(SALOME_MED::medGeometryElement geomElement)
 	  throw(SALOME::SALOME_Exception);
 
+  /*!
+   * Same function as getNumber.
+   */
+	SALOME_MED::long_array *
+	getNumberFromFile(SALOME_MED::medGeometryElement geomElement)
+	  throw(SALOME::SALOME_Exception);
+
 	SALOME_MED::long_array * getNumberIndex()
 	  throw(SALOME::SALOME_Exception);
 
@@ -93,8 +101,8 @@ class SMESH_MEDSupport_i:
 	::SMESH_subMesh_i * _subMesh_i;
 
 	SMESHDS_Mesh * _meshDS;
-	string _name;
-	string _description;
+	std::string _name;
+        std::string _description;
 	bool _isOnAllElements;
 	bool _seqNumber;
 	int _seqLength;