lili/OCCT
1
0
Fork 0
mirror of https://github.com/Open-Cascade-SAS/OCCT.git synced 2026-05-18 17:06:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

0024788: Foundation Classes - remove Dico_Dictionary

Browse Source 
Class Dico_Dictionary was replaced by NCollection_DataMap/NCollection_IndexedDataMap classes.
Changed argument name in template class NCollection_Datamap to eliminate redefinitions of static members in dependent code.
This commit is contained in:
ski
2016-10-12 18:02:55 +03:00
committed by apn
parent be70005cb5
commit 997e128f88
85 changed files with 1674 additions and 4530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ShapeProcess/ShapeProcess.cxx
View File

@@ -13,20 +13,18 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <NCollection_DataMap.hxx>
#include <Message_Messenger.hxx>
#include <Message_Msg.hxx>
#include <ShapeProcess.hxx>
#include <ShapeProcess_Context.hxx>
#include <ShapeProcess_DictionaryOfOperator.hxx>
#include <ShapeProcess_Operator.hxx>
#include <Standard_ErrorHandler.hxx>
#include <Standard_Failure.hxx>
#include <TCollection_AsciiString.hxx>
#include <TColStd_SequenceOfAsciiString.hxx>
static Handle(ShapeProcess_DictionaryOfOperator) dic;
static NCollection_DataMap<TCollection_AsciiString, Handle(ShapeProcess_Operator)> aMapOfOperators;
//=======================================================================
//function : RegisterOperator
//purpose :
@@ -35,14 +33,13 @@ static Handle(ShapeProcess_DictionaryOfOperator) dic;
Standard_Boolean ShapeProcess::RegisterOperator (const Standard_CString name,
const Handle(ShapeProcess_Operator)& op)
{
if ( dic.IsNull() ) dic = new ShapeProcess_DictionaryOfOperator;
if ( dic->HasItem ( name, Standard_True ) ) {
if (aMapOfOperators.IsBound(name)) {
#ifdef OCCT_DEBUG
cout << "Warning: operator with name " << name << " is already registered!" << endl;
#endif
return Standard_False;
}
dic->SetItem ( name, op );
aMapOfOperators.Bind( name, op );
return Standard_True;
}
@@ -54,14 +51,13 @@ Standard_Boolean ShapeProcess::RegisterOperator (const Standard_CString name,
Standard_Boolean ShapeProcess::FindOperator (const Standard_CString name,
Handle(ShapeProcess_Operator)& op)
{
if ( dic.IsNull() ) dic = new ShapeProcess_DictionaryOfOperator;
if ( ! dic->HasItem ( name, Standard_True ) ) {
if (!aMapOfOperators.IsBound(name)) {
#ifdef OCCT_DEBUG
cout << "Error: no operator with name " << name << " registered!" << endl;
#endif
return Standard_False;
}
op = dic->Item ( name );
op = aMapOfOperators.ChangeFind(name);
return !op.IsNull();
}