Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '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 c64c17f7c402e4ea82dba33fbe04b2ee8570f60c..0f77a01ed27536f4ae988a5207e8d0a04fe9680a 100644
(file)
--- a/
src/DriverMED/DriverMED_Family.h
+++ b/
src/DriverMED/DriverMED_Family.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-6,7
+6,7
@@
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-49,10
+49,10
@@
#define REST_BALL_FAMILY -5
#define FIRST_ELEM_FAMILY -6
#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
{
class MESHDRIVERMED_EXPORT DriverMED_Family
{
@@
-69,7
+69,7
@@
class MESHDRIVERMED_EXPORT DriverMED_Family
*/
static
DriverMED_FamilyPtrList
*/
static
DriverMED_FamilyPtrList
- MakeFamilies (
const SMESHDS_SubMeshPtrMap&
theSubMeshes,
+ MakeFamilies (
SMESHDS_SubMeshIteratorPtr
theSubMeshes,
const SMESHDS_GroupBasePtrList& theGroups,
const bool doGroupOfNodes,
const bool doGroupOfEdges,
const SMESHDS_GroupBasePtrList& theGroups,
const bool doGroupOfNodes,
const bool doGroupOfEdges,