ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-28 18:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

22359: Body Fitting algorithm: grid orientation

Browse Source 
Move global methods needed for NCollection_DataMap< TopoDS_Shape, * >
to class SMESHDS_Hasher in order not to clash with the same global definitions

-  typedef NCollection_DataMap< TopoDS_Shape, THypList > ShapeToHypothesis;
+  typedef NCollection_DataMap< TopoDS_Shape, THypList, SMESHDS_Hasher > ShapeToHypothesis;
This commit is contained in:
eap 2014-02-04 13:05:33 +00:00
parent cd3ffac3fa
commit a62ca0b865
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/SMESHDS/SMESHDS_DataMapOfShape.hxx
View File

@ -32,13 +32,19 @@
/* /*
* This method needed for instance NCollection_DataMap with TopoDS_Shape as key * This method needed for instance NCollection_DataMap with TopoDS_Shape as key
*/ */
struct SMESHDS_Hasher
inline Standard_Boolean IsEqual(const TopoDS_Shape& S1,
const TopoDS_Shape& S2)
{ {
static inline Standard_Boolean IsEqual(const TopoDS_Shape& S1,
const TopoDS_Shape& S2)
{
return S1.IsSame(S2); return S1.IsSame(S2);
} }
static inline Standard_Integer HashCode(const TopoDS_Shape& S,
const Standard_Integer Upper)
{
return ::HashCode( S, Upper);
}
};
#endif #endif

10
src/SMESHDS/SMESHDS_Mesh.hxx
View File

@ -61,7 +61,8 @@ class SMDS_BallElement;
class SMESHDS_GroupBase; class SMESHDS_GroupBase;
class DownIdType; class DownIdType;
class SMESHDS_EXPORT SMESHDS_Mesh:public SMDS_Mesh{ class SMESHDS_EXPORT SMESHDS_Mesh : public SMDS_Mesh
{
public: public:
SMESHDS_Mesh(int theMeshID, bool theIsEmbeddedMode); SMESHDS_Mesh(int theMeshID, bool theIsEmbeddedMode);
bool IsEmbeddedMode(); bool IsEmbeddedMode();
@ -603,14 +604,9 @@ private:
it->second->AddNode( aNode ); // add aNode to submesh it->second->AddNode( aNode ); // add aNode to submesh
} }
/*int HashCode( const TopoDS_Shape& S, const Standard_Integer theUpper ) const
{
return S.HashCode(2147483647);
}*/
typedef std::list<const SMESHDS_Hypothesis*> THypList; typedef std::list<const SMESHDS_Hypothesis*> THypList;
typedef NCollection_DataMap< TopoDS_Shape, THypList > ShapeToHypothesis; typedef NCollection_DataMap< TopoDS_Shape, THypList, SMESHDS_Hasher > ShapeToHypothesis;
ShapeToHypothesis myShapeToHypothesis; ShapeToHypothesis myShapeToHypothesis;