diff --git a/src/BRepMAT2d/BRepMAT2d.cdl b/src/BRepMAT2d/BRepMAT2d.cdl index 5677c880a4..3051e22d0f 100644 --- a/src/BRepMAT2d/BRepMAT2d.cdl +++ b/src/BRepMAT2d/BRepMAT2d.cdl @@ -47,12 +47,9 @@ is -- the BasicElts contained in the bisecting locus. - class SequenceOfBasicElt instantiates Sequence from TCollection - (BasicElt from MAT); - class DataMapOfShapeSequenceOfBasicElt instantiates DataMap from TCollection (Shape from TopoDS, - SequenceOfBasicElt from BRepMAT2d, + SequenceOfBasicElt from MAT, ShapeMapHasher from TopTools); class DataMapOfBasicEltShape instantiates diff --git a/src/BRepMAT2d/BRepMAT2d_LinkTopoBilo.cxx b/src/BRepMAT2d/BRepMAT2d_LinkTopoBilo.cxx index 1fcdbf6150..e04cd5df02 100644 --- a/src/BRepMAT2d/BRepMAT2d_LinkTopoBilo.cxx +++ b/src/BRepMAT2d/BRepMAT2d_LinkTopoBilo.cxx @@ -29,9 +29,9 @@ #include #include #include -#include -#include +#include #include +#include #include #include #include @@ -170,7 +170,7 @@ void BRepMAT2d_LinkTopoBilo::LinkToWire(const TopoDS_Wire& W, Handle(MAT_BasicElt) BE; Handle(Standard_Type) Type; TopTools_SequenceOfShape TopoSeq; - BRepMAT2d_SequenceOfBasicElt EmptySeq; + MAT_SequenceOfBasicElt EmptySeq; TColStd_DataMapIteratorOfDataMapOfIntegerInteger Ite; TColStd_DataMapOfIntegerInteger LinkBECont; diff --git a/src/BRepMesh/BRepMesh.cdl b/src/BRepMesh/BRepMesh.cdl index ec294edc1f..ba55d7bdaf 100644 --- a/src/BRepMesh/BRepMesh.cdl +++ b/src/BRepMesh/BRepMesh.cdl @@ -113,8 +113,6 @@ is enumeration DegreeOfFreedom is (Integer, Array1OfInteger from TColStd, ComparatorOfIndexedVertexOfDelaun from BRepMesh); - class NodeHasherOfDataStructureOfDelaun instantiates MapHasher from TCollection - (Vertex from BRepMesh); class LinkHasherOfDataStructureOfDelaun instantiates MapHasher from TCollection (Edge from BRepMesh); class ElemHasherOfDataStructureOfDelaun instantiates MapHasher from TCollection @@ -123,11 +121,6 @@ is enumeration DegreeOfFreedom is class DataMapOfIntegerListOfInteger instantiates DataMap from TCollection (Integer from Standard, ListOfInteger from BRepMesh, MapIntegerHasher from TColStd); - class IDMapOfNodeOfDataStructureOfDelaun instantiates IndexedDataMap from TCollection - (Vertex from BRepMesh, - ListOfInteger from BRepMesh, - NodeHasherOfDataStructureOfDelaun); - class IDMapOfLinkOfDataStructureOfDelaun instantiates IndexedDataMap from TCollection (Edge from BRepMesh, PairOfIndex from BRepMesh, @@ -155,11 +148,6 @@ is enumeration DegreeOfFreedom is (Vertex from BRepMesh, VertexHasher from BRepMesh); - class DataMapOfShapeReal instantiates DataMap from TCollection - (Shape from TopoDS, - Real from Standard, - ShapeMapHasher from TopTools); - class BiPoint; class Array1OfBiPoint instantiates Array1 from TCollection(BiPoint from BRepMesh); diff --git a/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cdl b/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cdl index ffe5a2c10f..45c19a454c 100644 --- a/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cdl +++ b/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cdl @@ -28,9 +28,6 @@ class DataStructureOfDelaun from BRepMesh inherits TShared from MMgt Box from Bnd, BoundSortBox from Bnd, BaseAllocator from BRepMesh, - NodeHasherOfDataStructureOfDelaun from BRepMesh, - LinkHasherOfDataStructureOfDelaun from BRepMesh, - ElemHasherOfDataStructureOfDelaun from BRepMesh, VertexTool from BRepMesh, IDMapOfLinkOfDataStructureOfDelaun from BRepMesh, IMapOfElementOfDataStructureOfDelaun from BRepMesh, diff --git a/src/BRepMesh/BRepMesh_FastDiscret.cxx b/src/BRepMesh/BRepMesh_FastDiscret.cxx index 72b2780d5e..d65e8ebd87 100644 --- a/src/BRepMesh/BRepMesh_FastDiscret.cxx +++ b/src/BRepMesh/BRepMesh_FastDiscret.cxx @@ -69,7 +69,6 @@ #include #include -#include #include #include //#include diff --git a/src/CDF/CDF_StoreList.cdl b/src/CDF/CDF_StoreList.cdl index bfd2203cdf..e9730fdc5a 100644 --- a/src/CDF/CDF_StoreList.cdl +++ b/src/CDF/CDF_StoreList.cdl @@ -18,10 +18,9 @@ private class StoreList from CDF inherits Transient from Standard uses Document from CDM, - StackOfDocument from CDM, + ListOfDocument from CDM, MapOfDocument from CDM, MapIteratorOfMapOfDocument from CDM, - ListIteratorOfStackOfDocument from CDM, MetaData from CDM, ExtendedString from TCollection, StoreStatus from PCDM @@ -60,7 +59,7 @@ is fields myItems: MapOfDocument from CDM; - myStack: StackOfDocument from CDM; + myStack: ListOfDocument from CDM; myIterator: MapIteratorOfMapOfDocument from CDM; myMainDocument: Document from CDM; end StoreList from CDF; diff --git a/src/CDM/CDM.cdl b/src/CDM/CDM.cdl index e10854c0ea..11fb431ba1 100644 --- a/src/CDM/CDM.cdl +++ b/src/CDM/CDM.cdl @@ -64,6 +64,5 @@ is class DocumentHasher instantiates MapHasher from TCollection(Document from CDM); class MapOfDocument instantiates Map from TCollection(Document from CDM, DocumentHasher from CDM); class ListOfDocument instantiates List from TCollection(Document from CDM); - class StackOfDocument instantiates List from TCollection(Document from CDM); end CDM; diff --git a/src/DBC/DBC_CMPLRS.edl b/src/DBC/DBC_CMPLRS.edl deleted file mode 100644 index 4abeb9a669..0000000000 --- a/src/DBC/DBC_CMPLRS.edl +++ /dev/null @@ -1,17 +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. - -@if ( ( %Station == "ao1" ) && ( %DBMS == "OBJS" ) ) then - @uses "OBJSCMPLRS.edl"; -@endif; diff --git a/src/DBC/DBC_LDSHR.edl b/src/DBC/DBC_LDSHR.edl deleted file mode 100644 index 1840bcbf66..0000000000 --- a/src/DBC/DBC_LDSHR.edl +++ /dev/null @@ -1,17 +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. - -@if ( ( %Station == "ao1" ) && ( %DBMS == "OBJS" ) ) then - @string %LDSHR_DBMSOpt += " -taso "; -@endif; diff --git a/src/DBC/FILES b/src/DBC/FILES index 828edd5ba6..e5315f651a 100755 --- a/src/DBC/FILES +++ b/src/DBC/FILES @@ -3,5 +3,3 @@ DBC_DBVArray.cxx DBC_DBVArray.hxx DBC_Copy.tcl DBC_WOKSteps.edl -DBC_CMPLRS.edl -DBC_LDSHR.edl diff --git a/src/Draw/Draw.cdl b/src/Draw/Draw.cdl index 72b3d58845..bd3876b141 100644 --- a/src/Draw/Draw.cdl +++ b/src/Draw/Draw.cdl @@ -123,14 +123,8 @@ is Drawable3D from Draw, MapIntegerHasher from TColStd); - private class MapOfFunctions instantiates DataMap from TCollection(AsciiString from TCollection ,Function from OSD, AsciiString from TCollection); - class MapOfAsciiString instantiates IndexedMap from TCollection(AsciiString from TCollection,AsciiString from TCollection); - Load(theDI: out Interpretor from Draw; theKey, theResourceFileName: AsciiString from TCollection) --- returns Transient from Standard - raises Failure from Draw; - Load(theDI: out Interpretor from Draw; theKey, theResourceFileName: AsciiString from TCollection; theDefaultsDirectory, theUserDefaultsDirectory: in out AsciiString from TCollection; diff --git a/src/Draw/Draw.cxx b/src/Draw/Draw.cxx index e04c99b2b3..7884ee3eba 100644 --- a/src/Draw/Draw.cxx +++ b/src/Draw/Draw.cxx @@ -56,7 +56,7 @@ #include #include -#include +#include #include #include #include @@ -497,76 +497,6 @@ Standard_Integer Draw_Call (char *c) return r; } - -//================================================================================= -// -//================================================================================= -void Draw::Load(Draw_Interpretor& theDI, const TCollection_AsciiString& theKey, - const TCollection_AsciiString& theResourceFileName) { - - static Draw_MapOfFunctions theMapOfFunctions; - OSD_Function f; - - if(!theMapOfFunctions.IsBound(theKey)) { - - Handle(Resource_Manager) aPluginResource = new Resource_Manager(theResourceFileName.ToCString()); - if(!aPluginResource->Find(theKey.ToCString())) { - Standard_SStream aMsg; aMsg << "Could not find the resource:"; - aMsg << theKey.ToCString()<< endl; - cout << "could not find the resource:"<Value(theKey.ToCString()); -#ifdef WNT - aPluginLibrary += ".dll"; -#elif __APPLE__ - aPluginLibrary += ".dylib"; -#elif defined (HPUX) || defined(_hpux) - aPluginLibrary += ".sl"; -#else - aPluginLibrary += ".so"; -#endif - OSD_SharedLibrary aSharedLibrary(aPluginLibrary.ToCString()); - if(!aSharedLibrary.DlOpen(OSD_RTLD_LAZY)) { - TCollection_AsciiString error(aSharedLibrary.DlError()); - Standard_SStream aMsg; aMsg << "Could not open: "; - aMsg << aPluginResource->Value(theKey.ToCString()); - aMsg << "; reason: "; - aMsg << error.ToCString(); -#ifdef DEB - cout << "could not open: " << aPluginResource->Value(theKey.ToCString())<< " ; reason: "<< error.ToCString() << endl; -#endif - Draw_Failure::Raise(aMsg); - } - f = aSharedLibrary.DlSymb("PLUGINFACTORY"); - if( f == NULL ) { - TCollection_AsciiString error(aSharedLibrary.DlError()); - Standard_SStream aMsg; aMsg << "Could not find the factory in: "; - aMsg << aPluginResource->Value(theKey.ToCString()); - aMsg << error.ToCString(); - Draw_Failure::Raise(aMsg); - } - theMapOfFunctions.Bind(theKey, f); - } - else - f = theMapOfFunctions(theKey); - -// void (*fp) (Draw_Interpretor&, const TCollection_AsciiString&) = NULL; -// fp = (void (*)(Draw_Interpretor&, const TCollection_AsciiString&)) f; -// (*fp) (theDI, theKey); - - void (*fp) (Draw_Interpretor&) = NULL; - fp = (void (*)(Draw_Interpretor&)) f; - (*fp) (theDI); - -} - - //================================================================================= // //================================================================================= @@ -576,7 +506,7 @@ void Draw::Load(Draw_Interpretor& theDI, const TCollection_AsciiString& theKey, TCollection_AsciiString& theUserDefaultsDirectory, const Standard_Boolean Verbose ) { - static Draw_MapOfFunctions theMapOfFunctions; + static Plugin_MapOfFunctions theMapOfFunctions; OSD_Function f; if(!theMapOfFunctions.IsBound(theKey)) { diff --git a/src/ExprIntrp/ExprIntrp.cdl b/src/ExprIntrp/ExprIntrp.cdl index 65c1a6804f..1d378053ee 100644 --- a/src/ExprIntrp/ExprIntrp.cdl +++ b/src/ExprIntrp/ExprIntrp.cdl @@ -51,10 +51,6 @@ is private class StackOfGeneralFunction instantiates List from TCollection (GeneralFunction from Expr); - - private class StackOfNames instantiates - List from TCollection (AsciiString from TCollection); - Parse(gen : Generator; str : AsciiString from TCollection) returns Boolean is private; diff --git a/src/ExprIntrp/ExprIntrp_Analysis.cdl b/src/ExprIntrp/ExprIntrp_Analysis.cdl index ef71a30613..543ef095f6 100644 --- a/src/ExprIntrp/ExprIntrp_Analysis.cdl +++ b/src/ExprIntrp/ExprIntrp_Analysis.cdl @@ -32,7 +32,7 @@ uses Generator from ExprIntrp, NamedFunction from Expr, NamedExpression from Expr, AsciiString from TCollection, - StackOfNames from ExprIntrp + ListOfAsciiString from TColStd is @@ -107,7 +107,7 @@ fields myGEStack : StackOfGeneralExpression; myGRStack : StackOfGeneralRelation; myGFStack : StackOfGeneralFunction; - myNameStack : StackOfNames; + myNameStack : ListOfAsciiString from TColStd; myValueStack : ListOfInteger; myFunctions : SequenceOfNamedFunction; myNamed : SequenceOfNamedExpression; diff --git a/src/Graphic3d/Graphic3d.cdl b/src/Graphic3d/Graphic3d.cdl index ae1113f021..6d63fc0a68 100644 --- a/src/Graphic3d/Graphic3d.cdl +++ b/src/Graphic3d/Graphic3d.cdl @@ -522,11 +522,6 @@ is -- Category: Instantiated classes --------------------------------- - class SequenceOfAddress instantiates - Sequence from TCollection - (Address from Standard); - ---Category: Instantiated classes - imported SequenceOfGroup; ---Category: Instantiated classes diff --git a/src/MeshVS/MeshVS_ColorHasher.cdl b/src/MeshVS/MeshVS_ColorHasher.cdl index 552955267a..0b57d9f795 100644 --- a/src/MeshVS/MeshVS_ColorHasher.cdl +++ b/src/MeshVS/MeshVS_ColorHasher.cdl @@ -13,7 +13,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -class ColorHasher from MeshVS inherits MapIntegerHasher from TColStd +class ColorHasher from MeshVS ---Purpose: Hasher for using in ColorToIdsMap from MeshVS diff --git a/src/PColStd/FILES b/src/PColStd/FILES deleted file mode 100755 index 56c8d4220a..0000000000 --- a/src/PColStd/FILES +++ /dev/null @@ -1,2 +0,0 @@ -PColStd_CMPLRS.edl -PColStd_LDSHR.edl diff --git a/src/PColStd/PColStd.cdl b/src/PColStd/PColStd.cdl index 7deb56daa5..86c4e2988d 100644 --- a/src/PColStd/PColStd.cdl +++ b/src/PColStd/PColStd.cdl @@ -25,41 +25,6 @@ is -- ***************************** -- ------------------------------------------------------------------------ --- --- Instantiations HSequence (Integer,Real,Persistent, --- HAsciiString, --- HExtendedString) --- ************************************************** --- -class HSequenceOfInteger instantiates - HSequence from PCollection(Integer); -class HSequenceOfReal instantiates - HSequence from PCollection(Real); -class HSequenceOfPersistent instantiates - HSequence from PCollection(Persistent); -class HSequenceOfHAsciiString instantiates - HSequence from PCollection(HAsciiString from PCollection); -class HSequenceOfHExtendedString instantiates - HSequence from PCollection(HExtendedString from PCollection); --- --- Instantiations HSingleList (Integer,Real,Persistent) --- ***************************************************** --- -class HSingleListOfInteger instantiates - HSingleList from PCollection(Integer); -class HSingleListOfReal instantiates - HSingleList from PCollection(Real); -class HSingleListOfPersistent instantiates - HSingleList from PCollection(Persistent); --- Instantiations HDoubleList (Integer,Real,Persistent) --- ********************************************* --- -class HDoubleListOfInteger instantiates - HDoubleList from PCollection(Integer); -class HDoubleListOfReal instantiates - HDoubleList from PCollection(Real); -class HDoubleListOfPersistent instantiates - HDoubleList from PCollection(Persistent); -- -- Instantiations HArray1 (Integer,Real,Persistent) -- **************************************************** @@ -86,20 +51,6 @@ class HDoubleListOfPersistent instantiates class HArray2OfPersistent instantiates HArray2 from PCollection(Persistent); --- Instantiations Hash (Integer) --- ***************************** --- -class HOfInteger instantiates Hash from PCollection(Integer); -class HOfReal instantiates Hash from PCollection(Real); -class HOfAsciiString instantiates Hash from PCollection(HAsciiString from PCollection); ----Purpose: Hash on the Handle. -class HashAsciiString; ----Purpose: Hash on the string. -class HOfExtendedString instantiates Hash from PCollection(HExtendedString from PCollection); ----Purpose: Hash on the Handle -class HashExtendedString; ----Purpose: Hash on the string. - end PColStd; diff --git a/src/PColStd/PColStd_CMPLRS.edl b/src/PColStd/PColStd_CMPLRS.edl deleted file mode 100644 index 8255dc7b58..0000000000 --- a/src/PColStd/PColStd_CMPLRS.edl +++ /dev/null @@ -1,17 +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. - -@if ( ( %Station == "ao1" ) && ( %DBMS == "OBJS" ) ) then - @uses "OBJSCMPLRS.edl"; -@endif; diff --git a/src/PColStd/PColStd_LDSHR.edl b/src/PColStd/PColStd_LDSHR.edl deleted file mode 100644 index 1840bcbf66..0000000000 --- a/src/PColStd/PColStd_LDSHR.edl +++ /dev/null @@ -1,17 +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. - -@if ( ( %Station == "ao1" ) && ( %DBMS == "OBJS" ) ) then - @string %LDSHR_DBMSOpt += " -taso "; -@endif; diff --git a/src/PCollection/FILES b/src/PCollection/FILES deleted file mode 100755 index 991a8ef81c..0000000000 --- a/src/PCollection/FILES +++ /dev/null @@ -1,4 +0,0 @@ -PCollection_Compare.gxx -PCollection_CMPLRS.edl -PCollection_LDSHR.edl -PCollection_WOKSteps.edl diff --git a/src/PCollection/PCollection.cdl b/src/PCollection/PCollection.cdl index c16a4a1a97..1c3f3fd4da 100644 --- a/src/PCollection/PCollection.cdl +++ b/src/PCollection/PCollection.cdl @@ -35,50 +35,12 @@ is generic class HArray2, FieldOfHArray2 ; - generic class HSingleList; - ---Purpose: The private generic class SingleList represents - -- a sequence of 0 or more linked items. - - generic class HDoubleList; - ---Purpose: A List is a sequence of zero or more items - -- Each item has two pointers (backward,forward) - - generic class HSequence,SeqNode,SeqExplorer; ---Purpose: Generic sequence of elements -- indexed by an integer in the range 1..N. - - generic class Hash; - ---Purpose: Definition of hash function. This class is used by Map - -- class and may be redefined by user. - - - deferred generic class Compare ; - - ---Purpose: Defines a comparison operator which can be used by - -- any ordered structure. The way to compare items - -- has to be described in subclasses, which inherit - -- from instantiations of Compare. - - private deferred class PrivCompareOfInteger - instantiates Compare from PCollection(Integer); - - private deferred class PrivCompareOfReal - instantiates Compare from PCollection(Real); - - class CompareOfInteger; - - class CompareOfReal; - - enumeration Side is Left , Right; - - exception IsNotRoot inherits Failure; - exception IsNullTree inherits Failure; - exception IsContained inherits Failure; - class HAsciiString; class HExtendedString; diff --git a/src/PCollection/PCollection_CMPLRS.edl b/src/PCollection/PCollection_CMPLRS.edl deleted file mode 100644 index 8255dc7b58..0000000000 --- a/src/PCollection/PCollection_CMPLRS.edl +++ /dev/null @@ -1,17 +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. - -@if ( ( %Station == "ao1" ) && ( %DBMS == "OBJS" ) ) then - @uses "OBJSCMPLRS.edl"; -@endif; diff --git a/src/PCollection/PCollection_Compare.cdl b/src/PCollection/PCollection_Compare.cdl deleted file mode 100644 index cd022cee7b..0000000000 --- a/src/PCollection/PCollection_Compare.cdl +++ /dev/null @@ -1,46 +0,0 @@ --- Created on: 1991-05-14 --- Created by: Annick PANCHER --- Copyright (c) 1991-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. - --- Revised: Mireille MERCIEN - - -deferred generic class Compare from PCollection ( Item as Storable) -inherits Storable - - ---Purpose: Defines a comparison operator which can be used by - -- any ordered structure. The way to compare items - -- has to be described in subclasses, which inherit - -- from instantiations of Compare. - -is - - IsLower (me; Left, Right: Item) - ---Purpose: Returns True if is lower than - returns Boolean is virtual; - ---Level: Public - - IsGreater (me; Left, Right: Item) - ---Purpose: Returns True if is greater than - returns Boolean is virtual; - ---Level: Public - - IsEqual(me; Left, Right: Item) - ---Purpose: Returns True when and are equal. - returns Boolean; - ---Level: Public -end; - - diff --git a/src/PCollection/PCollection_Compare.gxx b/src/PCollection/PCollection_Compare.gxx deleted file mode 100644 index cb939d26cc..0000000000 --- a/src/PCollection/PCollection_Compare.gxx +++ /dev/null @@ -1,51 +0,0 @@ -// Created on: 1992-08-27 -// Created by: Mireille MERCIEN -// Copyright (c) 1992-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 -#include - -// ----------- -// IsLower : -// ----------- -Standard_Boolean PCollection_Compare::IsLower (const Item& , - const Item& ) const -{ -// Standard_NotImplemented::Raise(); - return Standard_False; -} - -// ----------- -// IsGreater : -// ----------- -Standard_Boolean PCollection_Compare::IsGreater (const Item& , - const Item& ) const -{ -// Standard_NotImplemented::Raise(); - return Standard_False; -} - -// ----------- -// IsEqual : -// ----------- -Standard_Boolean PCollection_Compare::IsEqual (const Item& , - const Item& ) const -{ - // return (Left == Right) ; - Standard_ProgramError::Raise("PCollection_Compare::IsEqual : Obsolete method..."); - return Standard_False; -} - - diff --git a/src/PCollection/PCollection_CompareOfInteger.cdl b/src/PCollection/PCollection_CompareOfInteger.cdl deleted file mode 100644 index 4af4fbd761..0000000000 --- a/src/PCollection/PCollection_CompareOfInteger.cdl +++ /dev/null @@ -1,37 +0,0 @@ --- Created on: 1992-08-27 --- Created by: Mireille MERCIEN --- Copyright (c) 1992-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. - -class CompareOfInteger from PCollection - inherits - PrivCompareOfInteger - -is - - Create ; - - IsLower (me; Left, Right: Integer) - ---Purpose: Returns True if is lower than . - ---Level: Public - returns Boolean - is redefined; - - IsGreater (me; Left, Right: Integer) - ---Purpose: Returns True if is greater than . - ---Level: Public - returns Boolean - is redefined; - -end; diff --git a/src/PCollection/PCollection_CompareOfInteger.cxx b/src/PCollection/PCollection_CompareOfInteger.cxx deleted file mode 100644 index e1609f47f0..0000000000 --- a/src/PCollection/PCollection_CompareOfInteger.cxx +++ /dev/null @@ -1,42 +0,0 @@ -// Created on: 1992-08-27 -// Created by: Mireille MERCIEN -// Copyright (c) 1992-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 - -// ----------- -// Create : -// ----------- -PCollection_CompareOfInteger::PCollection_CompareOfInteger() -{ -} - -// ----------- -// IsLower : -// ----------- -Standard_Boolean PCollection_CompareOfInteger::IsLower ( - const Standard_Integer &Left,const Standard_Integer &Right) const -{ - return (Left < Right) ; -} - -// ----------- -// IsGreater : -// ----------- -Standard_Boolean PCollection_CompareOfInteger::IsGreater ( - const Standard_Integer &Left,const Standard_Integer &Right) const -{ - return (Left > Right) ; -} diff --git a/src/PCollection/PCollection_CompareOfReal.cdl b/src/PCollection/PCollection_CompareOfReal.cdl deleted file mode 100644 index 3b5d606a13..0000000000 --- a/src/PCollection/PCollection_CompareOfReal.cdl +++ /dev/null @@ -1,37 +0,0 @@ --- Created on: 1992-08-27 --- Created by: Mireille MERCIEN --- Copyright (c) 1992-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. - -class CompareOfReal from PCollection - inherits - PrivCompareOfReal - -is - - Create; - - IsLower (me; Left, Right: Real) - ---Purpose: Returns True if is lower than . - ---Level: Public - returns Boolean - is redefined; - - IsGreater (me; Left, Right: Real) - ---Purpose: Returns True if is greater than . - ---Level: Public - returns Boolean - is redefined; - -end; diff --git a/src/PCollection/PCollection_CompareOfReal.cxx b/src/PCollection/PCollection_CompareOfReal.cxx deleted file mode 100644 index 0d74c70a22..0000000000 --- a/src/PCollection/PCollection_CompareOfReal.cxx +++ /dev/null @@ -1,49 +0,0 @@ -// Created on: 1992-08-27 -// Created by: Mireille MERCIEN -// Copyright (c) 1992-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. - -// Do not delete this line. Used by sccs. - -#include - -// ----------- -// Create : -// ----------- -PCollection_CompareOfReal::PCollection_CompareOfReal() -{ -} - -// ----------- -// IsLower : -// ----------- -Standard_Boolean PCollection_CompareOfReal::IsLower ( - const Standard_Real &Left,const Standard_Real &Right) const -{ - return (Left < Right) ; -} - -// ----------- -// IsGreater : -// ----------- -Standard_Boolean PCollection_CompareOfReal::IsGreater ( - const Standard_Real &Left,const Standard_Real &Right) const -{ - return (Left > Right) ; -} - - - - - diff --git a/src/PCollection/PCollection_HDoubleList.cdl b/src/PCollection/PCollection_HDoubleList.cdl deleted file mode 100644 index 5591e5b4a4..0000000000 --- a/src/PCollection/PCollection_HDoubleList.cdl +++ /dev/null @@ -1,122 +0,0 @@ --- Created on: 1992-02-19 --- Created by: Jean Pierre TIRAULT --- Copyright (c) 1992-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. - -generic class HDoubleList from PCollection (Item as Storable) -inherits PManaged - - -raises NoSuchObject from Standard - -is - - ---Purpose: Definition of a double linked list - -- Idem to the SingleList with a pointer to the previous node - - - Create returns mutable HDoubleList; - ---Purpose: Creation of an empty list - - IsEmpty(me) returns Boolean; - ---Level: Public - ---Purpose: Returns True if the list contains no element. - - Construct(me : mutable; T : Item) returns mutable HDoubleList; - ---Level: Public - ---Purpose: Adds T at the begining of me. - ---Example: before - -- me = (A B C) - -- after - -- me = (A B C) - -- returns - -- (T A B C) - - Value(me) returns any Item - raises NoSuchObject; - ---Level: Public - ---Purpose: Value of the first node of me - -- Raises an exception if me is empty - ---Purpose: before - -- me = (A B C) - -- after - -- me = (A B C) - -- returns - -- A - - Tail(me) returns any HDoubleList - raises NoSuchObject; - ---Level: Public - ---Purpose: Returns the end of the list . - -- Raises an exception if me is empty. - ---Example: before - -- me = (A B C) - -- after - -- me = (A B C) - -- returns - -- (B C) - - Previous(me) returns any HDoubleList - raises NoSuchObject; - ---Level: Public - ---Purpose: Previous node of me. - -- Raises an exception if me is empty. - ---Example: before - -- A list L = (A B C) with me = (B C) a sub-list of L. - -- after - -- L = (A B C), me = (B C) - -- returns - -- (A) - - SwapTail(me : mutable; WithList : in out any HDoubleList) - raises NoSuchObject; - ---Level: Public - ---Purpose: Exchanges end of me with WithList. - -- Raises an exception if me is empty. - ---Example: before - -- me = (A B C) - -- WithList = (D E) - -- after - -- me = (A D E) - -- WithList = (B C) - - SetValue(me : mutable; T : Item) - raises NoSuchObject; - ---Level: Public - ---Purpose: Changes the value of the first node of me. - -- Raises an exception if me is empty. - ---Example: before - -- me = (A B C) - -- after - -- me = (T B C) - - - ChangeBackPointer(me : mutable; BackPointer : HDoubleList); - ---Level: Public - ---Purpose: Modification of the backward pointer - - ChangeForwardPointer(me : mutable; ForwardPointer : - HDoubleList); - ---Level: Public - ---Purpose: Modification of the forward pointer - - Destroy(me : mutable); - ---C++: alias ~ - -fields - Data : Item; - Next : HDoubleList; - Before : HDoubleList; - -end HDoubleList; diff --git a/src/PCollection/PCollection_HDoubleList.gxx b/src/PCollection/PCollection_HDoubleList.gxx deleted file mode 100644 index 87728cd257..0000000000 --- a/src/PCollection/PCollection_HDoubleList.gxx +++ /dev/null @@ -1,127 +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. - -// ----------------------------------------------------------------------- -// - - -// - HDoubleList - -// - - -// ----------------------------------------------------------------------- - - - -#include -#include - -// ----------------------------------------------------------------------- -// - - -// - - -// - - -// ----------------------------------------------------------------------- -PCollection_HDoubleList::PCollection_HDoubleList ( ){ -} - - -// ----------------------------------------------------------------------- -// - - -// - - -// - - -// ----------------------------------------------------------------------- -Handle(PCollection_HDoubleList) - PCollection_HDoubleList::Construct(const Item& T) -{ - - Handle(PCollection_HDoubleList) me , L ; - me = this; - L = new PCollection_HDoubleList; - L->ChangeForwardPointer ( me ); // Pointeur avant de L sur me. - Before = L; // Pointer arriere de me sur L. - L->SetValue ( T ); // Mettre la valeur de l'item. - return L; // C'est L qui est retourne. -} - -/* Anciens INLINE */ - - -void PCollection_HDoubleList::ChangeForwardPointer - (const Handle(PCollection_HDoubleList)& L) -{ - Next = L; -} - -void PCollection_HDoubleList::ChangeBackPointer - (const Handle(PCollection_HDoubleList)& L) -{ - Before = L; -} - - -void PCollection_HDoubleList::SetValue(const Item& T) -{ - Standard_NoSuchObject_Raise_if (IsEmpty(), - "Empty Element in HDoubleList::SetValue"); - Data = T; -} - - -Item PCollection_HDoubleList::Value() const { - Standard_NoSuchObject_Raise_if(IsEmpty(), - "Empty Element in HDoubleList::Value"); - return Data; -} - -Handle(PCollection_HDoubleList) PCollection_HDoubleList::Previous() const { - Standard_NoSuchObject_Raise_if((IsEmpty() && Before.IsNull()), - "Empty Element in HDoubleList::Previous"); - return Before; -} - - -Standard_Boolean PCollection_HDoubleList::IsEmpty()const -{ - return Next.IsNull(); -} - - -Handle(PCollection_HDoubleList) PCollection_HDoubleList::Tail() const { - Standard_NoSuchObject_Raise_if(IsEmpty(), - "Empty Element in HDoubleList::Previous"); - return Next; -} - -// ----------------------------------------------------------------------- -// - - -// - - -// - - -// ----------------------------------------------------------------------- -void PCollection_HDoubleList::SwapTail(Handle(PCollection_HDoubleList)& - WithList) -{ - // Exception si liste vide - Standard_NoSuchObject_Raise_if(IsEmpty(), - "Empty Element in HDoubleList::SwapTail") ; - - Handle(PCollection_HDoubleList) L = Next; - Handle(PCollection_HDoubleList) me ; - me = this; - WithList->ChangeBackPointer(me); - Next = WithList; - WithList = L; -} - -void PCollection_HDoubleList::Destroy() -{ -#ifdef CSFDB - Next.Nullify(); -#endif -} diff --git a/src/PCollection/PCollection_HSingleList.cdl b/src/PCollection/PCollection_HSingleList.cdl deleted file mode 100644 index 8eab7dc398..0000000000 --- a/src/PCollection/PCollection_HSingleList.cdl +++ /dev/null @@ -1,100 +0,0 @@ --- Created on: 1992-02-19 --- Created by: Jean Pierre TIRAULT --- Copyright (c) 1992-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. - -generic class HSingleList from PCollection (Item as Storable) -inherits PManaged - -raises - NoSuchObject from Standard - -is - - ---Purpose: Definition of a single linked list. - - Create returns mutable HSingleList; - ---Creation of an empty list. - - IsEmpty(me) returns Boolean from Standard; - ---Level: Public - ---Purpose: Returns True if the list contains no element. - - - Construct(me; T : Item) returns mutable - HSingleList; - ---Level: Public - ---Purpose: add T at the begining of me - ---Example: before - -- me = (A B C) - -- after - -- me = (A B C) - -- returns - -- (T A B C) - - Value(me) returns any Item - raises NoSuchObject from Standard; - ---Level: Public - ---Purpose: Returns the value of the first node of me. - -- Raises an exception if me is empty. - ---Example: before - -- me = (A B C) - -- after - -- me = (A B C) - -- returns - -- A - - Tail(me) returns any HSingleList - raises NoSuchObject from Standard; - ---Level: Public - ---Purpose: End of the list me. - -- Raises an exception if me is empty. - ---Example: before - -- me = (A B C) - -- after - -- me = (A B C) - -- returns - -- (B C) - - SwapTail(me : mutable; WithList : in out any HSingleList) - raises NoSuchObject from Standard; - ---Level: Public - ---Purpose: Exchanges the end of with the list WithList. - -- Raises an exception if me is empty. - ---Example: before - -- me = (A B C) - -- WithList = (D E) - -- after - -- me = (A D E) - -- WithList = (B C) - - SetValue(me : mutable; T : Item) - raises NoSuchObject from Standard ; - ---Level: Public - ---Purpose: Changes the value of the first node of me. - -- Raises an exception if me is empty. - ---Example: before - -- me = (A B C) - -- after - -- me = (T B C) - - ChangeForwardPointer(me : mutable; ForwardPointer : HSingleList); - ---Level: Public - ---Purpose: Modification of the node link. - -fields - Data : Item; - Next : HSingleList; - -end HSingleList; diff --git a/src/PCollection/PCollection_HSingleList.gxx b/src/PCollection/PCollection_HSingleList.gxx deleted file mode 100644 index ad6a0a7a9c..0000000000 --- a/src/PCollection/PCollection_HSingleList.gxx +++ /dev/null @@ -1,114 +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. - -// ---------------------------------------------------------------------- -// HSingleList implementation: -// Last Revision : Feb,10 1992 J.P Tirault -// Implementation of ShallowCopy, ShallowDump -// methods. -// ------------------------------------------------------------------------- - -#include -#include -#include -#include - -// ------------------------------------------------------------------------- -// - -// Constructor Returns an empty list - -// ---------- - -// - -// ------------------------------------------------------------------------- -PCollection_HSingleList::PCollection_HSingleList () -{ - Next.Nullify(); -} - - -// ------------------------------------------------------------------------- -// - -// Construct : Add an item at the beginning of the list - -// --------- - -// - -// ------------------------------------------------------------------------- -Handle(PCollection_HSingleList) - PCollection_HSingleList::Construct(const Item& T)const -{ - - - Handle(PCollection_HSingleList) me , L ; - me = this; -#ifndef OBJS - L = new PCollection_HSingleList; -#else - L = new (os_segment::of(this)) PCollection_HSingleList; -#endif - L->ChangeForwardPointer ( me ); - L->SetValue ( T ); - return L; -} - -/* Anciens INLINE */ - -Item PCollection_HSingleList::Value() const { - Standard_NoSuchObject_Raise_if(IsEmpty(), - "Empty Element in HSingleList::Value"); - return Data; -} - -Handle(PCollection_HSingleList) PCollection_HSingleList::Tail() const { - Standard_NoSuchObject_Raise_if (IsEmpty(), - "Empty Element in HSingleList::Value"); - return Next; -} - - -Standard_Boolean PCollection_HSingleList::IsEmpty()const -{ - return Next.IsNull(); -} - - -void PCollection_HSingleList::SetValue(const Item& T) -{ - Standard_NoSuchObject_Raise_if (IsEmpty(), - "Empty Element in HSingleList::SetValue"); - Data = T; -} - - -// ------------------------------------------------------------------------- -// - -// SwapTail : Exchange the tail of the current list with an another list - -// -------- - -// - -// ------------------------------------------------------------------------- -void PCollection_HSingleList::SwapTail(Handle(PCollection_HSingleList)& - WithList) -{ - Standard_NoSuchObject_Raise_if (IsEmpty(), - "Empty Element in HSingleList::SwapTail"); - Handle(PCollection_HSingleList) L = Next; - Next = WithList; - WithList = L; -} - - -void PCollection_HSingleList::ChangeForwardPointer - (const Handle(PCollection_HSingleList)& L) -{ - Next = L; -} - - diff --git a/src/PCollection/PCollection_Hash.cdl b/src/PCollection/PCollection_Hash.cdl deleted file mode 100644 index e4db5085cc..0000000000 --- a/src/PCollection/PCollection_Hash.cdl +++ /dev/null @@ -1,39 +0,0 @@ --- Created on: 1991-04-22 --- Created by: jean pierre TIRAULT --- Copyright (c) 1991-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. - -generic class Hash from PCollection (key as Storable) inherits Storable - is - - - - Create returns Hash; - ---Purpose : Empty constructor. - - - - HashCode (me; MyKey : key ; Upper : Integer) - returns Integer is virtual; - ---Level: Public - ---Purpose: Returns a hashcod value of key bounded by Upper. - - - - Compare (me; One , Two : key) returns Boolean is virtual; - ---Level: Public - ---Purpose : Compare two keys and returns a boolean value - -end; - diff --git a/src/PCollection/PCollection_Hash.gxx b/src/PCollection/PCollection_Hash.gxx deleted file mode 100644 index 5bf3157179..0000000000 --- a/src/PCollection/PCollection_Hash.gxx +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) 1992-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. - -// Hash.gxx doesn't contains methods. All methods are inline methods. - - -// methods for hash class from PCollection. -// Written by JPT FEB,24 1992 -// ----------------- -// Empty constructor -// ----------------- -PCollection_Hash::PCollection_Hash(){} - - -// ----------------------------------------------------------------- -// To remove the ambigous compilation warning between Hash::HashCode -// and Storable::Hashcode -// ----------------------------------------------------------------- -//Standard_Integer PCollection_Hash::HashCode -// (const Standard_Integer Upper) const { - -// return this % Upper; -//} - -// ------------------------------ -// The PCollection::Hascode method -// ------------------------------ -Standard_Integer PCollection_Hash::HashCode(const key& K, - const Standard_Integer Upper) -const { - - return ::HashCode(K,Upper); -} - - -// ----------------------------- -// A method to compare two items -// ------------------------------ -Standard_Boolean PCollection_Hash::Compare (const key& one, - const key& two) const { - - return(one == two); -} - - - diff --git a/src/PCollection/PCollection_LDSHR.edl b/src/PCollection/PCollection_LDSHR.edl deleted file mode 100644 index 1840bcbf66..0000000000 --- a/src/PCollection/PCollection_LDSHR.edl +++ /dev/null @@ -1,17 +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. - -@if ( ( %Station == "ao1" ) && ( %DBMS == "OBJS" ) ) then - @string %LDSHR_DBMSOpt += " -taso "; -@endif; diff --git a/src/PCollection/PCollection_WOKSteps.edl b/src/PCollection/PCollection_WOKSteps.edl deleted file mode 100644 index 7a23846a9a..0000000000 --- a/src/PCollection/PCollection_WOKSteps.edl +++ /dev/null @@ -1,24 +0,0 @@ --- Created by: Stephane Callegari --- 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. - -@ifnotdefined ( %PCollection_WOKSteps_EDL) then - - @set %PCollection_WOKSteps_EDL = ""; - - @string %WOKSteps_XcppGroup = " xcpp.fill xcpp.src xcpp.header xcpp.template obj.cgen obj.inc "; - --@set %WOKSteps_xcpp_repl = "*PCollection_Replace(xcpp.header)"; - -@endif; - diff --git a/src/PMMgt/FILES b/src/PMMgt/FILES index c35f46d195..5be55c9b87 100755 --- a/src/PMMgt/FILES +++ b/src/PMMgt/FILES @@ -1,4 +1,2 @@ PMMgt_InsertDelete.tcl PMMgt_WOKSteps.edl -PMMgt_CMPLRS.edl -PMMgt_LDSHR.edl diff --git a/src/PMMgt/PMMgt_CMPLRS.edl b/src/PMMgt/PMMgt_CMPLRS.edl deleted file mode 100644 index 8255dc7b58..0000000000 --- a/src/PMMgt/PMMgt_CMPLRS.edl +++ /dev/null @@ -1,17 +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. - -@if ( ( %Station == "ao1" ) && ( %DBMS == "OBJS" ) ) then - @uses "OBJSCMPLRS.edl"; -@endif; diff --git a/src/PMMgt/PMMgt_LDSHR.edl b/src/PMMgt/PMMgt_LDSHR.edl deleted file mode 100644 index 1840bcbf66..0000000000 --- a/src/PMMgt/PMMgt_LDSHR.edl +++ /dev/null @@ -1,17 +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. - -@if ( ( %Station == "ao1" ) && ( %DBMS == "OBJS" ) ) then - @string %LDSHR_DBMSOpt += " -taso "; -@endif; diff --git a/src/PShort/FILES b/src/PShort/FILES deleted file mode 100755 index dd1ce1c552..0000000000 --- a/src/PShort/FILES +++ /dev/null @@ -1,2 +0,0 @@ -PShort_CMPLRS.edl -PShort_LDSHR.edl diff --git a/src/PShort/PShort_CMPLRS.edl b/src/PShort/PShort_CMPLRS.edl deleted file mode 100644 index 8255dc7b58..0000000000 --- a/src/PShort/PShort_CMPLRS.edl +++ /dev/null @@ -1,17 +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. - -@if ( ( %Station == "ao1" ) && ( %DBMS == "OBJS" ) ) then - @uses "OBJSCMPLRS.edl"; -@endif; diff --git a/src/PShort/PShort_LDSHR.edl b/src/PShort/PShort_LDSHR.edl deleted file mode 100644 index 1840bcbf66..0000000000 --- a/src/PShort/PShort_LDSHR.edl +++ /dev/null @@ -1,17 +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. - -@if ( ( %Station == "ao1" ) && ( %DBMS == "OBJS" ) ) then - @string %LDSHR_DBMSOpt += " -taso "; -@endif; diff --git a/src/PStandard/FILES b/src/PStandard/FILES deleted file mode 100755 index 3b0b7d9d2e..0000000000 --- a/src/PStandard/FILES +++ /dev/null @@ -1,2 +0,0 @@ -PStandard_CMPLRS.edl -PStandard_LDSHR.edl diff --git a/src/PStandard/PStandard_CMPLRS.edl b/src/PStandard/PStandard_CMPLRS.edl deleted file mode 100644 index 4abeb9a669..0000000000 --- a/src/PStandard/PStandard_CMPLRS.edl +++ /dev/null @@ -1,17 +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. - -@if ( ( %Station == "ao1" ) && ( %DBMS == "OBJS" ) ) then - @uses "OBJSCMPLRS.edl"; -@endif; diff --git a/src/PStandard/PStandard_LDSHR.edl b/src/PStandard/PStandard_LDSHR.edl deleted file mode 100644 index 1840bcbf66..0000000000 --- a/src/PStandard/PStandard_LDSHR.edl +++ /dev/null @@ -1,17 +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. - -@if ( ( %Station == "ao1" ) && ( %DBMS == "OBJS" ) ) then - @string %LDSHR_DBMSOpt += " -taso "; -@endif; diff --git a/src/QADNaming/QADNaming.cdl b/src/QADNaming/QADNaming.cdl index 40769a8ead..1b53197543 100644 --- a/src/QADNaming/QADNaming.cdl +++ b/src/QADNaming/QADNaming.cdl @@ -29,10 +29,6 @@ uses TopTools is - class DataMapOfShapeOfName instantiates - DataMap from TCollection(Shape from TopoDS, - AsciiString from TCollection, - ShapeMapHasher from TopTools); CurrentShape (ShapeEntry : CString from Standard; Data : Data from TDF) returns Shape from TopoDS; diff --git a/src/QADNaming/QADNaming_ToolsCommands.cxx b/src/QADNaming/QADNaming_ToolsCommands.cxx index 7138fd01bf..45f4999342 100644 --- a/src/QADNaming/QADNaming_ToolsCommands.cxx +++ b/src/QADNaming/QADNaming_ToolsCommands.cxx @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -110,7 +110,7 @@ static Standard_Integer QADNaming_TCopyShape (Draw_Interpretor& di, TNaming_Translator TR; if(nb < 2) return (1); - QADNaming_DataMapOfShapeOfName aDMapOfShapeOfName; + DNaming_DataMapOfShapeOfName aDMapOfShapeOfName; for(Standard_Integer i= 1;i < nb; i++) { TopoDS_Shape S = DBRep::Get(arg[i]); TCollection_AsciiString name(arg[i]); @@ -134,7 +134,7 @@ static Standard_Integer QADNaming_TCopyShape (Draw_Interpretor& di, if(TR.IsDone()){ // cout << "QADNaming_CopyShape:: Copy is Done " << endl; - QADNaming_DataMapIteratorOfDataMapOfShapeOfName itrn(aDMapOfShapeOfName); + DNaming_DataMapIteratorOfDataMapOfShapeOfName itrn(aDMapOfShapeOfName); for(;itrn.More();itrn.Next()) { TCollection_AsciiString name = itrn.Value(); const TopoDS_Shape& Result = TR.Copied(itrn.Key()); diff --git a/src/Storage/Storage.cdl b/src/Storage/Storage.cdl index 278f6c2141..13e405bf16 100644 --- a/src/Storage/Storage.cdl +++ b/src/Storage/Storage.cdl @@ -141,9 +141,6 @@ is private class stCONSTclCOM; private class TypedCallBack; - private class SeqOfPersistent instantiates Sequence from TCollection(Persistent from Standard); - private class HSeqOfPersistent instantiates HSequence from TCollection(Persistent from Standard,SeqOfPersistent); - private class MapPSDHasher instantiates MapHasher from TCollection(Persistent from Standard); private class PType instantiates IndexedDataMap from TCollection(AsciiString from TCollection, Integer from Standard, @@ -163,9 +160,6 @@ is class ArrayOfSchema instantiates Array1 from TCollection(Schema from Storage); class HArrayOfSchema instantiates HArray1 from TCollection(Schema from Storage,ArrayOfSchema from Storage); - private class SeqOfCallBack instantiates Sequence from TCollection(CallBack from Storage); - private class HSeqOfCallBack instantiates HSequence from TCollection(CallBack from Storage,SeqOfCallBack from Storage); - private class PArray instantiates Array1 from TCollection(Persistent from Standard); private class HPArray instantiates HArray1 from TCollection(Persistent from Standard, PArray from Storage); diff --git a/src/TDF/TDF.cdl b/src/TDF/TDF.cdl index 86be155d58..f650811934 100644 --- a/src/TDF/TDF.cdl +++ b/src/TDF/TDF.cdl @@ -261,11 +261,6 @@ is Integer from Standard, LabelMapHasher from TDF); - class LabelLabelMap instantiates DataMap from TCollection - (Label from TDF, - Label from TDF, - LabelMapHasher from TDF); - class GUIDProgIDMap instantiates DoubleMap from TCollection (GUID from Standard, ExtendedString from TCollection, diff --git a/src/V3d/V3d_Viewer.cdl b/src/V3d/V3d_Viewer.cdl index 13809c1b50..812c86fddf 100644 --- a/src/V3d/V3d_Viewer.cdl +++ b/src/V3d/V3d_Viewer.cdl @@ -737,6 +737,5 @@ fields friends class View from V3d, - class Light from V3d, - SetPlane from package V3d (aViewer: Viewer from V3d; x1,y1,z1,x2,y2,z2: Length from Quantity) + class Light from V3d end Viewer; diff --git a/src/XCAFDoc/XCAFDoc_DocumentTool.cxx b/src/XCAFDoc/XCAFDoc_DocumentTool.cxx index e4ff2a18f1..502b654c11 100644 --- a/src/XCAFDoc/XCAFDoc_DocumentTool.cxx +++ b/src/XCAFDoc/XCAFDoc_DocumentTool.cxx @@ -17,7 +17,6 @@ #include #include #include -#include #include //=======================================================================