mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-14 13:30:48 +03:00
0030895: Coding Rules - specify std namespace explicitly for std::cout and streams
"endl" manipulator for Message_Messenger is renamed to "Message_EndLine". The following entities from std namespace are now used with std:: explicitly specified (from Standard_Stream.hxx): std::istream,std::ostream,std::ofstream,std::ifstream,std::fstream, std::filebuf,std::streambuf,std::streampos,std::ios,std::cout,std::cerr, std::cin,std::endl,std::ends,std::flush,std::setw,std::setprecision, std::hex,std::dec.
This commit is contained in:
@@ -389,7 +389,7 @@ Standard_OStream& TDF_Attribute::Dump(Standard_OStream& anOS) const
|
||||
//
|
||||
pStr=toto;
|
||||
ID().ToCString(pStr);
|
||||
anOS<<";\tID = "<<toto<<endl;
|
||||
anOS<<";\tID = "<<toto<<std::endl;
|
||||
return anOS;
|
||||
}
|
||||
|
||||
|
@@ -68,7 +68,7 @@ public:
|
||||
//! (it.Initialize(aLabel,Standard_True);
|
||||
//! it.More(); it.Next()){
|
||||
//! TDF_Tool::Entry(it.Value(),es);
|
||||
//! cout << as.ToCString() << endl;
|
||||
//! std::cout << as.ToCString() << std::endl;
|
||||
//! }
|
||||
//! }
|
||||
Standard_EXPORT void Initialize (const TDF_Label& aLabel, const Standard_Boolean allLevels = Standard_False);
|
||||
|
@@ -82,12 +82,12 @@ void TDF_CopyLabel::ExternalReferences(const TDF_Label& aRefLabel, const TDF_Lab
|
||||
itr.Value()->References(ds);
|
||||
const TDF_AttributeMap& attMap = ds->Attributes(); //attMap
|
||||
// TDF_Tool::Entry(itr.Value()->Label(), entr1); //d
|
||||
// cout<<"\tSource Attribute dynamic type = "<<itr.Value()->DynamicType()<<" Label = "<<entr1 <<endl;
|
||||
// std::cout<<"\tSource Attribute dynamic type = "<<itr.Value()->DynamicType()<<" Label = "<<entr1 <<std::endl;
|
||||
for (TDF_MapIteratorOfAttributeMap attMItr(attMap);attMItr.More(); attMItr.Next()) {
|
||||
Handle(TDF_Attribute) att = attMItr.Key();
|
||||
|
||||
// TDF_Tool::Entry(att->Label(), entr1);
|
||||
// cout<<"\t\tReferences attribute dynamic type = "<<att->DynamicType()<<" Label = "<<entr1 <<endl;
|
||||
// std::cout<<"\t\tReferences attribute dynamic type = "<<att->DynamicType()<<" Label = "<<entr1 <<std::endl;
|
||||
if (!att.IsNull() && !att->Label().IsNull())
|
||||
{
|
||||
if (aFilter.IsKept(att) && att->Label().IsDifferent(aRefLabel) &&
|
||||
@@ -100,7 +100,7 @@ void TDF_CopyLabel::ExternalReferences(const TDF_Label& aRefLabel, const TDF_Lab
|
||||
// const TDF_LabelMap& labMap = ds->Labels();
|
||||
// for (TDF_MapIteratorOfLabelMap labMItr(labMap);labMItr.More(); labMItr.Next()) {
|
||||
// TDF_Tool::Entry(labMItr.Key(), entr1);
|
||||
// cout<<"\t\tLABELS from DS of Attr:: Lab = "<<entr1<<endl;
|
||||
// std::cout<<"\t\tLABELS from DS of Attr:: Lab = "<<entr1<<std::endl;
|
||||
// if (!labMItr.Key().IsDescendant(aRefLabel) && labMItr.Key().IsDifferent(aRefLabel)) {
|
||||
// // aExternals.Add(itr.Value()); // ??? LabelMap of Attribute has label which don't
|
||||
// // belongs to source hierarchy. So, what we should do ?
|
||||
@@ -109,7 +109,7 @@ void TDF_CopyLabel::ExternalReferences(const TDF_Label& aRefLabel, const TDF_Lab
|
||||
// TCollection_AsciiString entr1, entr2;
|
||||
// TDF_Tool::Entry(labMItr.Key(), entr1);
|
||||
// TDF_Tool::Entry(aRefLabel, entr2);
|
||||
// cout<<"\t\t\tNot descendant label:: Lab1 = "<<entr1<<" and RefLab = "<<entr2<<endl;
|
||||
// std::cout<<"\t\t\tNot descendant label:: Lab1 = "<<entr1<<" and RefLab = "<<entr2<<std::endl;
|
||||
// }
|
||||
// }
|
||||
|
||||
@@ -142,12 +142,12 @@ static void PrintEntry(const TDF_Label& label, const Standard_Boolean allL
|
||||
{
|
||||
TCollection_AsciiString entry;
|
||||
TDF_Tool::Entry(label, entry);
|
||||
cout << "\tShareable attribute on the label = "<< entry << endl;
|
||||
std::cout << "\tShareable attribute on the label = "<< entry << std::endl;
|
||||
TDF_ChildIterator it (label, allLevels);
|
||||
for (; it.More(); it.Next())
|
||||
{
|
||||
TDF_Tool::Entry(it.Value(), entry);
|
||||
cout << "\tChildLabelEntry = "<< entry << endl;
|
||||
std::cout << "\tChildLabelEntry = "<< entry << std::endl;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
@@ -48,18 +48,18 @@ IMPLEMENT_STANDARD_RTTIEXT(TDF_Data,Standard_Transient)
|
||||
|
||||
#ifdef OCCT_DEBUG_DELTA
|
||||
#define TDF_Data_DebugModified(ACTION) \
|
||||
cout<<"After "<<ACTION<<" #"<<myTransaction+1<<", DF "<<this<<" had "<<myNbTouchedAtt<<" attribute(s) touched. Time = "<<myTime<<endl; \
|
||||
std::cout<<"After "<<ACTION<<" #"<<myTransaction+1<<", DF "<<this<<" had "<<myNbTouchedAtt<<" attribute(s) touched. Time = "<<myTime<<std::endl; \
|
||||
if (!myTransaction) { \
|
||||
TCollection_AsciiString entry; \
|
||||
for (TDF_ChildIterator itr(Root(),Standard_True); itr.More(); itr.Next()) { \
|
||||
const TDF_LabelNode* lnp = itr.Value().myLabelNode; \
|
||||
if (lnp->AttributesModified() || lnp->MayBeModified()) { \
|
||||
TDF_Tool::Entry(itr.Value(),entry); \
|
||||
cout<<ACTION<<" on "<<entry<<" : flag(s) "; \
|
||||
if (lnp->AttributesModified()) cout<<"AttributesModified "; \
|
||||
if (lnp->MayBeModified()) cout<<"MayBeModified already set in transaction 0! Please contact TDF developer."; \
|
||||
cout<<endl; \
|
||||
cout<<itr.Value()<<endl; \
|
||||
std::cout<<ACTION<<" on "<<entry<<" : flag(s) "; \
|
||||
if (lnp->AttributesModified()) std::cout<<"AttributesModified "; \
|
||||
if (lnp->MayBeModified()) std::cout<<"MayBeModified already set in transaction 0! Please contact TDF developer."; \
|
||||
std::cout<<std::endl; \
|
||||
std::cout<<itr.Value()<<std::endl; \
|
||||
entry.Clear(); \
|
||||
}}}
|
||||
#else
|
||||
@@ -71,7 +71,7 @@ if (!myTransaction) { \
|
||||
{ \
|
||||
TCollection_AsciiString entry; \
|
||||
TDF_Tool::Entry(currentAtt->Label(),entry); \
|
||||
cout<<"Creation of a DeltaOn"<<DELTATYPE<<" \tat "<<entry<<" \ton "<<currentAtt->DynamicType()<<endl; \
|
||||
std::cout<<"Creation of a DeltaOn"<<DELTATYPE<<" \tat "<<entry<<" \ton "<<currentAtt->DynamicType()<<std::endl; \
|
||||
}
|
||||
#else
|
||||
#define TDF_DataDebugDeltaCreation(DELTATYPE)
|
||||
@@ -138,7 +138,7 @@ Handle(TDF_Delta) TDF_Data::CommitTransaction
|
||||
if (myTransaction>0) {
|
||||
if (withDelta) delta = new TDF_Delta();
|
||||
#ifdef OCCT_DEBUG_DELTA
|
||||
cout<<"TDF_Data::Begin Commit #"<<myTransaction<<endl;
|
||||
std::cout<<"TDF_Data::Begin Commit #"<<myTransaction<<std::endl;
|
||||
#endif
|
||||
#ifdef TDF_DATA_COMMIT_OPTIMIZED
|
||||
myNbTouchedAtt = 0;
|
||||
@@ -154,15 +154,15 @@ Handle(TDF_Delta) TDF_Data::CommitTransaction
|
||||
delta->Validity(myTimes.First(),myTime);
|
||||
#ifdef OCCT_DEBUG_DELTA
|
||||
if (myTransaction == 0) {
|
||||
cout<<"TDF_Data::Commit generated this delta in t=0:"<<endl;
|
||||
delta->Dump(cout);
|
||||
std::cout<<"TDF_Data::Commit generated this delta in t=0:"<<std::endl;
|
||||
delta->Dump(std::cout);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#ifdef OCCT_DEBUG_DELTA
|
||||
else {
|
||||
if (myTransaction == 0)
|
||||
cout<<"TDF_Data::Commit generated NO delta."<<endl;
|
||||
std::cout<<"TDF_Data::Commit generated NO delta."<<std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -408,8 +408,8 @@ Handle(TDF_Delta) TDF_Data::Undo(const Handle(TDF_Delta)& aDelta,
|
||||
if (aDelta->IsApplicable(myTime)) {
|
||||
if (withDelta) OpenTransaction();
|
||||
#ifdef OCCT_DEBUG_DELTA
|
||||
cout<<"TDF_Data::Undo applies this delta:"<<endl;
|
||||
aDelta->Dump(cout);
|
||||
std::cout<<"TDF_Data::Undo applies this delta:"<<std::endl;
|
||||
aDelta->Dump(std::cout);
|
||||
#endif
|
||||
aDelta->BeforeOrAfterApply(Standard_True);
|
||||
myNotUndoMode = Standard_False;
|
||||
@@ -420,7 +420,7 @@ Handle(TDF_Delta) TDF_Data::Undo(const Handle(TDF_Delta)& aDelta,
|
||||
newDelta = CommitTransaction(Standard_True);
|
||||
newDelta->Validity(aDelta->EndTime(),aDelta->BeginTime());
|
||||
#ifdef OCCT_DEBUG_DELTA
|
||||
cout<<"TDF_Data::Undo, after validity correction, Delta is now available from time \t#"<<newDelta->BeginTime()<<" to time \t#"<<newDelta->EndTime()<<endl;
|
||||
std::cout<<"TDF_Data::Undo, after validity correction, Delta is now available from time \t#"<<newDelta->BeginTime()<<" to time \t#"<<newDelta->EndTime()<<std::endl;
|
||||
#endif
|
||||
}
|
||||
myTime = aDelta->BeginTime();
|
||||
@@ -439,8 +439,8 @@ Handle(TDF_Delta) TDF_Data::Undo(const Handle(TDF_Delta)& aDelta,
|
||||
|
||||
Standard_OStream& TDF_Data::Dump(Standard_OStream& anOS) const
|
||||
{
|
||||
anOS<<"Dump of a TDF_Data."<<endl;
|
||||
anOS<<"Dump of a TDF_Data."<<std::endl;
|
||||
anOS<<"Current transaction: "<<myTransaction;
|
||||
anOS<<"; Current tick: "<<myTime<<";"<<endl;
|
||||
anOS<<"; Current tick: "<<myTime<<";"<<std::endl;
|
||||
return anOS;
|
||||
}
|
||||
|
@@ -56,27 +56,27 @@ void TDF_DataSet::Clear()
|
||||
|
||||
Standard_OStream& TDF_DataSet::Dump(Standard_OStream& anOS) const
|
||||
{
|
||||
anOS<<"\t\t=====< TDF_DataSet dump >====="<<endl;
|
||||
anOS<<"Root Labels :"<<endl<<"============="<<endl;
|
||||
anOS<<"\t\t=====< TDF_DataSet dump >====="<<std::endl;
|
||||
anOS<<"Root Labels :"<<std::endl<<"============="<<std::endl;
|
||||
for (TDF_ListIteratorOfLabelList itr1(myRootLabels);
|
||||
itr1.More(); itr1.Next()) {
|
||||
itr1.Value().EntryDump(anOS);
|
||||
anOS<<" | ";
|
||||
}
|
||||
anOS<<endl<<"Labels :"<<endl<<"========"<<endl;
|
||||
anOS<<std::endl<<"Labels :"<<std::endl<<"========"<<std::endl;
|
||||
for (TDF_MapIteratorOfLabelMap itr2(myLabelMap);
|
||||
itr2.More(); itr2.Next()) {
|
||||
itr2.Key().EntryDump(anOS);
|
||||
anOS<<" | ";
|
||||
}
|
||||
anOS<<endl<<"Attributes :"<<endl<<"============"<<endl<<endl;
|
||||
anOS<<std::endl<<"Attributes :"<<std::endl<<"============"<<std::endl<<std::endl;
|
||||
for (TDF_MapIteratorOfAttributeMap itr3(myAttributeMap);
|
||||
itr3.More(); itr3.Next()) {
|
||||
itr3.Key()->Label().EntryDump(anOS);
|
||||
anOS<<" \t";
|
||||
itr3.Key()->Dump(anOS);
|
||||
anOS<<endl;
|
||||
anOS<<std::endl;
|
||||
}
|
||||
anOS<<endl;
|
||||
anOS<<std::endl;
|
||||
return anOS;
|
||||
}
|
||||
|
@@ -112,15 +112,15 @@ void TDF_Delta::BeforeOrAfterApply(const Standard_Boolean before) const
|
||||
|
||||
if (!noDeadLock) {
|
||||
#ifdef OCCT_DEBUG
|
||||
if (before) cout<<"Before"; else cout<<"After";
|
||||
cout<<"Undo(): dead lock between these attributes:"<<endl;
|
||||
if (before) std::cout<<"Before"; else std::cout<<"After";
|
||||
std::cout<<"Undo(): dead lock between these attributes:"<<std::endl;
|
||||
for (itr.Initialize(ADlist); itr.More(); itr.Next()) {
|
||||
cout<<"AttributeDelta type = "<<itr.Value()->DynamicType()->Name();
|
||||
cout<<" Attribute type = "<<itr.Value()->Attribute()->DynamicType()->Name()<<endl;;
|
||||
std::cout<<"AttributeDelta type = "<<itr.Value()->DynamicType()->Name();
|
||||
std::cout<<" Attribute type = "<<itr.Value()->Attribute()->DynamicType()->Name()<<std::endl;;
|
||||
if (before)
|
||||
cout<<"BeforeUndo(): dead lock."<<endl;
|
||||
std::cout<<"BeforeUndo(): dead lock."<<std::endl;
|
||||
else
|
||||
cout<<"AfterUndo(): dead lock."<<endl;
|
||||
std::cout<<"AfterUndo(): dead lock."<<std::endl;
|
||||
}
|
||||
#endif
|
||||
for (itr.Initialize(ADlist); itr.More(); itr.Next()) {
|
||||
@@ -161,7 +161,7 @@ void TDF_Delta::Labels(TDF_LabelList& aLabelList) const
|
||||
// If <aLabelList> is not empty...
|
||||
#ifdef OCCT_DEBUG_DELTA
|
||||
Standard_Boolean inList;
|
||||
if (aLabelList.Extent() > 0) cout<<"Previously added as modified label(s) ";
|
||||
if (aLabelList.Extent() > 0) std::cout<<"Previously added as modified label(s) ";
|
||||
#endif
|
||||
for (TDF_ListIteratorOfLabelList it1(aLabelList);
|
||||
it1.More(); it1.Next()) {
|
||||
@@ -169,17 +169,17 @@ void TDF_Delta::Labels(TDF_LabelList& aLabelList) const
|
||||
const TDF_Label& lab1 = it1.Value();
|
||||
inList = labMap.Add(lab1);
|
||||
if (!inList) {
|
||||
lab1.EntryDump(cout);cout<<" | ";
|
||||
lab1.EntryDump(std::cout);std::cout<<" | ";
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#ifdef OCCT_DEBUG_DELTA
|
||||
cout<<endl;
|
||||
std::cout<<std::endl;
|
||||
#endif
|
||||
|
||||
// New labels to add.
|
||||
#ifdef OCCT_DEBUG_DELTA
|
||||
if (myAttDeltaList.Extent() > 0) cout<<"New added as modified label(s) ";
|
||||
if (myAttDeltaList.Extent() > 0) std::cout<<"New added as modified label(s) ";
|
||||
#endif
|
||||
for (TDF_ListIteratorOfAttributeDeltaList it2(myAttDeltaList);
|
||||
it2.More();
|
||||
@@ -188,12 +188,12 @@ void TDF_Delta::Labels(TDF_LabelList& aLabelList) const
|
||||
const TDF_Label& lab1 = it2.Value()->Label();
|
||||
inList = labMap.Add(lab1);
|
||||
if (!inList) {
|
||||
lab1.EntryDump(cout);cout<<" | ";
|
||||
lab1.EntryDump(std::cout);std::cout<<" | ";
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#ifdef OCCT_DEBUG_DELTA
|
||||
cout<<endl;
|
||||
std::cout<<std::endl;
|
||||
#endif
|
||||
|
||||
// Now put labels into <aLabelList>.
|
||||
@@ -211,14 +211,14 @@ void TDF_Delta::Labels(TDF_LabelList& aLabelList) const
|
||||
|
||||
void TDF_Delta::Dump(Standard_OStream& OS) const
|
||||
{
|
||||
OS<<"DELTA available from time \t#"<<myBeginTime<<" to time \t#"<<myEndTime<<endl;
|
||||
OS<<"DELTA available from time \t#"<<myBeginTime<<" to time \t#"<<myEndTime<<std::endl;
|
||||
Standard_Integer n = 0;
|
||||
// for (TDF_ListIteratorOfAttributeDeltaList itr(myAttDeltaList);
|
||||
TDF_ListIteratorOfAttributeDeltaList itr(myAttDeltaList) ;
|
||||
for ( ; itr.More(); itr.Next()) ++n;
|
||||
OS<<"Nb Attribute Delta(s): "<<n<<endl;
|
||||
OS<<"Nb Attribute Delta(s): "<<n<<std::endl;
|
||||
for (itr.Initialize(myAttDeltaList); itr.More(); itr.Next()) {
|
||||
const Handle(TDF_AttributeDelta)& attDelta = itr.Value();
|
||||
OS<<"| "; attDelta->Dump(OS); OS<<endl;
|
||||
OS<<"| "; attDelta->Dump(OS); OS<<std::endl;
|
||||
}
|
||||
}
|
||||
|
@@ -46,6 +46,6 @@ void TDF_DeltaOnForget::Apply()
|
||||
Label().ResumeAttribute(Attribute());
|
||||
Attribute()->mySavedTransaction = 0;
|
||||
#ifdef OCCT_DEBUG
|
||||
cout<<"Resume attribute"<<endl;
|
||||
std::cout<<"Resume attribute"<<std::endl;
|
||||
#endif
|
||||
}
|
||||
|
@@ -45,6 +45,6 @@ void TDF_DeltaOnResume::Apply()
|
||||
// Undo = Forget.
|
||||
Label().ForgetAttribute (Attribute());
|
||||
#ifdef OCCT_DEBUG
|
||||
cout<<"Forget attribute"<<endl;
|
||||
std::cout<<"Forget attribute"<<std::endl;
|
||||
#endif
|
||||
}
|
||||
|
@@ -165,11 +165,11 @@ void TDF_IDFilter::Dump(Standard_OStream& anOS) const
|
||||
if (myIgnore) anOS<<"ignores"; else anOS<<"keeps "; anOS<<" all IDs";
|
||||
TDF_MapIteratorOfIDMap itr(myIDMap);
|
||||
if (itr.More()) {
|
||||
anOS<<" BUT:"<<endl;
|
||||
anOS<<" BUT:"<<std::endl;
|
||||
for (; itr.More(); itr.Next()) {
|
||||
const Standard_GUID& guid = itr.Key();
|
||||
guid.ShallowDump(anOS);
|
||||
anOS<<endl;
|
||||
anOS<<std::endl;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -375,7 +375,7 @@ void TDF_Label::InternalDump
|
||||
if (AttributesModified()) anOS<<"HAS attributes"; else anOS<<"NO attribute"; anOS<<" modified; ";
|
||||
if (HasAttribute()) {
|
||||
Standard_Integer nba = NbAttributes();
|
||||
anOS<<"has "<<nba<<" attribute"; if (nba > 1) anOS<<"s"; anOS<<"."<<endl;
|
||||
anOS<<"has "<<nba<<" attribute"; if (nba > 1) anOS<<"s"; anOS<<"."<<std::endl;
|
||||
for (TDF_AttributeIterator itr(myLabelNode); itr.More(); itr.Next()) {
|
||||
// CLE
|
||||
// const Handle(TDF_Attribute)& att = itr.Value();
|
||||
@@ -386,7 +386,7 @@ void TDF_Label::InternalDump
|
||||
}
|
||||
}
|
||||
else {
|
||||
anOS<<" has no attribute"<<endl;
|
||||
anOS<<" has no attribute"<<std::endl;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -267,14 +267,14 @@ Standard_OStream& TDF_RelocationTable::Dump
|
||||
if (mySelfRelocate) anOS<<"IS"; else anOS<<"NOT";
|
||||
anOS<<" self relocate ";
|
||||
if (myAfterRelocate) anOS<<"WITH"; else anOS<<"WITHOUT";
|
||||
anOS<<" after relocate"<<endl;
|
||||
anOS<<" after relocate"<<std::endl;
|
||||
anOS<<"Nb labels="<<myLabelTable.Extent();
|
||||
anOS<<" Nb attributes="<<myAttributeTable.Extent();
|
||||
anOS<<" Nb transients="<<myTransientTable.Extent()<<endl;
|
||||
anOS<<" Nb transients="<<myTransientTable.Extent()<<std::endl;
|
||||
|
||||
Standard_Integer nb = 0;
|
||||
if (dumpLabels) {
|
||||
anOS<<"Label Table:"<<endl;
|
||||
anOS<<"Label Table:"<<std::endl;
|
||||
for (TDF_DataMapIteratorOfLabelDataMap itr(myLabelTable);
|
||||
itr.More(); itr.Next()) {
|
||||
++nb;
|
||||
@@ -284,12 +284,12 @@ Standard_OStream& TDF_RelocationTable::Dump
|
||||
itr.Value().EntryDump(anOS);
|
||||
anOS<<"| ";
|
||||
}
|
||||
cout<<endl;
|
||||
std::cout<<std::endl;
|
||||
}
|
||||
|
||||
nb = 0;
|
||||
if (dumpAttributes) {
|
||||
anOS<<"Attribute Table:"<<endl;
|
||||
anOS<<"Attribute Table:"<<std::endl;
|
||||
for (TDF_DataMapIteratorOfAttributeDataMap itr(myAttributeTable);
|
||||
itr.More(); itr.Next()) {
|
||||
++nb;
|
||||
@@ -298,12 +298,12 @@ Standard_OStream& TDF_RelocationTable::Dump
|
||||
anOS<<"<=>";
|
||||
itr.Value()->Dump(anOS);
|
||||
anOS<<"| ";
|
||||
anOS<<endl;
|
||||
anOS<<std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
if (dumpTransients) {
|
||||
anOS<<"Transient Table:"<<myTransientTable.Extent()<<" transient(s) in table."<<endl;
|
||||
anOS<<"Transient Table:"<<myTransientTable.Extent()<<" transient(s) in table."<<std::endl;
|
||||
}
|
||||
|
||||
return anOS;
|
||||
|
@@ -624,9 +624,9 @@ void TDF_Tool::ExtendedDeepDump
|
||||
TDF_Tool_ExtendedDeepDump(anOS,aLabel,aFilter,map);
|
||||
|
||||
anOS<<map.Extent()<<" attribute"; if (map.Extent()>1) anOS<<"s";
|
||||
anOS<<" referenced by the label structure."<<endl;
|
||||
anOS<<" referenced by the label structure."<<std::endl;
|
||||
|
||||
anOS<<endl<<"Extended dump of filtered attribute(s):"<<endl;
|
||||
anOS<<std::endl<<"Extended dump of filtered attribute(s):"<<std::endl;
|
||||
Standard_Integer nba = 0;
|
||||
TCollection_AsciiString entry;
|
||||
Standard_Integer i ;
|
||||
@@ -636,18 +636,18 @@ void TDF_Tool::ExtendedDeepDump
|
||||
++nba;
|
||||
anOS<<"# "<<i;
|
||||
if (att->Label().IsNull()) {
|
||||
anOS<<" (no label)"<<endl;
|
||||
anOS<<" (no label)"<<std::endl;
|
||||
}
|
||||
else {
|
||||
TDF_Tool::Entry(att->Label(),entry);
|
||||
anOS<<" (label: "<<entry<<")"<<endl;
|
||||
anOS<<" (label: "<<entry<<")"<<std::endl;
|
||||
}
|
||||
att->ExtendedDump(anOS,aFilter,map); anOS<<endl;
|
||||
att->ExtendedDump(anOS,aFilter,map); anOS<<std::endl;
|
||||
}
|
||||
}
|
||||
anOS<<endl<<nba<<" attribute";
|
||||
anOS<<std::endl<<nba<<" attribute";
|
||||
if (nba>1) anOS<<"s";
|
||||
anOS<<" dumped between "<<--i<<endl;
|
||||
anOS<<" dumped between "<<--i<<std::endl;
|
||||
}
|
||||
|
||||
|
||||
|
@@ -91,7 +91,7 @@ void TDF_Transaction::Initialize(const Handle(TDF_Data)& aDF)
|
||||
Standard_Integer TDF_Transaction::Open()
|
||||
{
|
||||
#ifdef OCCT_DEBUG_TRANSACTION
|
||||
cout<<"Transaction "<<myName<<" opens #"<<myDF->Transaction()+1<<endl;
|
||||
std::cout<<"Transaction "<<myName<<" opens #"<<myDF->Transaction()+1<<std::endl;
|
||||
#endif
|
||||
if (IsOpen())
|
||||
throw Standard_DomainError("This transaction is already open.");
|
||||
@@ -109,27 +109,27 @@ Standard_Integer TDF_Transaction::Open()
|
||||
Handle(TDF_Delta) TDF_Transaction::Commit(const Standard_Boolean withDelta)
|
||||
{
|
||||
#ifdef OCCT_DEBUG_TRANSACTION
|
||||
cout<<"Transaction "<<myName<<" commits ";
|
||||
std::cout<<"Transaction "<<myName<<" commits ";
|
||||
#endif
|
||||
Handle(TDF_Delta) delta;
|
||||
if (IsOpen()) {
|
||||
#ifdef OCCT_DEBUG_TRANSACTION
|
||||
cout<<"from #"<<myDF->Transaction()<<" until #"<<myUntilTransaction<<" while current is #"<<myDF->Transaction()<<endl;
|
||||
std::cout<<"from #"<<myDF->Transaction()<<" until #"<<myUntilTransaction<<" while current is #"<<myDF->Transaction()<<std::endl;
|
||||
#endif
|
||||
#ifdef OCCT_DEBUG_TRANSACTION_DUMP
|
||||
cout<<"DF before commit"<<endl;
|
||||
TDF_Tool::DeepDump(cout,myDF);
|
||||
std::cout<<"DF before commit"<<std::endl;
|
||||
TDF_Tool::DeepDump(std::cout,myDF);
|
||||
#endif
|
||||
Standard_Integer until = myUntilTransaction;
|
||||
myUntilTransaction = 0;
|
||||
delta = myDF->CommitUntilTransaction(until, withDelta);
|
||||
#ifdef OCCT_DEBUG_TRANSACTION_DUMP
|
||||
cout<<"DF after commit"<<endl;
|
||||
TDF_Tool::DeepDump(cout,myDF);
|
||||
std::cout<<"DF after commit"<<std::endl;
|
||||
TDF_Tool::DeepDump(std::cout,myDF);
|
||||
#endif
|
||||
}
|
||||
#ifdef OCCT_DEBUG_TRANSACTION
|
||||
else cout<<"but this transaction is not open!"<<endl;
|
||||
else std::cout<<"but this transaction is not open!"<<std::endl;
|
||||
#endif
|
||||
return delta;
|
||||
}
|
||||
@@ -144,17 +144,17 @@ void TDF_Transaction::Abort()
|
||||
{
|
||||
if (IsOpen()) {
|
||||
#ifdef OCCT_DEBUG_TRANSACTION
|
||||
cout<<"Transaction "<<myName<<" aborts from #"<<myDF->Transaction()<<" until #"<<myUntilTransaction<<" while current is #"<<myDF->Transaction()<<endl;
|
||||
std::cout<<"Transaction "<<myName<<" aborts from #"<<myDF->Transaction()<<" until #"<<myUntilTransaction<<" while current is #"<<myDF->Transaction()<<std::endl;
|
||||
#endif
|
||||
#ifdef OCCT_DEBUG_TRANSACTION_DUMP
|
||||
cout<<"DF before abort"<<endl;
|
||||
TDF_Tool::DeepDump(cout,myDF);
|
||||
std::cout<<"DF before abort"<<std::endl;
|
||||
TDF_Tool::DeepDump(std::cout,myDF);
|
||||
#endif
|
||||
myDF->AbortUntilTransaction(myUntilTransaction);
|
||||
myUntilTransaction = 0;
|
||||
#ifdef OCCT_DEBUG_TRANSACTION_DUMP
|
||||
cout<<"DF after abort"<<endl;
|
||||
TDF_Tool::DeepDump(cout,myDF);
|
||||
std::cout<<"DF after abort"<<std::endl;
|
||||
TDF_Tool::DeepDump(std::cout,myDF);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user