1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-24 13:50:49 +03:00

0032402: Coding Rules - eliminate msvc warning C4668 (symbol is not defined as a preprocessor macro, replacing with '0' for directive)

Make preprocessor expressions consistent with respect to guard expressions.

Fixed usage of macros __QNX__, IRIX, OCCT_DEBUG, DO_INVERSE, DRAW, CHFI3D_DEB by value.
Removed obsolete hack for Sun Workshop 5.0 compiler.
This commit is contained in:
zaphod
2021-05-30 12:27:19 +02:00
committed by bugmaster
parent d5477f8c82
commit ff1f0c9ae2
29 changed files with 102 additions and 111 deletions

View File

@@ -285,7 +285,7 @@ static Standard_Boolean GoodOrientation(const Bnd_Box& B,
TopExp::Vertices(myWire, Vf, Vl);
if (Vf.IsSame(Vl)) myWire.Closed(Standard_True);
}
#if DRAW
#ifdef DRAW
if (Affich) {
DBRep::Set("TheWire", myWire);
}
@@ -425,7 +425,7 @@ static Standard_Boolean GoodOrientation(const Bnd_Box& B,
Handle(Geom_Plane) Plan = new (Geom_Plane)(Pt, myDir);
Surf = new (Geom_RectangularTrimmedSurface) (Plan,-L, L, -L, L);
#if DRAW
#ifdef DRAW
if (Affich) {
char* Temp = "ThePlan" ;
DrawTrSurf::Set(Temp, Surf);
@@ -486,7 +486,7 @@ static Standard_Boolean GoodOrientation(const Bnd_Box& B,
Handle(Geom_Curve) TC = new (Geom_TrimmedCurve) (L, 0, Length);
#if DRAW
#ifdef DRAW
if (Affich > 2) {
TC = new (Geom_Circle) (gp::XOY(), Length);
}

View File

@@ -300,7 +300,7 @@ void BRepFill_Pipe::Perform(const TopoDS_Wire& Spine,
RemLoc.Remove(myLast);
myLast = RemLoc.GetResult();
#if DRAW
#ifdef DRAW
if (Affich) {
DBRep::Set("theprof", TheProf);
DBRep::Set("thefirst", myFirst);

View File

@@ -732,7 +732,7 @@ void BRepFill_PipeShell::SetForceApproxC1(const Standard_Boolean ForceApproxC1)
}
// eap 5 Jun 2002 occ332, end modif
}
#if DRAW
#ifdef DRAW
if (Affich) {
DBRep::Set("PipeFirst", myFirst);
DBRep::Set("PipeLast", myLast);

View File

@@ -625,7 +625,7 @@ static void BuildFace(const Handle(Geom_Surface)& S,
}
WW = B.Wire();
#if DRAW
#ifdef DRAW
if (Affich)
DBRep::Set("wire-on-face", WW);
#endif
@@ -853,7 +853,7 @@ static Standard_Boolean Filling(const TopoDS_Shape& EF,
WithE4 = Standard_True;
}
#if DRAW
#ifdef DRAW
if (Affich) {
DBRep::Set("Fill_Edge1", E1);
DBRep::Set("Fill_Edge2", E2);
@@ -939,7 +939,7 @@ static Standard_Boolean Filling(const TopoDS_Shape& EF,
*/
}
#if DRAW
#ifdef DRAW
if (Affich) {
char* Temp = "Surf_Init" ;
DrawTrSurf::Set(Temp, Surf);
@@ -1258,7 +1258,7 @@ static Standard_Boolean Filling(const TopoDS_Shape& EF,
if (ToReverseResult)
Result.Reverse();
#if DRAW
#ifdef DRAW
if (Affich) DBRep::Set("BoucheTrou", Result);
#endif
@@ -2064,7 +2064,7 @@ BRepFill_Sweep::BRepFill_Sweep(const Handle(BRepFill_SectionLaw)& Section,
return Standard_False;
}
E = MkE.Edge();
#if DRAW
#ifdef DRAW
if (Affich) {
sprintf(name,"Surf_%d", ipath);
char* Temp = name;