Merge remote branch 'origin/V7_dev'

[modules/smesh.git] / src / DriverMED / DriverMED_Family.h

diff --git a/src/DriverMED/DriverMED_Family.h b/src/DriverMED/DriverMED_Family.h
index d774603da613dca1459906d952e24fd31b467135..0f77a01ed27536f4ae988a5207e8d0a04fe9680a 100644 (file)
--- a/src/DriverMED/DriverMED_Family.h
+++ b/src/DriverMED/DriverMED_Family.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -49,10 +49,10 @@
 #define REST_BALL_FAMILY    -5
 #define FIRST_ELEM_FAMILY   -6
 
-typedef std::list<DriverMED_FamilyPtr     > DriverMED_FamilyPtrList;
-typedef std::map<int,SMESHDS_SubMesh*     > SMESHDS_SubMeshPtrMap;
-typedef std::list<SMESHDS_GroupBase*      > SMESHDS_GroupBasePtrList;
-typedef std::set<const SMDS_MeshElement*  > ElementsSet;
+typedef std::list<DriverMED_FamilyPtr               > DriverMED_FamilyPtrList;
+typedef std::map<int,SMESHDS_SubMesh*               > SMESHDS_SubMeshPtrMap;
+typedef std::list<SMESHDS_GroupBase*                > SMESHDS_GroupBasePtrList;
+typedef std::set<const SMDS_MeshElement*,TIDCompare > ElementsSet;
 
 class MESHDRIVERMED_EXPORT DriverMED_Family
 {
@@ -69,7 +69,7 @@ class MESHDRIVERMED_EXPORT DriverMED_Family
   */
   static 
   DriverMED_FamilyPtrList
-  MakeFamilies (const SMESHDS_SubMeshPtrMap& theSubMeshes,
+  MakeFamilies (SMESHDS_SubMeshIteratorPtr      theSubMeshes,
                 const SMESHDS_GroupBasePtrList& theGroups,
                 const bool doGroupOfNodes,
                 const bool doGroupOfEdges,