diff --git a/src/GraphTools/GraphTools_BFSIterator.gxx b/src/GraphTools/GraphTools_BFSIterator.gxx index 55718b2519..115fa3a3bf 100644 --- a/src/GraphTools/GraphTools_BFSIterator.gxx +++ b/src/GraphTools/GraphTools_BFSIterator.gxx @@ -16,7 +16,7 @@ #include #include -#include +#include //======================================================================= //function : GraphTools_BFSIterator @@ -36,18 +36,18 @@ void GraphTools_BFSIterator::Perform { Standard_Integer index; myVisited.Clear(); - TColStd_QueueOfInteger myReady; + TColStd_ListOfInteger myReady; index = myVisited.Add(V); - myReady.Push(index); + myReady.Append(index); while (!myReady.IsEmpty()) { - Vertex w1 = myVisited (myReady.Front()); - myReady.Pop(); + Vertex w1 = myVisited (myReady.First()); + myReady.RemoveFirst(); for (VIterator it(G,w1); it.More(); it.Next()) { Vertex w2 = it.Value(); if (!myVisited.Contains(w2)) { index = myVisited.Add(w2); - myReady.Push(index); + myReady.Append(index); } } } diff --git a/src/GraphTools/GraphTools_TopologicalSortFromIterator.gxx b/src/GraphTools/GraphTools_TopologicalSortFromIterator.gxx index 17cbd0091c..2671914bed 100644 --- a/src/GraphTools/GraphTools_TopologicalSortFromIterator.gxx +++ b/src/GraphTools/GraphTools_TopologicalSortFromIterator.gxx @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include //======================================================================= @@ -76,24 +76,24 @@ void GraphTools_TopologicalSortFromIterator::Perform indexcurrent++; } // current root vertices queue - TColStd_QueueOfInteger processQueue; + TColStd_ListOfInteger processQueue; Standard_Integer nbVertices = myVertices.Extent(); for (i = 1 ; i <= nbVertices; i++) { - if (myVertices(i).NbRef() == 0) processQueue.Push(i); + if (myVertices(i).NbRef() == 0) processQueue.Append(i); } // acyclic processing while (!processQueue.IsEmpty()) { - indexcurrent = processQueue.Front(); + indexcurrent = processQueue.First(); mySort.Append(indexcurrent); nbadjacent = myVertices(indexcurrent).NbSuccessors(); for (i = 1; i <= nbadjacent; i++) { indexadjacent = myVertices(indexcurrent).GetSuccessor(i); myVertices(indexadjacent).DecreaseRef(); if (myVertices(indexadjacent).NbRef() == 0) { - processQueue.Push (indexadjacent); + processQueue.Append(indexadjacent); } } - processQueue.Pop(); + processQueue.RemoveFirst(); } // cyclic processing myCycles = mySort.Length() + 1; diff --git a/src/NCollection/FILES b/src/NCollection/FILES index f5c0d3af7e..d556cad244 100755 --- a/src/NCollection/FILES +++ b/src/NCollection/FILES @@ -27,7 +27,6 @@ NCollection_Array1.hxx NCollection_HArray1.hxx NCollection_Array2.hxx NCollection_HArray2.hxx -NCollection_Queue.hxx NCollection_Stack.hxx NCollection_List.hxx NCollection_SList.hxx @@ -52,7 +51,6 @@ NCollection_DefineDataMap.hxx NCollection_DefineDoubleMap.hxx NCollection_DefineIndexedMap.hxx NCollection_DefineIndexedDataMap.hxx -NCollection_DefineQueue.hxx NCollection_DefineSList.hxx NCollection_DefineSequence.hxx NCollection_DefineHSequence.hxx diff --git a/src/NCollection/NCollection_DefineQueue.hxx b/src/NCollection/NCollection_DefineQueue.hxx deleted file mode 100644 index 3ac9eaedfc..0000000000 --- a/src/NCollection/NCollection_DefineQueue.hxx +++ /dev/null @@ -1,34 +0,0 @@ -// Created on: 2002-04-17 -// Created by: Alexander Kartomin (akm) -// Copyright (c) 2002-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -// Automatically created from NCollection_Queue.hxx by GAWK -// Purpose: A queue is a structure where Items are added at -// the end and removed from the front. The first -// entered Item will be the first removed. This is -// called a FIFO (First In First Out). -// Inherits BaseList, adds the data item to each node. - - -#ifndef NCollection_DefineQueue_HeaderFile -#define NCollection_DefineQueue_HeaderFile - -#include - -// **************************************** Template for Queue class ******** - -#define DEFINE_QUEUE(_ClassName_, _BaseCollection_, TheItemType) \ -typedef NCollection_Queue _ClassName_; - -#endif diff --git a/src/NCollection/NCollection_Queue.hxx b/src/NCollection/NCollection_Queue.hxx deleted file mode 100644 index 93c742075e..0000000000 --- a/src/NCollection/NCollection_Queue.hxx +++ /dev/null @@ -1,142 +0,0 @@ -// Created on: 2002-04-17 -// Created by: Alexander Kartomin (akm) -// Copyright (c) 2002-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef NCollection_Queue_HeaderFile -#define NCollection_Queue_HeaderFile - -#include - -#if !defined No_Exception && !defined No_Standard_NoSuchObject -#include -#endif - -/** - * Purpose: A queue is a structure where Items are added at - * the end and removed from the front. The first - * entered Item will be the first removed. This is - * called a FIFO (First In First Out). - * Inherits BaseList, adds the data item to each node. - */ -template class NCollection_Queue - : public NCollection_BaseCollection, - public NCollection_BaseList -{ - public: - typedef NCollection_TListNode QueueNode; - typedef NCollection_TListIterator Iterator; - - public: - // ---------- PUBLIC METHODS ------------ - - //! Constructor - NCollection_Queue(const Handle(NCollection_BaseAllocator)& theAllocator=0L) : - NCollection_BaseCollection(theAllocator), - NCollection_BaseList() {} - - //! Copy constructor - NCollection_Queue (const NCollection_Queue& theOther) : - NCollection_BaseCollection(theOther.myAllocator), - NCollection_BaseList() - { *this = theOther; } - - //! Size - Number of items - virtual Standard_Integer Size (void) const - { return Extent(); } - - //! Length - number of items - Standard_Integer Length (void) const - { return Extent(); } - - //! Replace this list by the items of theOther collection - virtual void Assign (const NCollection_BaseCollection& theOther) - { - if (this == &theOther) - return; - Clear(); - TYPENAME NCollection_BaseCollection::Iterator& anIter = - theOther.CreateIterator(); - for (; anIter.More(); anIter.Next()) - { - QueueNode* pNew = new (this->myAllocator) QueueNode(anIter.Value()); - PAppend(pNew); - } - } - - //! Replace this list by the items of theOther queue - NCollection_Queue& operator= (const NCollection_Queue& theOther) - { - if (this == &theOther) - return *this; - Clear (); - QueueNode * pCur = (QueueNode *) theOther.PFirst(); - while (pCur) - { - QueueNode* pNew = new (this->myAllocator) QueueNode(pCur->Value()); - PAppend(pNew); - pCur = (QueueNode *) pCur->Next(); - } - return *this; - } - - //! Clear this queue - void Clear (void) - { PClear (QueueNode::delNode, this->myAllocator); } - - //! Frontal item - constant - const TheItemType& Front (void) const - { -#if !defined No_Exception && !defined No_Standard_NoSuchObject - if (IsEmpty()) - Standard_NoSuchObject::Raise ("NCollection_Queue::Front"); -#endif - return ((const QueueNode *) PFirst())->Value(); - } - - //! Frontal item - variable - TheItemType& ChangeFront (void) - { -#if !defined No_Exception && !defined No_Standard_NoSuchObject - if (IsEmpty()) - Standard_NoSuchObject::Raise ("NCollection_Queue::ChangeFront"); -#endif - return ((QueueNode *) PFirst())->ChangeValue(); - } - - //! Push one item - void Push (const TheItemType& theItem) - { - QueueNode * pNew = new (this->myAllocator) QueueNode(theItem); - PAppend(pNew); - } - - //! Pop first item - void Pop (void) - { PRemoveFirst (QueueNode::delNode, this->myAllocator); } - - //! Destructor - clears the List - ~NCollection_Queue (void) - { Clear(); } - - private: - // ----------- PRIVATE METHODS ----------- - - //! Creates Iterator for use on BaseCollection - virtual TYPENAME NCollection_BaseCollection::Iterator& - CreateIterator(void) const - { return *(new (this->IterAllocator()) Iterator(*this)); } - -}; - -#endif diff --git a/src/OpenGl/OpenGl_Context.cxx b/src/OpenGl/OpenGl_Context.cxx index 69d100d20e..c64e9318eb 100644 --- a/src/OpenGl/OpenGl_Context.cxx +++ b/src/OpenGl/OpenGl_Context.cxx @@ -96,7 +96,7 @@ OpenGl_Context::OpenGl_Context (const Handle(OpenGl_Caps)& theCaps) nvxMem (Standard_False), mySharedResources (new OpenGl_ResourcesMap()), myDelayed (new OpenGl_DelayReleaseMap()), - myReleaseQueue (new OpenGl_ResourcesQueue()), + myUnusedResources (new OpenGl_ResourcesStack()), myClippingState (), myGlLibHandle (NULL), myFuncs (new OpenGl_GlFunctions()), @@ -300,7 +300,7 @@ void OpenGl_Context::Share (const Handle(OpenGl_Context)& theShareCtx) { mySharedResources = theShareCtx->mySharedResources; myDelayed = theShareCtx->myDelayed; - myReleaseQueue = theShareCtx->myReleaseQueue; + myUnusedResources = theShareCtx->myUnusedResources; myShaderManager = theShareCtx->myShaderManager; } } @@ -1869,7 +1869,7 @@ void OpenGl_Context::ReleaseResource (const TCollection_AsciiString& theKey, // ======================================================================= void OpenGl_Context::DelayedRelease (Handle(OpenGl_Resource)& theResource) { - myReleaseQueue->Push (theResource); + myUnusedResources->Prepend (theResource); theResource.Nullify(); } @@ -1880,10 +1880,10 @@ void OpenGl_Context::DelayedRelease (Handle(OpenGl_Resource)& theResource) void OpenGl_Context::ReleaseDelayed() { // release queued elements - while (!myReleaseQueue->IsEmpty()) + while (!myUnusedResources->IsEmpty()) { - myReleaseQueue->Front()->Release (this); - myReleaseQueue->Pop(); + myUnusedResources->First()->Release (this); + myUnusedResources->RemoveFirst(); } // release delayed shared resources diff --git a/src/OpenGl/OpenGl_Context.hxx b/src/OpenGl/OpenGl_Context.hxx index 3de3bfdc45..f11a282f8e 100644 --- a/src/OpenGl/OpenGl_Context.hxx +++ b/src/OpenGl/OpenGl_Context.hxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -463,12 +463,12 @@ private: // context info typedef NCollection_Handle Handle(OpenGl_DelayReleaseMap); typedef NCollection_DataMap OpenGl_ResourcesMap; typedef NCollection_Handle Handle(OpenGl_ResourcesMap); - typedef NCollection_Queue OpenGl_ResourcesQueue; - typedef NCollection_Handle Handle(OpenGl_ResourcesQueue); + typedef NCollection_List OpenGl_ResourcesStack; + typedef NCollection_Handle Handle(OpenGl_ResourcesStack); Handle(OpenGl_ResourcesMap) mySharedResources; //!< shared resources with unique identification key Handle(OpenGl_DelayReleaseMap) myDelayed; //!< shared resources for delayed release - Handle(OpenGl_ResourcesQueue) myReleaseQueue; //!< queue of resources for delayed clean up + Handle(OpenGl_ResourcesStack) myUnusedResources; //!< stack of resources for delayed clean up OpenGl_Clipping myClippingState; //!< state of clip planes diff --git a/src/QANCollection/QANCollection.cdl b/src/QANCollection/QANCollection.cdl index 0656c43862..ac1d7cb89e 100644 --- a/src/QANCollection/QANCollection.cdl +++ b/src/QANCollection/QANCollection.cdl @@ -23,7 +23,6 @@ uses is class ListOfPnt instantiates List from TCollection (Pnt from gp); - class QueueOfPnt instantiates Queue from TCollection (Pnt from gp); class StackOfPnt instantiates Stack from TCollection (Pnt from gp); class SListOfPnt instantiates SList from TCollection (Pnt from gp); class DataMapOfRealPnt instantiates DataMap from TCollection diff --git a/src/QANCollection/QANCollection2.cxx b/src/QANCollection/QANCollection2.cxx index 80db90c90c..000a7321f3 100644 --- a/src/QANCollection/QANCollection2.cxx +++ b/src/QANCollection/QANCollection2.cxx @@ -207,21 +207,6 @@ static Standard_Integer QANColTestList(Draw_Interpretor& di, Standard_Integer ar return 0; } -//======================================================================= -//function : QANColTestQueue -//purpose : -//======================================================================= -static Standard_Integer QANColTestQueue(Draw_Interpretor& di, Standard_Integer argc, const char ** argv) -{ - if ( argc != 1) { - di << "Usage : " << argv[0] << "\n"; - return 1; - } - QANCollection_QueueFunc aQueue; - TestQueue(aQueue); - return 0; -} - //======================================================================= //function : QANColTestStack //purpose : @@ -294,7 +279,6 @@ void QANCollection::Commands2(Draw_Interpretor& theCommands) { theCommands.Add("QANColTestIndexedMap", "QANColTestIndexedMap", __FILE__, QANColTestIndexedMap, group); theCommands.Add("QANColTestIndexedDataMap", "QANColTestIndexedDataMap", __FILE__, QANColTestIndexedDataMap, group); theCommands.Add("QANColTestList", "QANColTestList", __FILE__, QANColTestList, group); - theCommands.Add("QANColTestQueue", "QANColTestQueue", __FILE__, QANColTestQueue, group); theCommands.Add("QANColTestStack", "QANColTestStack", __FILE__, QANColTestStack, group); theCommands.Add("QANColTestSet", "QANColTestSet", __FILE__, QANColTestSet, group); theCommands.Add("QANColTestSList", "QANColTestSList", __FILE__, QANColTestSList, group); diff --git a/src/QANCollection/QANCollection3.cxx b/src/QANCollection/QANCollection3.cxx index 4912b7d893..09e953cf33 100644 --- a/src/QANCollection/QANCollection3.cxx +++ b/src/QANCollection/QANCollection3.cxx @@ -97,20 +97,6 @@ static Standard_Integer QANColPerfList(Draw_Interpretor& di, Standard_Integer ar return 0; } -//======================================================================= -//function : QANColPerfQueue -//purpose : -//======================================================================= -static Standard_Integer QANColPerfQueue(Draw_Interpretor& di, Standard_Integer argc, const char ** argv) -{ - Standard_Integer Repeat, Size; - if ( CheckArguments(di, argc, argv, Repeat, Size) ) { - return 1; - } - CompQueue(Repeat,Size); - return 0; -} - //======================================================================= //function : QANColPerfStack //purpose : @@ -258,7 +244,6 @@ void QANCollection::Commands3(Draw_Interpretor& theCommands) { theCommands.Add("QANColPerfArray1", "QANColPerfArray1 Repeat Size", __FILE__, QANColPerfArray1, group); theCommands.Add("QANColPerfArray2", "QANColPerfArray2 Repeat Size", __FILE__, QANColPerfArray2, group); theCommands.Add("QANColPerfList", "QANColPerfList Repeat Size", __FILE__, QANColPerfList, group); - theCommands.Add("QANColPerfQueue", "QANColPerfQueue Repeat Size", __FILE__, QANColPerfQueue, group); theCommands.Add("QANColPerfStack", "QANColPerfStack Repeat Size", __FILE__, QANColPerfStack, group); theCommands.Add("QANColPerfSet", "QANColPerfSet Repeat Size", __FILE__, QANColPerfSet, group); theCommands.Add("QANColPerfSList", "QANColPerfSList Repeat Size", __FILE__, QANColPerfSList, group); diff --git a/src/QANCollection/QANCollection_Common2.hxx b/src/QANCollection/QANCollection_Common2.hxx index 56988bff05..9abb731d80 100644 --- a/src/QANCollection/QANCollection_Common2.hxx +++ b/src/QANCollection/QANCollection_Common2.hxx @@ -67,17 +67,14 @@ DEFINE_INDEXEDMAP(QANCollection_IndexedMapFunc,QANCollection_Key1BaseColFunc,Key DEFINE_INDEXEDDATAMAP(QANCollection_IDMapFunc,QANCollection_BaseColFunc,Key1Type,ItemType) #include -#include #include #include #include ////////////////////////////////DEFINE_LIST(QANCollection_List,QANCollection_BaseCol,ItemType) -////////////////////////////////DEFINE_QUEUE(QANCollection_Queue,QANCollection_BaseCol,ItemType) ////////////////////////////////DEFINE_STACK(QANCollection_Stack,QANCollection_BaseCol,ItemType) ////////////////////////////////DEFINE_SET(QANCollection_Set,QANCollection_Key2BaseCol,Key2Type) ////////////////////////////////DEFINE_HSET(QANCollection_HSet,QANCollection_Set) DEFINE_LIST(QANCollection_ListFunc,QANCollection_BaseColFunc,ItemType) -DEFINE_QUEUE(QANCollection_QueueFunc,QANCollection_BaseColFunc,ItemType) DEFINE_STACK(QANCollection_StackFunc,QANCollection_BaseColFunc,ItemType) DEFINE_SET(QANCollection_SetFunc,QANCollection_Key2BaseColFunc,Key2Type) DEFINE_HSET(QANCollection_HSetFunc,QANCollection_SetFunc) diff --git a/src/QANCollection/QANCollection_Common3.hxx b/src/QANCollection/QANCollection_Common3.hxx index 30b1fa0558..136c9285d1 100644 --- a/src/QANCollection/QANCollection_Common3.hxx +++ b/src/QANCollection/QANCollection_Common3.hxx @@ -67,17 +67,14 @@ DEFINE_INDEXEDMAP(QANCollection_IndexedMapPerf,QANCollection_Key1BaseColPerf,Key DEFINE_INDEXEDDATAMAP(QANCollection_IDMapPerf,QANCollection_BaseColPerf,Key1Type,ItemType) #include -#include #include #include #include ////////////////////////////////DEFINE_LIST(QANCollection_List,QANCollection_BaseCol,ItemType) -////////////////////////////////DEFINE_QUEUE(QANCollection_Queue,QANCollection_BaseCol,ItemType) ////////////////////////////////DEFINE_STACK(QANCollection_Stack,QANCollection_BaseCol,ItemType) ////////////////////////////////DEFINE_SET(QANCollection_Set,QANCollection_Key2BaseCol,Key2Type) ////////////////////////////////DEFINE_HSET(QANCollection_HSet,QANCollection_Set) DEFINE_LIST(QANCollection_ListPerf,QANCollection_BaseColPerf,ItemType) -DEFINE_QUEUE(QANCollection_QueuePerf,QANCollection_BaseColPerf,ItemType) DEFINE_STACK(QANCollection_StackPerf,QANCollection_BaseColPerf,ItemType) DEFINE_SET(QANCollection_SetPerf,QANCollection_Key2BaseColPerf,Key2Type) DEFINE_HSET(QANCollection_HSetPerf,QANCollection_SetPerf) diff --git a/src/QANCollection/QANCollection_FuncLists.hxx b/src/QANCollection/QANCollection_FuncLists.hxx index d186c72604..1f07b676dd 100644 --- a/src/QANCollection/QANCollection_FuncLists.hxx +++ b/src/QANCollection/QANCollection_FuncLists.hxx @@ -70,40 +70,6 @@ void TestList (QANCollection_ListFunc& theL) aL.Clear(); } -// ===================== Test methods of Queue type =========================== -////////////////////////////////void TestQueue (QANCollection_Queue& theQ) -void TestQueue (QANCollection_QueueFunc& theQ) -{ - // Length - Standard_Integer iLen=theQ.Length(); - Standard_Integer i; - - printf ("Info: testing Queue(%d)\n", iLen); - // Push, Pop, Front, ChangeFront - ItemType anItem; - ////////////////////////////////QANCollection_Queue aQ; - QANCollection_QueueFunc aQ; - for (i=0; i<4; i++) - { - Random (anItem); - aQ.Push (anItem); - Random(aQ.ChangeFront()); - Random (anItem); - aQ.Push (anItem); - PrintItem(aQ.Front()); - aQ.Pop(); - } - // Copy constructor + operator= - ////////////////////////////////theQ = QANCollection_Queue(aQ); - theQ = QANCollection_QueueFunc(aQ); - - // Assign - AssignCollection (theQ, aQ); - - // Clear - aQ.Clear(); -} - // ===================== Test methods of Stack type =========================== ////////////////////////////////void TestStack (QANCollection_Stack& theS) void TestStack (QANCollection_StackFunc& theS) diff --git a/src/QANCollection/QANCollection_FuncTest.hxx b/src/QANCollection/QANCollection_FuncTest.hxx index 2b984a37c6..8b95a9ea83 100644 --- a/src/QANCollection/QANCollection_FuncTest.hxx +++ b/src/QANCollection/QANCollection_FuncTest.hxx @@ -34,7 +34,6 @@ // Standard_EXPORT void TestInDaMap (QANCollection_IDMap& theNM); #include // Standard_EXPORT void TestList (QANCollection_List& theLi); -// Standard_EXPORT void TestQueue (QANCollection_Queue& theQ); // Standard_EXPORT void TestStack (QANCollection_Stack& theSt); // Standard_EXPORT void TestSet (QANCollection_Set& theSe); // Standard_EXPORT void TestSList (QANCollection_SList& theSL); diff --git a/src/QANCollection/QANCollection_PerfLists.hxx b/src/QANCollection/QANCollection_PerfLists.hxx index e3d24483ee..b4fdcd57ce 100644 --- a/src/QANCollection/QANCollection_PerfLists.hxx +++ b/src/QANCollection/QANCollection_PerfLists.hxx @@ -18,7 +18,6 @@ #include #include -#include #include #include #include @@ -94,90 +93,6 @@ void CompList (const Standard_Integer theRep, PERF_PRINT_ALL } -// ===================== Test perform of Queue type ========================== -void CompQueue (const Standard_Integer theRep, - const Standard_Integer theSize) -{ - Standard_Integer i,j; - - ////////////////////////////////Perf_Meter aNPush ("NCollection_Queue pushing",0); - ////////////////////////////////Perf_Meter aTPush ("TCollection_Queue pushing",0); - ////////////////////////////////Perf_Meter aNPopp ("NCollection_Queue popping",0); - ////////////////////////////////Perf_Meter aTPopp ("TCollection_Queue popping",0); - ////////////////////////////////Perf_Meter aNOper ("NCollection_Queue operator=",0); - ////////////////////////////////Perf_Meter aTOper ("TCollection_Queue operator=",0); - ////////////////////////////////Perf_Meter aNClea ("NCollection_Queue clearing",0); - ////////////////////////////////Perf_Meter aTClea ("TCollection_Queue clearing",0); - ////////////////////////////////Perf_Meter aNAssi ("NCollection_Queue Assign",0); - for (i=0; i. - -- If this queue is not empty, it is automatically cleared before the copy - ---C++: alias operator = - ---C++: return const & - is static; - - Length(me) returns Integer - ---Purpose: Returns the length of the queue. - -- Example: - -- before - -- me = (A B C) - -- returns 3 - ---C++: inline - is static; - - IsEmpty(me) returns Boolean - ---Purpose: Returns True if the queue is empty. - -- i.e. Length() == 0. - ---C++: inline - is static; - - Front(me) returns any Item - ---Purpose: returns the item at the front of the queue - -- Example: - -- before - -- me = (A B C) - -- after - -- me = (A B C) - -- returns - -- A - -- Trigger: Raises an exception if is Empty - ---C++: return const & - raises NoSuchObject from Standard - is static; - - - Clear(me : in out) - ---Purpose: remove all the elements from the queue - -- Example: - -- before - -- me = (A B C) - -- after - -- me = () - ---C++: alias ~ - is static; - - Push(me : in out; T : Item) - ---Purpose: Insert an item at the end of the queue. - -- Example: - -- before - -- me = (A B) , T = C - -- after - -- me = (A B C) - is static; - - Pop(me : in out) - ---Purpose: Removes the item at the front of the queue. - -- Example: - -- before - -- me = (A B C) - -- after - -- me = (B C) - -- Trigger: Raises an exception if is empty. - raises NoSuchObject from Standard - is static; - - ChangeFront(me: in out) returns any Item - ---Purpose: Returns a modifiable reference on the front of the queue. - -- The purpose of this syntax is to modify the item at the front of this queue. - -- Example: - -- before - -- me = (A B C) - -- me.ChangeFront() = D - -- after - -- me = (D B C) - -- Trigger: Raises an exception if is empty. - ---C++: return & - raises NoSuchObject from Standard - is static; - -fields - myFront : Address from Standard; - myEnd : Address from Standard; - myLength : Integer from Standard; - -end Queue; - - diff --git a/src/TCollection/TCollection_Queue.gxx b/src/TCollection/TCollection_Queue.gxx deleted file mode 100644 index f038b407e1..0000000000 --- a/src/TCollection/TCollection_Queue.gxx +++ /dev/null @@ -1,151 +0,0 @@ -// Created on: 1993-01-18 -// Created by: Remi LEQUETTE -// Copyright (c) 1993-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -//======================================================================= -//function : TCollection_Queue -//purpose : -//======================================================================= - -TCollection_Queue::TCollection_Queue() : - myFront(NULL), - myEnd(NULL), - myLength(0) -{ -} - -//======================================================================= -//function : TCollection_Queue -//purpose : -//======================================================================= - -TCollection_Queue::TCollection_Queue(const TCollection_Queue& Other) -{ - if (!Other.IsEmpty()) { - cout << "WARNING copy constructor of non empty Queue !"<Value(),(TCollection_MapNode*)0L); - if (r) r->Next() = q; - else myFront = q; - r = q; - p = (TCollection_QueueNode*)p->Next(); - } - myEnd = q; - myLength = Other.myLength; -} - -//======================================================================= -//function : Assign -//purpose : -//======================================================================= - -const TCollection_Queue& TCollection_Queue::Assign - (const TCollection_Queue& Other) -{ - if (this == &Other) return *this; - Clear(); - TCollection_QueueNode* p = (TCollection_QueueNode*) Other.myFront; - TCollection_QueueNode* q=NULL; - TCollection_QueueNode* r = NULL; - while (p) { - q = new TCollection_QueueNode(p->Value(),(TCollection_MapNode*)0L); - if (r) r->Next() = q; - else myFront = q; - r = q; - p = (TCollection_QueueNode*)p->Next(); - } - myEnd = q; - myLength = Other.myLength; - return *this; -} - - - -//======================================================================= -//function : Front -//purpose : -//======================================================================= - -const Item& TCollection_Queue::Front() const -{ - Standard_NoSuchObject_Raise_if(IsEmpty(),"TCollection_Queue"); - return ((TCollection_QueueNode*)myFront)->Value(); -} - -//======================================================================= -//function : Push -//purpose : -//======================================================================= - -void TCollection_Queue::Push(const Item& I) -{ - TCollection_QueueNode* p = new TCollection_QueueNode(I,(TCollection_MapNode*)0L); - if (myLength) ((TCollection_QueueNode*)myEnd)->Next() = p; - else myFront = p; - myEnd = p; - myLength++; -} - -//======================================================================= -//function : Pop -//purpose : -//======================================================================= - -void TCollection_Queue::Pop() -{ - Standard_NoSuchObject_Raise_if(IsEmpty(),"TCollection_Queue"); - TCollection_QueueNode* p = (TCollection_QueueNode*) myFront; - myFront = p->Next(); - delete p; - myLength--; - if (myLength == 0) myEnd = NULL; -} - -//======================================================================= -//function : Clear -//purpose : -//======================================================================= - -void TCollection_Queue::Clear() -{ - TCollection_QueueNode* p = (TCollection_QueueNode*) myFront; - TCollection_QueueNode* q = 0L; - while(p) { - q = (TCollection_QueueNode*)p->Next(); - delete p; - p = q; - } - myLength = 0; - myFront = myEnd = NULL; -} - -//======================================================================= -//function : ChangeFront -//purpose : -//======================================================================= - -Item& TCollection_Queue::ChangeFront() -{ - Standard_NoSuchObject_Raise_if(IsEmpty(),"TCollection_Queue"); - return ((TCollection_QueueNode*)myFront)->Value(); -} - diff --git a/src/TCollection/TCollection_Queue.lxx b/src/TCollection/TCollection_Queue.lxx deleted file mode 100644 index 7e2cf6f99b..0000000000 --- a/src/TCollection/TCollection_Queue.lxx +++ /dev/null @@ -1,36 +0,0 @@ -// Created on: 1993-01-18 -// Created by: Remi LEQUETTE -// Copyright (c) 1993-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -//======================================================================= -//function : Length -//purpose : -//======================================================================= - -inline Standard_Integer TCollection_Queue::Length() const -{ - return myLength; -} - - -//======================================================================= -//function : IsEmpty -//purpose : -//======================================================================= - -inline Standard_Boolean TCollection_Queue::IsEmpty() const -{ - return myLength == 0; -} diff --git a/src/TCollection/TCollection_QueueNode.gxx b/src/TCollection/TCollection_QueueNode.gxx deleted file mode 100644 index df42f6159d..0000000000 --- a/src/TCollection/TCollection_QueueNode.gxx +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. diff --git a/src/TCollection/TCollection_QueueNode.lxx b/src/TCollection/TCollection_QueueNode.lxx deleted file mode 100644 index 8b801836f9..0000000000 --- a/src/TCollection/TCollection_QueueNode.lxx +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -inline TCollection_QueueNode::TCollection_QueueNode(const Item& I,const TCollection_MapNodePtr& n) -: TCollection_MapNode(n) -{ - myValue = I; -} - -inline Item& TCollection_QueueNode::Value() const -{ - return (Item&)myValue; -} -