OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0023310: No IsEqual function for Handles

Browse Source 
IsEqual function for Handle(Standard_Transient) was added to global scope.
Getting rid of compilation errors (removed additional IsEqual functions)
This commit is contained in:
omy 2013-02-01 16:47:50 +04:00
parent 9e3758ca29
commit 024855ee13
5 changed files with 10 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/AIS/AIS_NDataMapOfTransientIteratorOfListTransient.hxx
View File

@ -24,12 +24,6 @@
#include <AIS_NListIteratorOfListTransient.hxx>
#include <NCollection_DefineDataMap.hxx>
inline Standard_Boolean IsEqual (const Handle_Standard_Transient& theH1,
const Handle_Standard_Transient& theH2)
{
return (theH1 == theH2);
}
DEFINE_BASECOLLECTION(AIS_BaseCollItListTransient,
AIS_NListIteratorOfListTransient)
DEFINE_DATAMAP (AIS_NDataMapOfTransientIteratorOfListTransient,

26
src/OpenGl/OpenGl_FontMgr.cxx
View File

@ -33,32 +33,6 @@ float h_scale = 0;
void dump_texture( int id);
class Font_DataMap:
public NCollection_DataMap< Handle(TCollection_HAsciiString),
Handle(TCollection_HAsciiString)>
{
public:
inline Font_DataMap
(const Standard_Integer NbBuckets = 1,
const Handle(NCollection_BaseAllocator)& theAllocator = 0L)
: NCollection_DataMap<Handle(TCollection_HAsciiString),
Handle(TCollection_HAsciiString)> (NbBuckets, theAllocator)
{}
inline Font_DataMap (const Font_DataMap& theOther)
: NCollection_DataMap<Handle(TCollection_HAsciiString),
Handle(TCollection_HAsciiString)> (theOther)
{}
friend Standard_Boolean IsEqual( const Handle(TCollection_HAsciiString)& h1,
const Handle(TCollection_HAsciiString)& h2 );
};
inline Standard_Boolean
IsEqual( const Handle(TCollection_HAsciiString)& h1,
const Handle(TCollection_HAsciiString)& h2 )
{
return (!h1->IsLess(h2) && !h1->IsGreater(h2));
}
OpenGl_FontMgr::OpenGl_FontMgr()
: myCurrentFontId(-1),
myXCurrentScale(1.f),

10
src/Standard/Handle_Standard_Transient.hxx
View File

@ -236,6 +236,16 @@ private:
Standard_Transient *entity;
};
//! Function in global scope to check handles for equality.
//! Will be used with standard OCCT collections like NCollection_DataMap within NCollection_DefaultHasher
//! when there are no specialization defined for concrete type.
//! Notice that this implementation compares only pointers to objects!
inline Standard_Boolean IsEqual (const Handle(Standard_Transient)& theFirst,
const Handle(Standard_Transient)& theSecond)
{
return theFirst == theSecond;
}
#ifdef _WIN32
#pragma warning (pop)
#endif

11
src/TObj/TObj_Common.hxx
View File

@ -33,17 +33,6 @@
#include <TCollection_HExtendedString.hxx>
#include <Standard_Failure.hxx>
//! The function IsEqual explicitly defined for Handle(Standard_Transient)
//! in order to avoid the problem with implicit using of IsEqual() defined
//! for Standard_Address. The problem is that Handle(Standard_Transient)
//! have only operator of type casting to (non-const) Standard_Transient*,
//! hence this implicit way cannot be used for const Handle(Standard_Transient)
inline Standard_Boolean IsEqual(const Handle(Standard_Transient)& One,
const Handle(Standard_Transient)& Two)
{
return One == Two;
}
//! Methods inline implimentation for HExtendedString
inline Standard_Integer HashCode (const Handle(TCollection_HExtendedString)& theStr,

9
src/TopTools/TopTools_MutexForShapeProvider.hxx
View File

@ -32,9 +32,6 @@ class TopoDS_Shape;
//! This class is used to create and store mutexes associated with shapes.
class TopTools_MutexForShapeProvider
{
friend Standard_Boolean IsEqual(const Handle_TopoDS_TShape & theFirstHandle,
const Handle_TopoDS_TShape & theSecondHandle);
public:
//! Constructor
Standard_EXPORT TopTools_MutexForShapeProvider();
@ -66,10 +63,4 @@ private:
};
inline Standard_Boolean IsEqual(const Handle_TopoDS_TShape & theFirstHandle,
const Handle_TopoDS_TShape & theSecondHandle)
{
return (theFirstHandle == theSecondHandle);
}
#endif