correct small problem from the version in the MedFileV2_2 branch.

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

diff --git a/src/MEDMEM/MEDMEM_Group.hxx b/src/MEDMEM/MEDMEM_Group.hxx
index c19dcdbba7064f8db294156b51815af3671eea27..f0cde2141062ad7a391a3bdab6dcdebeb8cbfbfc 100644 (file)
--- a/src/MEDMEM/MEDMEM_Group.hxx
+++ b/src/MEDMEM/MEDMEM_Group.hxx
@@ -1,29 +1,3 @@
-//  MED MEDMEM : MED files in memory
-//
-//  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. 
-// 
-//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
-//
-//
-//
-//  File   : MEDMEM_Group.hxx
-//  Module : MED
-
 /*
  File Group.hxx
  $Header$
@@ -34,10 +8,8 @@
 
 #include <vector>
 #include <list>
-//#include "MEDMEM_Support.hxx"
 #include "MEDMEM_Family.hxx"
 
-class FAMILY;
 
 /*!
 
@@ -47,18 +19,22 @@ class FAMILY;
 
 */
 
-class GROUP : public SUPPORT
+namespace MEDMEM {
+class FAMILY;
+class GROUP : virtual public SUPPORT
 {
 protected :
   /*!
     \if developper
     Number of families in the group.
+    \endif
   */
   int             _numberOfFamilies ;
   /*!
     \if developper
     Vector of families in the group.
     Note that Families are numbered from 1 to N.
+    \endif
   */
   vector<FAMILY*> _family ;
   
@@ -70,7 +46,7 @@ public:
   /*! Copy Constructor. */
   GROUP(const GROUP & m);
   /*! Destructor. */
-  ~GROUP();
+  virtual ~GROUP();
 
   /*! Copy operator. */
   // PN ATTention il n y a pas de copie du vecteur Family ????
@@ -87,8 +63,10 @@ public:
   inline FAMILY *       getFamily(int i) const ;
 
 };
+};
 
 // inline method :
+using namespace MEDMEM;
 
 /*! set the attribut _numberOfFamilies to numberOfFamilies */
 //----------------------------------------------------------