From: Roman Lygin <roman.lygin@gmail.com>
Date: Wed, 1 Aug 2012 20:14:05 +0000 (+0400)
Subject: 0023365: Name collision of global IsEqual() leads to overriding user's definition
X-Git-Tag: V6_5_4_beta1~80
X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=f3fa1d3509de6d904e56879c448dc6ed02f1ddd0

0023365: Name collision of global IsEqual() leads to overriding user's definition

Prevent name collision of global IsEqual()
---

diff --git a/src/AIS/AIS_ConnectedShape.cxx b/src/AIS/AIS_ConnectedShape.cxx
index bef05e1b6c..ff63d24b73 100755
--- a/src/AIS/AIS_ConnectedShape.cxx
+++ b/src/AIS/AIS_ConnectedShape.cxx
@@ -38,6 +38,7 @@
 #include <StdSelect_BRepOwner.hxx>
 #include <StdSelect.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
+#include <TopTools_OrientedShapeMapHasher.hxx>
 #include <TopExp.hxx>
 #include <Select3D_SensitiveEntity.hxx>
 #include <SelectMgr_EntityOwner.hxx>
@@ -182,17 +183,13 @@ void AIS_ConnectedShape::Compute(const Handle_PrsMgr_PresentationManager2d& aPre
 //function : ComputeSelection 
 //purpose  : Attention fragile...
 //=======================================================================
-static Standard_Boolean IsEqual( const TopoDS_Shape& theLeft, 
-                                 const TopoDS_Shape& theRight )
-{
-  return theLeft.IsEqual(theRight);
-}
 
 void AIS_ConnectedShape::ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, 
                                            const Standard_Integer aMode)
 {
   typedef NCollection_List<Handle(Select3D_SensitiveEntity)> SensitiveList;
-  typedef NCollection_DataMap<TopoDS_Shape, SensitiveList > Shapes2EntitiesMap; 
+  typedef NCollection_DataMap<TopoDS_Shape, SensitiveList, TopTools_OrientedShapeMapHasher>
+    Shapes2EntitiesMap;
 
   UpdateShape();
   aSelection->Clear();