From f3fa1d3509de6d904e56879c448dc6ed02f1ddd0 Mon Sep 17 00:00:00 2001 From: Roman Lygin Date: Thu, 2 Aug 2012 00:14:05 +0400 Subject: [PATCH] 0023365: Name collision of global IsEqual() leads to overriding user's definition Prevent name collision of global IsEqual() --- src/AIS/AIS_ConnectedShape.cxx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 #include #include +#include #include #include #include @@ -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 SensitiveList; - typedef NCollection_DataMap Shapes2EntitiesMap; + typedef NCollection_DataMap + Shapes2EntitiesMap; UpdateShape(); aSelection->Clear(); -- 2.20.1