lili/OCCT
1
0
Fork 0
mirror of https://github.com/Open-Cascade-SAS/OCCT.git synced 2026-06-22 19:55:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

0024911: Avoid using virtual functions in NCollection classes

Browse Source 
NCollection_BaseCollection class, relevant header files, and macro DEFINE_BASECOLLECTION removed.
Hence methods Assign() from other compatible (via inheritance of BaseCollection) collections are not available any more, as well as base Iterator class.

All methods of Iterator classes are made non-virtual, allowing their inline expansion for better performance.

OCCT-specific operators new and delete added to collection classes and removed from iterator classes.
This commit is contained in:
abv
2014-05-08 09:13:00 +04:00
committed by apn
parent 598fcce93c
commit ddf2fe8eeb
66 changed files with 456 additions and 1016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/NCollection/NCollection_BaseList.cxx
View File

@@ -22,16 +22,14 @@
//purpose : Deletes all nodes from the list
//=======================================================================
void NCollection_BaseList::PClear
(NCollection_DelListNode fDel,
Handle(NCollection_BaseAllocator)& theAllocator)
void NCollection_BaseList::PClear (NCollection_DelListNode fDel)
{
NCollection_ListNode* pCur = myFirst;
NCollection_ListNode* pNext = NULL;
while(pCur)
{
pNext = pCur->Next();
fDel (pCur,theAllocator);
fDel (pCur, myAllocator);
pCur = pNext;
}
myLength = 0;
@@ -115,15 +113,13 @@ void NCollection_BaseList::PPrepend (NCollection_BaseList& theOther)
//purpose :
//=======================================================================
void NCollection_BaseList::PRemoveFirst
(NCollection_DelListNode fDel,
Handle(NCollection_BaseAllocator)& theAllocator)
void NCollection_BaseList::PRemoveFirst (NCollection_DelListNode fDel)
{
Standard_NoSuchObject_Raise_if(IsEmpty(),
"NCollection_BaseList::PRemoveFirst");
NCollection_ListNode* pItem = myFirst;
myFirst = pItem->Next();
fDel (pItem, theAllocator);
fDel (pItem, myAllocator);
myLength--;
if (myLength == 0)
myLast = NULL;
@@ -134,23 +130,20 @@ void NCollection_BaseList::PRemoveFirst
//purpose :
//=======================================================================
void NCollection_BaseList::PRemove
(Iterator& theIter,
NCollection_DelListNode fDel,
Handle(NCollection_BaseAllocator)& theAllocator)
void NCollection_BaseList::PRemove (Iterator& theIter, NCollection_DelListNode fDel)
{
Standard_NoSuchObject_Raise_if(!theIter.More(),
"NCollection_BaseList::PRemove");
if (theIter.myPrevious == NULL)
{
PRemoveFirst (fDel,theAllocator);
PRemoveFirst (fDel);
theIter.myCurrent = myFirst;
}
else
{
NCollection_ListNode* pNode = (theIter.myCurrent)->Next();
(theIter.myPrevious)->Next() = pNode;
fDel (theIter.myCurrent,theAllocator);
fDel (theIter.myCurrent, myAllocator);
theIter.myCurrent = pNode;
if (pNode == NULL)
myLast = theIter.myPrevious;