mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-04 13:13:25 +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:
@@ -627,7 +627,7 @@ const
|
||||
#ifdef OCCT_DEBUG
|
||||
if (AffichCircuit) {
|
||||
for (i = 1; i <= 2*NbItems - 2; i++) {
|
||||
cout<< "Correspondance "<< i<<" -> "<<Corres(i)<<endl;
|
||||
std::cout<< "Correspondance "<< i<<" -> "<<Corres(i)<<std::endl;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
@@ -253,7 +253,7 @@ Standard_Boolean MAT2d_Connexion::IsAfter(const Handle(MAT2d_Connexion)& C2,
|
||||
|
||||
static void Indent(const Standard_Integer Offset) {
|
||||
if (Offset > 0) {
|
||||
for (Standard_Integer i = 0; i <Offset; i++) {cout <<" ";}
|
||||
for (Standard_Integer i = 0; i <Offset; i++) {std::cout <<" ";}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -266,28 +266,28 @@ void MAT2d_Connexion::Dump (const Standard_Integer ,
|
||||
{
|
||||
Standard_Integer MyOffset = Offset;
|
||||
Indent (Offset);
|
||||
cout<<"MAT2d_Connexion :"<<endl;
|
||||
std::cout<<"MAT2d_Connexion :"<<std::endl;
|
||||
MyOffset++;
|
||||
Indent (MyOffset);
|
||||
cout <<"IndexFirstLine :"<<lineA<<endl;
|
||||
std::cout <<"IndexFirstLine :"<<lineA<<std::endl;
|
||||
Indent (MyOffset);
|
||||
cout <<"IndexSecondLine :"<<lineB<<endl;
|
||||
std::cout <<"IndexSecondLine :"<<lineB<<std::endl;
|
||||
Indent (MyOffset);
|
||||
cout <<"IndexItemOnFirst :"<<itemA<<endl;
|
||||
std::cout <<"IndexItemOnFirst :"<<itemA<<std::endl;
|
||||
Indent (MyOffset);
|
||||
cout <<"IndexItemOnSecond :"<<itemB<<endl;
|
||||
std::cout <<"IndexItemOnSecond :"<<itemB<<std::endl;
|
||||
Indent (MyOffset);
|
||||
cout <<"ParameterOnFirst :"<<parameterOnA<<endl;
|
||||
std::cout <<"ParameterOnFirst :"<<parameterOnA<<std::endl;
|
||||
Indent (MyOffset);
|
||||
cout <<"ParameterOnSecond :"<<parameterOnB<<endl;
|
||||
std::cout <<"ParameterOnSecond :"<<parameterOnB<<std::endl;
|
||||
Indent (MyOffset);
|
||||
cout <<"PointOnFirst :"<<endl;
|
||||
cout <<" X = "<<pointA.X()<<endl;
|
||||
cout <<" Y = "<<pointA.Y()<<endl;
|
||||
std::cout <<"PointOnFirst :"<<std::endl;
|
||||
std::cout <<" X = "<<pointA.X()<<std::endl;
|
||||
std::cout <<" Y = "<<pointA.Y()<<std::endl;
|
||||
Indent (MyOffset);
|
||||
cout <<"PointOnSecond :"<<endl;
|
||||
cout <<" X = "<<pointB.X()<<endl;
|
||||
cout <<" Y = "<<pointB.Y()<<endl;
|
||||
std::cout <<"PointOnSecond :"<<std::endl;
|
||||
std::cout <<" X = "<<pointB.X()<<std::endl;
|
||||
std::cout <<" Y = "<<pointB.Y()<<std::endl;
|
||||
Indent (MyOffset);
|
||||
cout <<"Distance :"<<distance<<endl;
|
||||
std::cout <<"Distance :"<<distance<<std::endl;
|
||||
}
|
||||
|
@@ -253,7 +253,7 @@ void MAT2d_Mat2d::CreateMatOpen(MAT2d_Tool2d& atool)
|
||||
#ifdef OCCT_DEBUG_Mat
|
||||
atool.Dump(bisectormap(i)->BisectorNumber(),1);
|
||||
#ifdef ICONTINUE
|
||||
cin>>Icontinue;
|
||||
std::cin>>Icontinue;
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
@@ -430,7 +430,7 @@ void MAT2d_Mat2d::CreateMatOpen(MAT2d_Tool2d& atool)
|
||||
//-------------------------------------------
|
||||
|
||||
#ifdef ICONTINUE
|
||||
cin>>Icontinue;
|
||||
std::cin>>Icontinue;
|
||||
#endif
|
||||
} //--------------
|
||||
// Fin Boucle 2.
|
||||
@@ -525,14 +525,14 @@ void MAT2d_Mat2d::CreateMatOpen(MAT2d_Tool2d& atool)
|
||||
//-----------------------------------------------------------------
|
||||
|
||||
#ifdef OCCT_DEBUG_Mat
|
||||
cout <<" Test sur les parametres pour elimination"<<endl;
|
||||
cout << " Edge number :"<<theedgelist->Current()->EdgeNumber()<<endl;
|
||||
std::cout <<" Test sur les parametres pour elimination"<<std::endl;
|
||||
std::cout << " Edge number :"<<theedgelist->Current()->EdgeNumber()<<std::endl;
|
||||
#endif
|
||||
|
||||
if(paramb[0] > 0 && parama[1] > 0) {
|
||||
|
||||
#ifdef OCCT_DEBUG_Mat
|
||||
cout <<" A ELIMINER "<<endl;
|
||||
std::cout <<" A ELIMINER "<<std::endl;
|
||||
#endif
|
||||
if(narea < 0) {
|
||||
firstarea(++narea) = theedgelist->Index();
|
||||
@@ -628,7 +628,7 @@ void MAT2d_Mat2d::CreateMatOpen(MAT2d_Tool2d& atool)
|
||||
shift++;
|
||||
|
||||
#ifdef OCCT_DEBUG_Mat
|
||||
cout<<" Suppression de l'arete : "<<edgetoremove->EdgeNumber()<<endl;
|
||||
std::cout<<" Suppression de l'arete : "<<edgetoremove->EdgeNumber()<<std::endl;
|
||||
#endif
|
||||
|
||||
if(all == 0 || j+1 != noofarea(i)) {
|
||||
@@ -915,7 +915,7 @@ void MAT2d_Mat2d::CreateMat(MAT2d_Tool2d& atool)
|
||||
#ifdef OCCT_DEBUG_Mat
|
||||
atool.Dump(bisectormap(i)->BisectorNumber(),1);
|
||||
#ifdef ICONTINUE
|
||||
cin>>Icontinue;
|
||||
std::cin>>Icontinue;
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
@@ -1131,7 +1131,7 @@ void MAT2d_Mat2d::CreateMat(MAT2d_Tool2d& atool)
|
||||
//-------------------------------------------
|
||||
|
||||
#ifdef ICONTINUE
|
||||
cin>>Icontinue;
|
||||
std::cin>>Icontinue;
|
||||
#endif
|
||||
} //--------------
|
||||
// Fin Boucle 2.
|
||||
@@ -1225,14 +1225,14 @@ void MAT2d_Mat2d::CreateMat(MAT2d_Tool2d& atool)
|
||||
//-----------------------------------------------------------------
|
||||
|
||||
#ifdef OCCT_DEBUG_Mat
|
||||
cout <<" Test sur les parametres pour elimination"<<endl;
|
||||
cout << " Edge number :"<<theedgelist->Current()->EdgeNumber()<<endl;
|
||||
std::cout <<" Test sur les parametres pour elimination"<<std::endl;
|
||||
std::cout << " Edge number :"<<theedgelist->Current()->EdgeNumber()<<std::endl;
|
||||
#endif
|
||||
|
||||
if(paramb[0] > 0 && parama[1] > 0) {
|
||||
|
||||
#ifdef OCCT_DEBUG_Mat
|
||||
cout <<" A ELIMINER "<<endl;
|
||||
std::cout <<" A ELIMINER "<<std::endl;
|
||||
#endif
|
||||
if(narea < 0) {
|
||||
firstarea(++narea) = theedgelist->Index();
|
||||
@@ -1334,7 +1334,7 @@ void MAT2d_Mat2d::CreateMat(MAT2d_Tool2d& atool)
|
||||
shift++;
|
||||
|
||||
#ifdef OCCT_DEBUG_Mat
|
||||
cout<<" Suppression de l'arete : "<<edgetoremove->EdgeNumber()<<endl;
|
||||
std::cout<<" Suppression de l'arete : "<<edgetoremove->EdgeNumber()<<std::endl;
|
||||
#endif
|
||||
|
||||
if(all == 0 || j+1 != noofarea(i)) {
|
||||
@@ -1532,9 +1532,9 @@ void MAT2d_Mat2d::LoadBisectorsToRemove
|
||||
|
||||
if(found != -1) {
|
||||
#ifdef OCCT_DEBUG_Mat
|
||||
cout<<" first last bisector to remove :"<<
|
||||
std::cout<<" first last bisector to remove :"<<
|
||||
firstbisectortoremove[index]->BisectorNumber()<<" "<<
|
||||
lastbisectortoremove[index]->BisectorNumber()<<endl;
|
||||
lastbisectortoremove[index]->BisectorNumber()<<std::endl;
|
||||
#endif
|
||||
bisectoronetoremove.Bind(found,firstbisectortoremove[index]);
|
||||
bisectortwotoremove.Bind(found,lastbisectortoremove[index]);
|
||||
|
@@ -14,7 +14,7 @@
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
#define Debug(expr) cout<<" MAT2d_Tool2d.cxx : expr :"<<expr<<endl;
|
||||
#define Debug(expr) std::cout<<" MAT2d_Tool2d.cxx : expr :"<<expr<<std::endl;
|
||||
//#define OCCT_DEBUG
|
||||
//#define DRAW
|
||||
#ifdef DRAW
|
||||
@@ -339,18 +339,18 @@ void MAT2d_Tool2d::CreateBisector(const Handle(MAT_Bisector)& abisector)
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean Affich = Standard_False;
|
||||
if (Affich) {
|
||||
cout<<endl;
|
||||
cout<<"BISECTOR number : "<<theNumberOfBisectors+1<<endl;
|
||||
cout<<" Item 1 : "<<endl;
|
||||
cout<<edge1number<<endl;
|
||||
cout<<endl;
|
||||
std::cout<<std::endl;
|
||||
std::cout<<"BISECTOR number : "<<theNumberOfBisectors+1<<std::endl;
|
||||
std::cout<<" Item 1 : "<<std::endl;
|
||||
std::cout<<edge1number<<std::endl;
|
||||
std::cout<<std::endl;
|
||||
// elt1->Dump(1,1);
|
||||
cout<<endl;
|
||||
cout<<" Item 2 : "<<endl;
|
||||
cout<<edge2number<<endl;
|
||||
cout<<endl;
|
||||
std::cout<<std::endl;
|
||||
std::cout<<" Item 2 : "<<std::endl;
|
||||
std::cout<<edge2number<<std::endl;
|
||||
std::cout<<std::endl;
|
||||
// elt2->Dump(1,1);
|
||||
cout<<endl;
|
||||
std::cout<<std::endl;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -500,7 +500,7 @@ Standard_Boolean MAT2d_Tool2d::TrimBisector
|
||||
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean Affich = Standard_False;
|
||||
if (Affich) cout<<"TRIM de "<<abisector->BisectorNumber()<<endl;
|
||||
if (Affich) std::cout<<"TRIM de "<<abisector->BisectorNumber()<<std::endl;
|
||||
#endif
|
||||
|
||||
Handle(Geom2d_TrimmedCurve) bisector =
|
||||
@@ -717,7 +717,7 @@ Standard_Boolean MAT2d_Tool2d::IsSameDistance (
|
||||
#ifdef OCCT_DEBUG
|
||||
if (AffichDist)
|
||||
for (Standard_Integer j = 1; j <= 4;j++){
|
||||
cout <<"Distance number : "<<j<<" is :"<< Dist(j)<<endl;
|
||||
std::cout <<"Distance number : "<<j<<" is :"<< Dist(j)<<std::endl;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -806,21 +806,21 @@ Standard_Real MAT2d_Tool2d::IntersectBisector (
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean Affich = Standard_False;
|
||||
if (Affich) {
|
||||
cout<<endl;
|
||||
cout<<"INTERSECTION de "<<BisectorOne->BisectorNumber()<<
|
||||
" et de "<<BisectorTwo->BisectorNumber()<<endl;
|
||||
cout<<" Bisector 1 : "<<endl;
|
||||
std::cout<<std::endl;
|
||||
std::cout<<"INTERSECTION de "<<BisectorOne->BisectorNumber()<<
|
||||
" et de "<<BisectorTwo->BisectorNumber()<<std::endl;
|
||||
std::cout<<" Bisector 1 : "<<std::endl;
|
||||
// (Bisector1->BasisCurve())->Dump(-1,1);
|
||||
cout<<endl;
|
||||
std::cout<<std::endl;
|
||||
Debug(Domain1.FirstParameter());
|
||||
Debug(Domain1.LastParameter());
|
||||
cout<<"-----------------"<<endl;
|
||||
cout<<" Bisector 2 : "<<endl;
|
||||
std::cout<<"-----------------"<<std::endl;
|
||||
std::cout<<" Bisector 2 : "<<std::endl;
|
||||
// (Bisector2->BasisCurve())->Dump(-1,1);
|
||||
cout<<endl;
|
||||
std::cout<<std::endl;
|
||||
Debug(Domain2.FirstParameter());
|
||||
Debug(Domain2.LastParameter());
|
||||
cout<<"-----------------"<<endl;
|
||||
std::cout<<"-----------------"<<std::endl;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -1034,10 +1034,10 @@ Standard_Real MAT2d_Tool2d::IntersectBisector (
|
||||
|
||||
#ifdef OCCT_DEBUG
|
||||
if (Affich) {
|
||||
cout<<" coordonnees : "<<GeomPnt (IntPnt).X()<<" "
|
||||
<<GeomPnt (IntPnt).Y()<<endl;
|
||||
cout<<" parametres : "<<Param1<<" "<<Param2<<endl;
|
||||
cout<<" distancemini : "<<DistanceMini<<endl;
|
||||
std::cout<<" coordonnees : "<<GeomPnt (IntPnt).X()<<" "
|
||||
<<GeomPnt (IntPnt).Y()<<std::endl;
|
||||
std::cout<<" parametres : "<<Param1<<" "<<Param2<<std::endl;
|
||||
std::cout<<" distancemini : "<<DistanceMini<<std::endl;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user