OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00
Code Activity

0028838: Configuration - undefine macros coming from X11 headers in place of collision

Browse Source 
The macros Status, Convex, Opposite, FillSolid (coming from X11 headers)
are now undefined in place of definition of methods with same name in OCCT headers.
The usage of variables with name Status is now avoided.

GL_GLEXT_LEGACY is now defined only if not already defined.

The macros AddPrinter (coming from WinAPI headers) is now undefined
within Message_Messenger class definition having method with the same name.
CurrentDirectory macro is now undefined in OSD_Process.hxx.
This commit is contained in:
kgv
2017-02-03 23:27:02 +04:00
committed by bugmaster
parent e3d02d1f84
commit 9fd2d2c382
103 changed files with 598 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/GeomConvert/GeomConvert.cxx
View File

@@ -539,7 +539,7 @@ static Handle(Geom_BSplineCurve) MultNumandDenom(const Handle(Geom2d_BSplineCurv
Standard_Real tolerance=Precision::PConfusion();
Standard_Integer resNbPoles,degree,
ii,jj,
Status;
aStatus;
BS->Knots(BSKnots); //storage of the two BSpline
BS->Multiplicities(BSMults); //features
@@ -580,7 +580,7 @@ static Handle(Geom_BSplineCurve) MultNumandDenom(const Handle(Geom2d_BSplineCurv
resFlatKnots,
degree,
resNumPoles,
Status);
aStatus);
BSplCLib::FunctionMultiply(ev,
BS->Degree(),
@@ -589,7 +589,7 @@ static Handle(Geom_BSplineCurve) MultNumandDenom(const Handle(Geom2d_BSplineCurv
resFlatKnots,
degree,
resDenPoles,
Status);
aStatus);
for (ii=1;ii<=resNbPoles;ii++)
for(jj=1;jj<=3;jj++)
resPoles(ii).SetCoord(jj,resNumPoles(ii).Coord(jj)/resDenPoles(ii));
@@ -903,7 +903,7 @@ private:
BSplCLib::KnotSequence(KnotC1,KnotC1Mults,FlatKnots);
TColgp_Array1OfPnt NewPoles(1,FlatKnots.Length()-(2*Curve1->Degree()+1));
Standard_Integer Status;
Standard_Integer aStatus;
TColStd_Array1OfReal Curve1Weights(1,Curve1->NbPoles());
Curve1->Weights(Curve1Weights);
for (ii=1;ii<=Curve1->NbPoles();ii++)
@@ -919,7 +919,7 @@ private:
FlatKnots,
2*Curve1->Degree(),
NewPoles,
Status
aStatus
);
TColStd_Array1OfReal NewWeights(1,FlatKnots.Length()-(2*Curve1->Degree()+1));
// BSplCLib::FunctionReparameterise(reparameterise_evaluator,
@@ -930,7 +930,7 @@ private:
FlatKnots,
2*Curve1->Degree(),
NewWeights,
Status
aStatus
);
for (ii=1;ii<=NewPoles.Length();ii++)
for (jj=1;jj<=3;jj++)
@@ -1138,7 +1138,7 @@ void GeomConvert::ConcatC1(TColGeom_Array1OfBSplineCurve& ArrayOfCurv
BSplCLib::KnotSequence(KnotC1,KnotC1Mults,FlatKnots);
TColgp_Array1OfPnt NewPoles(1,FlatKnots.Length()-(2*Curve1->Degree()+1));
Standard_Integer Status;
Standard_Integer aStatus;
TColStd_Array1OfReal Curve1Weights(1,Curve1->NbPoles());
Curve1->Weights(Curve1Weights);
for (ii=1;ii<=Curve1->NbPoles();ii++)
@@ -1154,7 +1154,7 @@ void GeomConvert::ConcatC1(TColGeom_Array1OfBSplineCurve& ArrayOfCurv
FlatKnots,
2*Curve1->Degree(),
NewPoles,
Status
aStatus
);
TColStd_Array1OfReal NewWeights(1,FlatKnots.Length()-(2*Curve1->Degree()+1));
@@ -1165,7 +1165,7 @@ void GeomConvert::ConcatC1(TColGeom_Array1OfBSplineCurve& ArrayOfCurv
FlatKnots,
2*Curve1->Degree(),
NewWeights,
Status
aStatus
);
for (ii=1;ii<=NewPoles.Length();ii++)
for (jj=1;jj<=3;jj++)