OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/BRepFeat/BRepFeat_MakeCylindricalHole.hxx
View File

@ -22,16 +22,14 @@
#include <Standard_Handle.hxx>
#include <gp_Ax1.hxx>
#include <Standard_Boolean.hxx>
#include <BRepFeat_Status.hxx>
#include <TopoDS_Face.hxx>
#include <BRepFeat_Builder.hxx>
#include <Standard_Real.hxx>
class StdFail_NotDone;
class Standard_ConstructionError;
class gp_Ax1;
class TopoDS_Shape;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! Provides a tool to make cylindrical holes on a shape.
class BRepFeat_MakeCylindricalHole : public BRepFeat_Builder

4
src/BRepFilletAPI/BRepFilletAPI_MakeFillet2d.hxx
View File

@ -34,6 +34,10 @@ class TopoDS_Edge;
class TopoDS_Vertex;
class TopoDS_Shape;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! Describes functions to build fillets and chamfers on the
//! vertices of a planar face.

19
src/BRepOffset/BRepOffset.cxx
View File

@ -39,11 +39,11 @@
//=======================================================================
Handle(Geom_Surface) BRepOffset::Surface(const Handle(Geom_Surface)& Surface,
const Standard_Real Offset,
BRepOffset_Status& Status)
BRepOffset_Status& theStatus)
{
Standard_Real Tol = Precision::Confusion();
Status = BRepOffset_Good;
theStatus = BRepOffset_Good;
Handle(Geom_Surface) Result;
Handle(Standard_Type) TheType = Surface->DynamicType();
@ -70,10 +70,10 @@ Handle(Geom_Surface) BRepOffset::Surface(const Handle(Geom_Surface)& Surface,
else if ( Radius <= -Tol ){
Axis.Rotate(gp_Ax1(Axis.Location(),Axis.Direction()),M_PI);
Result = new Geom_CylindricalSurface( Axis, Abs(Radius));
Status = BRepOffset_Reversed;
theStatus = BRepOffset_Reversed;
}
else {
Status = BRepOffset_Degenerated;
theStatus = BRepOffset_Degenerated;
}
}
else if (TheType == STANDARD_TYPE(Geom_ConicalSurface)) {
@ -113,10 +113,10 @@ Handle(Geom_Surface) BRepOffset::Surface(const Handle(Geom_Surface)& Surface,
Axis.Rotate(gp_Ax1(Axis.Location(),Axis.Direction()),M_PI);
Axis.ZReverse();
Result = new Geom_SphericalSurface(Axis, -Radius);
Status = BRepOffset_Reversed;
theStatus = BRepOffset_Reversed;
}
else {
Status = BRepOffset_Degenerated;
theStatus = BRepOffset_Degenerated;
}
}
else if (TheType == STANDARD_TYPE(Geom_ToroidalSurface)) {
@ -134,10 +134,10 @@ Handle(Geom_Surface) BRepOffset::Surface(const Handle(Geom_Surface)& Surface,
Result = new Geom_ToroidalSurface(Axis,MajorRadius,MinorRadius);
}
else if (MinorRadius <= -Tol) {
Status = BRepOffset_Reversed;
theStatus = BRepOffset_Reversed;
}
else {
Status = BRepOffset_Degenerated;
theStatus = BRepOffset_Degenerated;
}
}
}
@ -152,8 +152,7 @@ Handle(Geom_Surface) BRepOffset::Surface(const Handle(Geom_Surface)& Surface,
Handle(Geom_RectangularTrimmedSurface)::DownCast(Surface);
Standard_Real U1,U2,V1,V2;
S->Bounds(U1,U2,V1,V2);
Handle(Geom_Surface) Off =
BRepOffset::Surface(S->BasisSurface(),Offset,Status);
Handle(Geom_Surface) Off = BRepOffset::Surface (S->BasisSurface(), Offset, theStatus);
Result = new Geom_RectangularTrimmedSurface (Off,U1,U2,V1,V2);
}
else if (TheType == STANDARD_TYPE(Geom_OffsetSurface)) {

2
src/BRepOffset/BRepOffset.hxx
View File

@ -50,7 +50,7 @@ public:
//!
//! If no particular case is detected, the returned
//! surface will have the Type Geom_OffsetSurface.
Standard_EXPORT static Handle(Geom_Surface) Surface (const Handle(Geom_Surface)& Surface, const Standard_Real Offset, BRepOffset_Status& Status);
Standard_EXPORT static Handle(Geom_Surface) Surface (const Handle(Geom_Surface)& Surface, const Standard_Real Offset, BRepOffset_Status& theStatus);

9
src/BRepOffset/BRepOffset_Offset.hxx
View File

@ -21,20 +21,19 @@
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <TopoDS_Shape.hxx>
#include <BRepOffset_Status.hxx>
#include <TopoDS_Face.hxx>
#include <TopTools_DataMapOfShapeShape.hxx>
#include <Standard_Real.hxx>
#include <Standard_Boolean.hxx>
#include <GeomAbs_JoinType.hxx>
#include <GeomAbs_Shape.hxx>
#include <TopTools_ListOfShape.hxx>
class TopoDS_Face;
class TopoDS_Edge;
class TopoDS_Vertex;
class TopoDS_Shape;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! This class compute elemenary offset surface.
//! Evaluate the offset generated :

8
src/BRepOffsetAPI/BRepOffsetAPI_DraftAngle.hxx
View File

@ -29,15 +29,15 @@
#include <Draft_ErrorStatus.hxx>
#include <BRepTools_ReShape.hxx>
class StdFail_NotDone;
class Standard_NullObject;
class Standard_NoSuchObject;
class Standard_ConstructionError;
class TopoDS_Shape;
class TopoDS_Face;
class gp_Dir;
class gp_Pln;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! Taper-adding transformations on a shape.
//! The resulting shape is constructed by defining one face

13
src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx
View File

@ -172,29 +172,24 @@ void BRepOffsetAPI_MakePipeShell::Delete( const TopoDS_Shape& Profile)
//=======================================================================
BRepBuilderAPI_PipeError BRepOffsetAPI_MakePipeShell::GetStatus() const
{
BRepBuilderAPI_PipeError Status;
GeomFill_PipeError stat;
stat = myPipe->GetStatus();
switch (stat) {
case GeomFill_PipeOk :
{
Status = BRepBuilderAPI_PipeDone;
break;
return BRepBuilderAPI_PipeDone;
}
case GeomFill_PlaneNotIntersectGuide :
{
Status = BRepBuilderAPI_PlaneNotIntersectGuide;
break;
return BRepBuilderAPI_PlaneNotIntersectGuide;
}
case GeomFill_ImpossibleContact :
{
Status = BRepBuilderAPI_ImpossibleContact;
break;
return BRepBuilderAPI_ImpossibleContact;
}
default :
Status = BRepBuilderAPI_PipeNotDone;
return BRepBuilderAPI_PipeNotDone;
}
return Status;
}
//=======================================================================

4
src/BRepTools/BRepTools_ReShape.hxx
View File

@ -29,6 +29,10 @@
class TopoDS_Shape;
class TopoDS_Vertex;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class BRepTools_ReShape;
DEFINE_STANDARD_HANDLE(BRepTools_ReShape, MMgt_TShared)

36
src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.cxx
View File

@ -423,7 +423,7 @@ TopAbs_State BRepTopAdaptor_FClass2d::Perform(const gp_Pnt2d& _Puv,
const Standard_Boolean IsVPer = surf->IsVPeriodic();
const Standard_Real uperiod = IsUPer ? surf->UPeriod() : 0.0;
const Standard_Real vperiod = IsVPer ? surf->VPeriod() : 0.0;
TopAbs_State Status = TopAbs_UNKNOWN;
TopAbs_State aStatus = TopAbs_UNKNOWN;
Standard_Boolean urecadre = Standard_False, vrecadre = Standard_False;
if (RecadreOnPeriodic)
@ -484,25 +484,25 @@ TopAbs_State BRepTopAdaptor_FClass2d::Perform(const gp_Pnt2d& _Puv,
Standard_Real m_Toluv = (Toluv > 4.0) ? 4.0 : Toluv;
//aClassifier.Perform(Face,Puv,Toluv);
aClassifier.Perform(Face,Puv,m_Toluv);
Status = aClassifier.State();
aStatus = aClassifier.State();
}
if(dedans == 1) {
Status = TopAbs_IN;
aStatus = TopAbs_IN;
}
if(dedans == -1) {
Status = TopAbs_OUT;
aStatus = TopAbs_OUT;
}
}
else { //-- TabOrien(1)=-1 False Wire
BRepClass_FaceClassifier aClassifier;
aClassifier.Perform(Face,Puv,Toluv);
Status = aClassifier.State();
aStatus = aClassifier.State();
}
if (!RecadreOnPeriodic || (!IsUPer && !IsVPer))
return Status;
if (Status == TopAbs_IN || Status == TopAbs_ON)
return Status;
return aStatus;
if (aStatus == TopAbs_IN || aStatus == TopAbs_ON)
return aStatus;
if (!urecadre)
{
@ -526,7 +526,7 @@ TopAbs_State BRepTopAdaptor_FClass2d::Perform(const gp_Pnt2d& _Puv,
u = uu;
if (v > Vmax || !IsVPer)
return Status;
return aStatus;
}
} //for (;;)
}
@ -557,7 +557,7 @@ TopAbs_State BRepTopAdaptor_FClass2d::TestOnRestriction(const gp_Pnt2d& _Puv,
const Standard_Boolean IsVPer = surf->IsVPeriodic();
const Standard_Real uperiod = IsUPer ? surf->UPeriod() : 0.0;
const Standard_Real vperiod = IsVPer ? surf->VPeriod() : 0.0;
TopAbs_State Status = TopAbs_UNKNOWN;
TopAbs_State aStatus = TopAbs_UNKNOWN;
Standard_Boolean urecadre = Standard_False, vrecadre = Standard_False;
if (RecadreOnPeriodic)
@ -614,25 +614,25 @@ TopAbs_State BRepTopAdaptor_FClass2d::TestOnRestriction(const gp_Pnt2d& _Puv,
}
}
if(dedans==0) {
Status = TopAbs_ON;
aStatus = TopAbs_ON;
}
if(dedans == 1) {
Status = TopAbs_IN;
aStatus = TopAbs_IN;
}
if(dedans == -1) {
Status = TopAbs_OUT;
aStatus = TopAbs_OUT;
}
}
else { //-- TabOrien(1)=-1 False Wire
BRepClass_FaceClassifier aClassifier;
aClassifier.Perform(Face,Puv,Tol);
Status = aClassifier.State();
aStatus = aClassifier.State();
}
if (!RecadreOnPeriodic || (!IsUPer && !IsVPer))
return Status;
if (Status == TopAbs_IN || Status == TopAbs_ON)
return Status;
return aStatus;
if (aStatus == TopAbs_IN || aStatus == TopAbs_ON)
return aStatus;
if (!urecadre)
{
@ -656,7 +656,7 @@ TopAbs_State BRepTopAdaptor_FClass2d::TestOnRestriction(const gp_Pnt2d& _Puv,
u = uu;
if (v > Vmax || !IsVPer)
return Status;
return aStatus;
}
} //for (;;)
}

32
src/BSplCLib/BSplCLib.hxx
View File

@ -831,11 +831,11 @@ public:
//! 1. and 2. above are satisfied : no check whatsoever
//! is made in this method
//!
//! Status will return 0 if OK else it will return the pivot index
//! theStatus will return 0 if OK else it will return the pivot index
//! of the matrix that was inverted to compute the multiplied
//! BSpline : the method used is interpolation at Schoenenberg
//! points of F(a(t))
Standard_EXPORT static void FunctionReparameterise (const BSplCLib_EvaluatorFunction& Function, const Standard_Integer BSplineDegree, const TColStd_Array1OfReal& BSplineFlatKnots, const Standard_Integer PolesDimension, Standard_Real& Poles, const TColStd_Array1OfReal& FlatKnots, const Standard_Integer NewDegree, Standard_Real& NewPoles, Standard_Integer& Status);
Standard_EXPORT static void FunctionReparameterise (const BSplCLib_EvaluatorFunction& Function, const Standard_Integer BSplineDegree, const TColStd_Array1OfReal& BSplineFlatKnots, const Standard_Integer PolesDimension, Standard_Real& Poles, const TColStd_Array1OfReal& FlatKnots, const Standard_Integer NewDegree, Standard_Real& NewPoles, Standard_Integer& theStatus);
//! This function will compose a given Vectorial BSpline F(t)
//! defined by its BSplineDegree and BSplineFlatKnotsl,
@ -858,11 +858,11 @@ public:
//! 1. and 2. above are satisfied : no check whatsoever
//! is made in this method
//!
//! Status will return 0 if OK else it will return the pivot index
//! theStatus will return 0 if OK else it will return the pivot index
//! of the matrix that was inverted to compute the multiplied
//! BSpline : the method used is interpolation at Schoenenberg
//! points of F(a(t))
Standard_EXPORT static void FunctionReparameterise (const BSplCLib_EvaluatorFunction& Function, const Standard_Integer BSplineDegree, const TColStd_Array1OfReal& BSplineFlatKnots, const TColStd_Array1OfReal& Poles, const TColStd_Array1OfReal& FlatKnots, const Standard_Integer NewDegree, TColStd_Array1OfReal& NewPoles, Standard_Integer& Status);
Standard_EXPORT static void FunctionReparameterise (const BSplCLib_EvaluatorFunction& Function, const Standard_Integer BSplineDegree, const TColStd_Array1OfReal& BSplineFlatKnots, const TColStd_Array1OfReal& Poles, const TColStd_Array1OfReal& FlatKnots, const Standard_Integer NewDegree, TColStd_Array1OfReal& NewPoles, Standard_Integer& theStatus);
//! this will compose a given Vectorial BSpline F(t)
//! defined by its BSplineDegree and BSplineFlatKnotsl,
@ -880,11 +880,11 @@ public:
//! the caller's responsability to insure that conditions
//! 1. and 2. above are satisfied : no check whatsoever
//! is made in this method
//! Status will return 0 if OK else it will return the pivot index
//! theStatus will return 0 if OK else it will return the pivot index
//! of the matrix that was inverted to compute the multiplied
//! BSpline : the method used is interpolation at Schoenenberg
//! points of F(a(t))
Standard_EXPORT static void FunctionReparameterise (const BSplCLib_EvaluatorFunction& Function, const Standard_Integer BSplineDegree, const TColStd_Array1OfReal& BSplineFlatKnots, const TColgp_Array1OfPnt& Poles, const TColStd_Array1OfReal& FlatKnots, const Standard_Integer NewDegree, TColgp_Array1OfPnt& NewPoles, Standard_Integer& Status);
Standard_EXPORT static void FunctionReparameterise (const BSplCLib_EvaluatorFunction& Function, const Standard_Integer BSplineDegree, const TColStd_Array1OfReal& BSplineFlatKnots, const TColgp_Array1OfPnt& Poles, const TColStd_Array1OfReal& FlatKnots, const Standard_Integer NewDegree, TColgp_Array1OfPnt& NewPoles, Standard_Integer& theStatus);
//! this will compose a given Vectorial BSpline F(t)
//! defined by its BSplineDegree and BSplineFlatKnotsl,
@ -902,11 +902,11 @@ public:
//! the caller's responsability to insure that conditions
//! 1. and 2. above are satisfied : no check whatsoever
//! is made in this method
//! Status will return 0 if OK else it will return the pivot index
//! theStatus will return 0 if OK else it will return the pivot index
//! of the matrix that was inverted to compute the multiplied
//! BSpline : the method used is interpolation at Schoenenberg
//! points of F(a(t))
Standard_EXPORT static void FunctionReparameterise (const BSplCLib_EvaluatorFunction& Function, const Standard_Integer BSplineDegree, const TColStd_Array1OfReal& BSplineFlatKnots, const TColgp_Array1OfPnt2d& Poles, const TColStd_Array1OfReal& FlatKnots, const Standard_Integer NewDegree, TColgp_Array1OfPnt2d& NewPoles, Standard_Integer& Status);
Standard_EXPORT static void FunctionReparameterise (const BSplCLib_EvaluatorFunction& Function, const Standard_Integer BSplineDegree, const TColStd_Array1OfReal& BSplineFlatKnots, const TColgp_Array1OfPnt2d& Poles, const TColStd_Array1OfReal& FlatKnots, const Standard_Integer NewDegree, TColgp_Array1OfPnt2d& NewPoles, Standard_Integer& theStatus);
//! this will multiply a given Vectorial BSpline F(t)
//! defined by its BSplineDegree and BSplineFlatKnotsl,
@ -921,11 +921,11 @@ public:
//! the caller's responsability to insure that conditions
//! 1. and 2. above are satisfied : no check whatsoever
//! is made in this method
//! Status will return 0 if OK else it will return the pivot index
//! theStatus will return 0 if OK else it will return the pivot index
//! of the matrix that was inverted to compute the multiplied
//! BSpline : the method used is interpolation at Schoenenberg
//! points of a(t)*F(t)
Standard_EXPORT static void FunctionMultiply (const BSplCLib_EvaluatorFunction& Function, const Standard_Integer BSplineDegree, const TColStd_Array1OfReal& BSplineFlatKnots, const Standard_Integer PolesDimension, Standard_Real& Poles, const TColStd_Array1OfReal& FlatKnots, const Standard_Integer NewDegree, Standard_Real& NewPoles, Standard_Integer& Status);
Standard_EXPORT static void FunctionMultiply (const BSplCLib_EvaluatorFunction& Function, const Standard_Integer BSplineDegree, const TColStd_Array1OfReal& BSplineFlatKnots, const Standard_Integer PolesDimension, Standard_Real& Poles, const TColStd_Array1OfReal& FlatKnots, const Standard_Integer NewDegree, Standard_Real& NewPoles, Standard_Integer& theStatus);
//! this will multiply a given Vectorial BSpline F(t)
//! defined by its BSplineDegree and BSplineFlatKnotsl,
@ -940,11 +940,11 @@ public:
//! the caller's responsability to insure that conditions
//! 1. and 2. above are satisfied : no check whatsoever
//! is made in this method
//! Status will return 0 if OK else it will return the pivot index
//! theStatus will return 0 if OK else it will return the pivot index
//! of the matrix that was inverted to compute the multiplied
//! BSpline : the method used is interpolation at Schoenenberg
//! points of a(t)*F(t)
Standard_EXPORT static void FunctionMultiply (const BSplCLib_EvaluatorFunction& Function, const Standard_Integer BSplineDegree, const TColStd_Array1OfReal& BSplineFlatKnots, const TColStd_Array1OfReal& Poles, const TColStd_Array1OfReal& FlatKnots, const Standard_Integer NewDegree, TColStd_Array1OfReal& NewPoles, Standard_Integer& Status);
Standard_EXPORT static void FunctionMultiply (const BSplCLib_EvaluatorFunction& Function, const Standard_Integer BSplineDegree, const TColStd_Array1OfReal& BSplineFlatKnots, const TColStd_Array1OfReal& Poles, const TColStd_Array1OfReal& FlatKnots, const Standard_Integer NewDegree, TColStd_Array1OfReal& NewPoles, Standard_Integer& theStatus);
//! this will multiply a given Vectorial BSpline F(t)
//! defined by its BSplineDegree and BSplineFlatKnotsl,
@ -959,11 +959,11 @@ public:
//! the caller's responsability to insure that conditions
//! 1. and 2. above are satisfied : no check whatsoever
//! is made in this method
//! Status will return 0 if OK else it will return the pivot index
//! theStatus will return 0 if OK else it will return the pivot index
//! of the matrix that was inverted to compute the multiplied
//! BSpline : the method used is interpolation at Schoenenberg
//! points of a(t)*F(t)
Standard_EXPORT static void FunctionMultiply (const BSplCLib_EvaluatorFunction& Function, const Standard_Integer BSplineDegree, const TColStd_Array1OfReal& BSplineFlatKnots, const TColgp_Array1OfPnt2d& Poles, const TColStd_Array1OfReal& FlatKnots, const Standard_Integer NewDegree, TColgp_Array1OfPnt2d& NewPoles, Standard_Integer& Status);
Standard_EXPORT static void FunctionMultiply (const BSplCLib_EvaluatorFunction& Function, const Standard_Integer BSplineDegree, const TColStd_Array1OfReal& BSplineFlatKnots, const TColgp_Array1OfPnt2d& Poles, const TColStd_Array1OfReal& FlatKnots, const Standard_Integer NewDegree, TColgp_Array1OfPnt2d& NewPoles, Standard_Integer& theStatus);
//! this will multiply a given Vectorial BSpline F(t)
//! defined by its BSplineDegree and BSplineFlatKnotsl,
@ -978,11 +978,11 @@ public:
//! the caller's responsability to insure that conditions
//! 1. and 2. above are satisfied : no check whatsoever
//! is made in this method
//! Status will return 0 if OK else it will return the pivot index
//! theStatus will return 0 if OK else it will return the pivot index
//! of the matrix that was inverted to compute the multiplied
//! BSpline : the method used is interpolation at Schoenenberg
//! points of a(t)*F(t)
Standard_EXPORT static void FunctionMultiply (const BSplCLib_EvaluatorFunction& Function, const Standard_Integer BSplineDegree, const TColStd_Array1OfReal& BSplineFlatKnots, const TColgp_Array1OfPnt& Poles, const TColStd_Array1OfReal& FlatKnots, const Standard_Integer NewDegree, TColgp_Array1OfPnt& NewPoles, Standard_Integer& Status);
Standard_EXPORT static void FunctionMultiply (const BSplCLib_EvaluatorFunction& Function, const Standard_Integer BSplineDegree, const TColStd_Array1OfReal& BSplineFlatKnots, const TColgp_Array1OfPnt& Poles, const TColStd_Array1OfReal& FlatKnots, const Standard_Integer NewDegree, TColgp_Array1OfPnt& NewPoles, Standard_Integer& theStatus);
//! Perform the De Boor algorithm to evaluate a point at
//! parameter <U>, with <Degree> and <Dimension>.

20
src/BSplCLib/BSplCLib_2.cxx
View File

@ -882,7 +882,7 @@ void BSplCLib::FunctionMultiply
const TColStd_Array1OfReal & FlatKnots,
const Standard_Integer NewDegree,
Standard_Real & NewPoles,
Standard_Integer & Status)
Standard_Integer & theStatus)
{
Standard_Integer ii,
jj,
@ -932,7 +932,7 @@ void BSplCLib::FunctionMultiply
result,
error_code);
if (error_code) {
Status = 1 ;
theStatus = 1;
goto FINISH ;
}
@ -957,7 +957,7 @@ void BSplCLib::FunctionMultiply
contact_order_array,
PolesDimension,
array_of_new_poles[0],
Status) ;
theStatus);
for (ii = 0 ; ii < num_new_poles * PolesDimension ; ii++) {
array_of_poles[ii] = array_of_new_poles[ii] ;
@ -981,7 +981,7 @@ void BSplCLib::FunctionReparameterise
const TColStd_Array1OfReal & FlatKnots,
const Standard_Integer NewDegree,
Standard_Real & NewPoles,
Standard_Integer & Status)
Standard_Integer & theStatus)
{
Standard_Integer ii,
// jj,
@ -1022,7 +1022,7 @@ void BSplCLib::FunctionReparameterise
result,
error_code);
if (error_code) {
Status = 1 ;
theStatus = 1;
goto FINISH ;
}
@ -1043,7 +1043,7 @@ void BSplCLib::FunctionReparameterise
contact_order_array,
PolesDimension,
array_of_new_poles[0],
Status) ;
theStatus);
for (ii = 0 ; ii < num_new_poles * PolesDimension ; ii++) {
array_of_poles[ii] = array_of_new_poles[ii] ;
@ -1066,7 +1066,7 @@ void BSplCLib::FunctionMultiply
const TColStd_Array1OfReal & FlatKnots,
const Standard_Integer NewDegree,
TColStd_Array1OfReal & NewPoles,
Standard_Integer & Status)
Standard_Integer & theStatus)
{
Standard_Integer num_bspline_poles =
BSplineFlatKnots.Length() - BSplineDegree - 1 ;
@ -1089,7 +1089,7 @@ void BSplCLib::FunctionMultiply
FlatKnots,
NewDegree,
array_of_new_poles[0],
Status) ;
theStatus);
}
//=======================================================================
@ -1105,7 +1105,7 @@ void BSplCLib::FunctionReparameterise
const TColStd_Array1OfReal & FlatKnots,
const Standard_Integer NewDegree,
TColStd_Array1OfReal & NewPoles,
Standard_Integer & Status)
Standard_Integer & theStatus)
{
Standard_Integer num_bspline_poles =
BSplineFlatKnots.Length() - BSplineDegree - 1 ;
@ -1129,7 +1129,7 @@ void BSplCLib::FunctionReparameterise
FlatKnots,
NewDegree,
array_of_new_poles[0],
Status) ;
theStatus);
}
//=======================================================================

8
src/BSplCLib/BSplCLib_CurveComputation.gxx
View File

@ -1424,7 +1424,7 @@ void BSplCLib::FunctionMultiply
const TColStd_Array1OfReal & FlatKnots,
const Standard_Integer NewDegree,
Array1OfPoints & NewPoles,
Standard_Integer & Status)
Standard_Integer & theStatus)
{
Standard_Integer num_bspline_poles =
BSplineFlatKnots.Length() - BSplineDegree - 1 ;
@ -1447,7 +1447,7 @@ void BSplCLib::FunctionMultiply
FlatKnots,
NewDegree,
array_of_new_poles[0],
Status) ;
theStatus);
}
//=======================================================================
@ -1463,7 +1463,7 @@ void BSplCLib::FunctionReparameterise
const TColStd_Array1OfReal & FlatKnots,
const Standard_Integer NewDegree,
Array1OfPoints & NewPoles,
Standard_Integer & Status)
Standard_Integer & theStatus)
{
Standard_Integer num_bspline_poles =
BSplineFlatKnots.Length() - BSplineDegree - 1 ;
@ -1486,5 +1486,5 @@ void BSplCLib::FunctionReparameterise
FlatKnots,
NewDegree,
array_of_new_poles[0],
Status) ;
theStatus);
}

4
src/BSplSLib/BSplSLib.cxx
View File

@ -3461,7 +3461,7 @@ void BSplSLib::FunctionMultiply
const Standard_Integer VNewDegree,
TColgp_Array2OfPnt& NewNumerator,
TColStd_Array2OfReal& NewDenominator,
Standard_Integer& Status)
Standard_Integer& theStatus)
{
Standard_Integer num_uparameters,
// ii,jj,kk,
@ -3534,7 +3534,7 @@ void BSplSLib::FunctionMultiply
VParameters,
NewNumerator,
NewDenominator,
Status) ;
theStatus);
}
else {
throw Standard_ConstructionError();

6
src/BSplSLib/BSplSLib.hxx
View File

@ -402,17 +402,17 @@ public:
//! ---Warning: it is the caller's responsability to
//! insure that conditions 1. and 2. above are satisfied
//! : no check whatsoever is made in this method --
//! Status will return 0 if OK else it will return the
//! theStatus will return 0 if OK else it will return the
//! pivot index -- of the matrix that was inverted to
//! compute the multiplied -- BSpline : the method used
//! is interpolation at Schoenenberg -- points of
//! a(u,v)* N(u,v) and a(u,v) * D(u,v)
//! Status will return 0 if OK else it will return the pivot index
//! theStatus will return 0 if OK else it will return the pivot index
//! of the matrix that was inverted to compute the multiplied
//! BSpline : the method used is interpolation at Schoenenberg
//! points of a(u,v)*F(u,v)
//! --
Standard_EXPORT static void FunctionMultiply (const BSplSLib_EvaluatorFunction& Function, const Standard_Integer UBSplineDegree, const Standard_Integer VBSplineDegree, const TColStd_Array1OfReal& UBSplineKnots, const TColStd_Array1OfReal& VBSplineKnots, const TColStd_Array1OfInteger* UMults, const TColStd_Array1OfInteger* VMults, const TColgp_Array2OfPnt& Poles, const TColStd_Array2OfReal* Weights, const TColStd_Array1OfReal& UFlatKnots, const TColStd_Array1OfReal& VFlatKnots, const Standard_Integer UNewDegree, const Standard_Integer VNewDegree, TColgp_Array2OfPnt& NewNumerator, TColStd_Array2OfReal& NewDenominator, Standard_Integer& Status);
Standard_EXPORT static void FunctionMultiply (const BSplSLib_EvaluatorFunction& Function, const Standard_Integer UBSplineDegree, const Standard_Integer VBSplineDegree, const TColStd_Array1OfReal& UBSplineKnots, const TColStd_Array1OfReal& VBSplineKnots, const TColStd_Array1OfInteger* UMults, const TColStd_Array1OfInteger* VMults, const TColgp_Array2OfPnt& Poles, const TColStd_Array2OfReal* Weights, const TColStd_Array1OfReal& UFlatKnots, const TColStd_Array1OfReal& VFlatKnots, const Standard_Integer UNewDegree, const Standard_Integer VNewDegree, TColgp_Array2OfPnt& NewNumerator, TColStd_Array2OfReal& NewDenominator, Standard_Integer& theStatus);

4
src/CDM/CDM_Application.cxx
View File

@ -91,11 +91,11 @@ void CDM_Application::BeginOfUpdate (const Handle(CDM_Document)& aDocument)
void CDM_Application::EndOfUpdate
(const Handle(CDM_Document)& aDocument,
const Standard_Boolean Status,
const Standard_Boolean theStatus,
const TCollection_ExtendedString& /*ErrorString*/)
{
TCollection_ExtendedString message;
if (Status)
if (theStatus)
message="Updated:";
else
message="Error during updating:";

2
src/CDM/CDM_Application.hxx
View File

@ -55,7 +55,7 @@ public:
//! this method is called affter the update of a document.
//! By default, writes in MessageDriver().
Standard_EXPORT virtual void EndOfUpdate (const Handle(CDM_Document)& aDocument, const Standard_Boolean Status, const TCollection_ExtendedString& ErrorString);
Standard_EXPORT virtual void EndOfUpdate (const Handle(CDM_Document)& aDocument, const Standard_Boolean theStatus, const TCollection_ExtendedString& ErrorString);
//! writes the string in the application MessagerDriver.
Standard_EXPORT void Write (const Standard_ExtString aString);

50
src/CSLib/CSLib.cxx
View File

@ -50,7 +50,7 @@ void CSLib::Normal (
const gp_Vec& D1U,
const gp_Vec& D1V,
const Standard_Real SinTol,
CSLib_DerivativeStatus& Status,
CSLib_DerivativeStatus& theStatus,
gp_Dir& Normal
) {
@ -61,18 +61,18 @@ gp_Dir& Normal
gp_Vec D1UvD1V = D1U.Crossed(D1V);
if (D1UMag <= gp::Resolution() && D1VMag <= gp::Resolution()) {
Status = D1IsNull;
theStatus = D1IsNull;
}
else if (D1UMag <= gp::Resolution()) Status = D1uIsNull;
else if (D1VMag <= gp::Resolution()) Status = D1vIsNull;
// else if ((D1VMag / D1UMag) <= RealEpsilon()) Status = D1vD1uRatioIsNull;
// else if ((D1UMag / D1VMag) <= RealEpsilon()) Status = D1uD1vRatioIsNull;
else if (D1UMag <= gp::Resolution()) theStatus = D1uIsNull;
else if (D1VMag <= gp::Resolution()) theStatus = D1vIsNull;
// else if ((D1VMag / D1UMag) <= RealEpsilon()) theStatus = D1vD1uRatioIsNull;
// else if ((D1UMag / D1VMag) <= RealEpsilon()) theStatus = D1uD1vRatioIsNull;
else {
Standard_Real Sin2 =
D1UvD1V.SquareMagnitude() / (D1UMag * D1VMag);
if (Sin2 < (SinTol * SinTol)) { Status = D1uIsParallelD1v; }
else { Normal = gp_Dir (D1UvD1V); Status = Done; }
if (Sin2 < (SinTol * SinTol)) { theStatus = D1uIsParallelD1v; }
else { Normal = gp_Dir (D1UvD1V); theStatus = Done; }
}
}
@ -85,7 +85,7 @@ const gp_Vec& D2V,
const gp_Vec& DUV,
const Standard_Real SinTol,
Standard_Boolean& Done,
CSLib_NormalStatus& Status,
CSLib_NormalStatus& theStatus,
gp_Dir& Normal
) {
@ -107,25 +107,25 @@ gp_Dir& Normal
if (LD1Nu <= RealEpsilon() && LD1Nv <= RealEpsilon()) {
Status = D1NIsNull;
theStatus = D1NIsNull;
Done = Standard_False;
}
else if (LD1Nu < RealEpsilon()) {
Status = D1NuIsNull;
theStatus = D1NuIsNull;
Done = Standard_True;
Normal = gp_Dir (D1Nv);
}
else if (LD1Nv < RealEpsilon()) {
Status = D1NvIsNull;
theStatus = D1NvIsNull;
Done = Standard_True;
Normal = gp_Dir (D1Nu);
}
else if ((LD1Nv / LD1Nu) <= RealEpsilon()) {
Status = D1NvNuRatioIsNull;
theStatus = D1NvNuRatioIsNull;
Done = Standard_False;
}
else if ((LD1Nu / LD1Nv) <= RealEpsilon()) {
Status = D1NuNvRatioIsNull;
theStatus = D1NuNvRatioIsNull;
Done = Standard_False;
}
else {
@ -133,12 +133,12 @@ gp_Dir& Normal
Standard_Real Sin2 = D1NCross.SquareMagnitude() / (LD1Nu * LD1Nv);
if (Sin2 < (SinTol * SinTol)) {
Status = D1NuIsParallelD1Nv;
theStatus = D1NuIsParallelD1Nv;
Done = Standard_True;
Normal = gp_Dir (D1Nu);
}
else {
Status = InfinityOfSolutions;
theStatus = InfinityOfSolutions;
Done = Standard_False;
}
}
@ -149,7 +149,7 @@ void CSLib::Normal (
const gp_Vec& D1U,
const gp_Vec& D1V,
const Standard_Real MagTol,
CSLib_NormalStatus& Status,
CSLib_NormalStatus& theStatus,
gp_Dir& Normal
) {
// Function: Calculate the normal from tangents by u and by v.
@ -161,7 +161,7 @@ gp_Dir& Normal
if (NMag <= MagTol || D1UMag <= MagTol || D1VMag <= MagTol ) {
Status = Singular;
theStatus = Singular;
// if (D1UMag <= MagTol || D1VMag <= MagTol && NMag > MagTol) MagTol = 2* NMag;
}
else
@ -170,7 +170,7 @@ gp_Dir& Normal
gp_Dir aD1U(D1U);
gp_Dir aD1V(D1V);
Normal = gp_Dir(aD1U.Crossed(aD1V));
Status = Defined;
theStatus = Defined;
}
@ -186,7 +186,7 @@ void CSLib::Normal(const Standard_Integer MaxOrder,
const Standard_Real Umax,
const Standard_Real Vmin,
const Standard_Real Vmax,
CSLib_NormalStatus& Status,
CSLib_NormalStatus& theStatus,
gp_Dir& Normal,
Standard_Integer& OrderU,
Standard_Integer& OrderV)
@ -194,7 +194,7 @@ void CSLib::Normal(const Standard_Integer MaxOrder,
// Standard_Integer i,l,Order=-1;
Standard_Integer i=0,Order=-1;
Standard_Boolean Trouve=Standard_False;
// Status = Singular;
// theStatus = Singular;
Standard_Real Norme;
gp_Vec D;
//Find k0 such that all derivatives N=dS/du ^ dS/dv are null
@ -219,7 +219,7 @@ void CSLib::Normal(const Standard_Integer MaxOrder,
{
if(Order == 0)
{
Status = Defined;
theStatus = Defined;
Normal=D.Normalized();
}
else
@ -373,16 +373,16 @@ void CSLib::Normal(const Standard_Integer MaxOrder,
//Polynom is always negative
SP=-1;
if(SP==0)
Status = InfinityOfSolutions;
theStatus = InfinityOfSolutions;
else
{
Status = Defined;
theStatus = Defined;
Normal=SP*Vk0.Normalized();
}
}
else
{
Status = Defined;
theStatus = Defined;
Normal=D.Normalized();
}
}

10
src/CSLib/CSLib.hxx
View File

@ -55,9 +55,9 @@ public:
//! parallel the normal is undefined.
//! To check that D1U and D1V are colinear the sinus of the angle
//! between D1U and D1V is computed and compared with SinTol.
//! The normal is computed if Status == Done else the Status gives the
//! The normal is computed if theStatus == Done else the theStatus gives the
//! reason why the computation has failed.
Standard_EXPORT static void Normal (const gp_Vec& D1U, const gp_Vec& D1V, const Standard_Real SinTol, CSLib_DerivativeStatus& Status, gp_Dir& Normal);
Standard_EXPORT static void Normal (const gp_Vec& D1U, const gp_Vec& D1V, const Standard_Real SinTol, CSLib_DerivativeStatus& theStatus, gp_Dir& Normal);
//! If there is a singularity on the surface the previous method
@ -87,19 +87,19 @@ public:
//! order 2 (it means that we cannot omit Eps).
//! . if DNu Is not Null and DNv Is not Null Done = False, there are
//! an infinity of normals at the considered point on the surface.
Standard_EXPORT static void Normal (const gp_Vec& D1U, const gp_Vec& D1V, const gp_Vec& D2U, const gp_Vec& D2V, const gp_Vec& D2UV, const Standard_Real SinTol, Standard_Boolean& Done, CSLib_NormalStatus& Status, gp_Dir& Normal);
Standard_EXPORT static void Normal (const gp_Vec& D1U, const gp_Vec& D1V, const gp_Vec& D2U, const gp_Vec& D2V, const gp_Vec& D2UV, const Standard_Real SinTol, Standard_Boolean& Done, CSLib_NormalStatus& theStatus, gp_Dir& Normal);
//! Computes the normal direction of a surface as the cross product
//! between D1U and D1V.
Standard_EXPORT static void Normal (const gp_Vec& D1U, const gp_Vec& D1V, const Standard_Real MagTol, CSLib_NormalStatus& Status, gp_Dir& Normal);
Standard_EXPORT static void Normal (const gp_Vec& D1U, const gp_Vec& D1V, const Standard_Real MagTol, CSLib_NormalStatus& theStatus, gp_Dir& Normal);
//! find the first order k0 of deriviative of NUV
//! where: foreach order < k0 all the derivatives of NUV are
//! null all the derivatives of NUV corresponding to the order
//! k0 are collinear and have the same sens.
//! In this case, normal at U,V is unique.
Standard_EXPORT static void Normal (const Standard_Integer MaxOrder, const TColgp_Array2OfVec& DerNUV, const Standard_Real MagTol, const Standard_Real U, const Standard_Real V, const Standard_Real Umin, const Standard_Real Umax, const Standard_Real Vmin, const Standard_Real Vmax, CSLib_NormalStatus& Status, gp_Dir& Normal, Standard_Integer& OrderU, Standard_Integer& OrderV);
Standard_EXPORT static void Normal (const Standard_Integer MaxOrder, const TColgp_Array2OfVec& DerNUV, const Standard_Real MagTol, const Standard_Real U, const Standard_Real V, const Standard_Real Umin, const Standard_Real Umax, const Standard_Real Vmin, const Standard_Real Vmax, CSLib_NormalStatus& theStatus, gp_Dir& Normal, Standard_Integer& OrderU, Standard_Integer& OrderV);
//! -- Computes the derivative of order Nu in the --
//! direction U and Nv in the direction V of the not --

6
src/ChFi2d/ChFi2d_Builder.hxx
View File

@ -28,10 +28,14 @@
#include <Standard_Real.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Integer.hxx>
class TopoDS_Face;
class TopoDS_Edge;
class TopoDS_Vertex;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! This class contains the algorithm used to build
//! fillet on planar wire.

7
src/ChFiDS/ChFiDS_Spine.hxx
View File

@ -35,13 +35,14 @@
#include <GeomAbs_CurveType.hxx>
class TopoDS_Edge;
class ChFiDS_HElSpine;
class gp_Pnt;
class gp_Vec;
class BRepAdaptor_Curve;
class gp_Lin;
class gp_Circ;
class TopoDS_Vertex;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ChFiDS_Spine;
DEFINE_STANDARD_HANDLE(ChFiDS_Spine, MMgt_TShared)

10
src/DNaming/DNaming.cxx
View File

@ -158,9 +158,9 @@ TopoDS_Shape DNaming::CurrentShape (const Standard_CString LabelName,
TCollection_AsciiString DNaming::GetEntry (const TopoDS_Shape& Shape,
const Handle(TDF_Data)& DF,
Standard_Integer& Status)
Standard_Integer& theStatus)
{
Status = 0;
theStatus = 0;
//Handle(TNaming_UsedShapes) US;
//DF->Root().FindAttribute(TNaming_UsedShapes::GetID(),US);
@ -170,11 +170,11 @@ TCollection_AsciiString DNaming::GetEntry (const TopoDS_Shape& Shape,
Standard_Integer Transdef;
TDF_Label Lab = TNaming_Tool::Label (DF->Root(), Shape,Transdef);
TCollection_AsciiString entry; TDF_Tool::Entry(Lab,entry);
//Update Status;
//Update theStatus;
TNaming_Iterator it(Lab,DF->Transaction());
for (; it.More(); it.Next()) {
Status++;
if (Status == 2) break;
theStatus++;
if (theStatus == 2) break;
}
return entry;
}

8
src/DNaming/DNaming.hxx
View File

@ -105,10 +105,10 @@ public:
Standard_EXPORT static void GetShape (const Standard_CString ShapeEntry, const Handle(TDF_Data)& Data, TopTools_ListOfShape& Shapes);
//! Status = 0 Not found,
//! Status = 1 One shape,
//! Status = 2 More than one shape.
Standard_EXPORT static TCollection_AsciiString GetEntry (const TopoDS_Shape& Shape, const Handle(TDF_Data)& Data, Standard_Integer& Status);
//! theStatus = 0 Not found,
//! theStatus = 1 One shape,
//! theStatus = 2 More than one shape.
Standard_EXPORT static TCollection_AsciiString GetEntry (const TopoDS_Shape& Shape, const Handle(TDF_Data)& Data, Standard_Integer& theStatus);
//! Loads the Shape to DF
Standard_EXPORT static void LoadImportedShape (const TDF_Label& theResultLabel, const TopoDS_Shape& theShape);

17
src/DNaming/DNaming_BasicCommands.cxx
View File

@ -160,14 +160,14 @@ static Standard_Integer Getentry (Draw_Interpretor& di, Standard_Integer n, cons
//di << 0;
return 0;
}
Standard_Integer Status ;
TCollection_AsciiString Name = DNaming::GetEntry(S,ND,Status);
if (Status == 0) {
Standard_Integer aStatus = 0;
TCollection_AsciiString Name = DNaming::GetEntry (S, ND, aStatus);
if (aStatus == 0) {
di <<"E_NoName";
}
else {
di <<Name.ToCString();
if (Status == 2) {
if (aStatus == 2) {
di <<"Several shapes have the same name\n";
}
}
@ -422,15 +422,14 @@ static Standard_Integer Getcreationentry (Draw_Interpretor& di, Standard_Integer
di <<"E_NoName";
return 0;
}
Standard_Integer Status ;
TCollection_AsciiString Name = DNaming::GetEntry(S,ND,Status);
if (Status == 0) {
Standard_Integer aStatus = 0;
TCollection_AsciiString Name = DNaming::GetEntry (S, ND, aStatus);
if (aStatus == 0) {
di <<"E_NoName";
}
else {
di <<Name.ToCString();
if (Status == 2) {
if (aStatus == 2) {
di <<"Several shapes have the same name\n";
}
}

5
src/FairCurve/FairCurve_EnergyOfBatten.hxx
View File

@ -32,8 +32,11 @@
#include <TColgp_HArray1OfPnt2d.hxx>
#include <Standard_Boolean.hxx>
#include <math_Vector.hxx>
class FairCurve_BattenLaw;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! Energy Criterium to minimize in Batten.
class FairCurve_EnergyOfBatten : public FairCurve_Energy

6
src/FairCurve/FairCurve_EnergyOfMVC.hxx
View File

@ -33,9 +33,11 @@
#include <TColgp_HArray1OfPnt2d.hxx>
#include <Standard_Boolean.hxx>
#include <math_Vector.hxx>
class Standard_DomainError;
class FairCurve_BattenLaw;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! Energy Criterium to minimize in MinimalVariationCurve.
class FairCurve_EnergyOfMVC : public FairCurve_Energy

4
src/GC/GC_Root.hxx
View File

@ -24,6 +24,10 @@
#include <gce_ErrorType.hxx>
#include <Standard_Boolean.hxx>
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! This class implements the common services for
//! all classes of gce which report error.

4
src/GCE2d/GCE2d_Root.hxx
View File

@ -24,6 +24,10 @@
#include <gce_ErrorType.hxx>
#include <Standard_Boolean.hxx>
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! This class implements the common services for
//! all classes of gce which report error.

26
src/Geom2dConvert/Geom2dConvert.cxx
View File

@ -522,7 +522,7 @@ static Handle(Geom2d_BSplineCurve) MultNumandDenom(const Handle(Geom2d_BSplineCu
Standard_Real tolerance=Precision::Confusion();
Standard_Integer resNbPoles,degree,
ii,jj,
Status;
aStatus;
BS->Knots(BSKnots);
BS->Multiplicities(BSMults);
@ -560,7 +560,7 @@ static Handle(Geom2d_BSplineCurve) MultNumandDenom(const Handle(Geom2d_BSplineCu
resFlatKnots,
degree,
resNumPoles,
Status);
aStatus);
BSplCLib::FunctionMultiply(ev,
BS->Degree(),
BSFlatKnots,
@ -568,7 +568,7 @@ static Handle(Geom2d_BSplineCurve) MultNumandDenom(const Handle(Geom2d_BSplineCu
resFlatKnots,
degree,
resDenPoles,
Status);
aStatus);
// BSplCLib::FunctionMultiply(law_evaluator,
// BS->Degree(),
// BSFlatKnots,
@ -576,7 +576,7 @@ static Handle(Geom2d_BSplineCurve) MultNumandDenom(const Handle(Geom2d_BSplineCu
// resFlatKnots,
// degree,
// resNumPoles,
// Status);
// aStatus);
// BSplCLib::FunctionMultiply(law_evaluator,
// BS->Degree(),
// BSFlatKnots,
@ -584,7 +584,7 @@ static Handle(Geom2d_BSplineCurve) MultNumandDenom(const Handle(Geom2d_BSplineCu
// resFlatKnots,
// degree,
// resDenPoles,
// Status);
// aStatus);
for (ii=1;ii<=resNbPoles;ii++)
for(jj=1;jj<=2;jj++)
resPoles(ii).SetCoord(jj,resNumPoles(ii).Coord(jj)/resDenPoles(ii));
@ -1062,7 +1062,7 @@ void Geom2dConvert::ConcatG1(TColGeom2d_Array1OfBSplineCurve& ArrayOf
BSplCLib::KnotSequence(KnotC1,KnotC1Mults,FlatKnots);
TColgp_Array1OfPnt2d 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++)
@ -1077,7 +1077,7 @@ void Geom2dConvert::ConcatG1(TColGeom2d_Array1OfBSplineCurve& ArrayOf
FlatKnots,
aNewCurveDegree,
NewPoles,
Status
aStatus
);
TColStd_Array1OfReal NewWeights(1,FlatKnots.Length()-(2*Curve1->Degree()+1));
BSplCLib::FunctionReparameterise(ev,
@ -1087,7 +1087,7 @@ void Geom2dConvert::ConcatG1(TColGeom2d_Array1OfBSplineCurve& ArrayOf
FlatKnots,
aNewCurveDegree,
NewWeights,
Status
aStatus
);
// BSplCLib::FunctionReparameterise(reparameterise_evaluator,
// Curve1->Degree(),
@ -1096,7 +1096,7 @@ void Geom2dConvert::ConcatG1(TColGeom2d_Array1OfBSplineCurve& ArrayOf
// FlatKnots,
// 2*Curve1->Degree(),
// NewPoles,
// Status
// aStatus
// );
// TColStd_Array1OfReal NewWeights(1,FlatKnots.Length()-(2*Curve1->Degree()+1));
// BSplCLib::FunctionReparameterise(reparameterise_evaluator,
@ -1106,7 +1106,7 @@ void Geom2dConvert::ConcatG1(TColGeom2d_Array1OfBSplineCurve& ArrayOf
// FlatKnots,
// 2*Curve1->Degree(),
// NewWeights,
// Status
// aStatus
// );
for (ii=1;ii<=NewPoles.Length();ii++)
for (jj=1;jj<=2;jj++)
@ -1319,7 +1319,7 @@ void Geom2dConvert::ConcatC1(TColGeom2d_Array1OfBSplineCurve& ArrayOf
BSplCLib::KnotSequence(KnotC1,KnotC1Mults,FlatKnots);
TColgp_Array1OfPnt2d NewPoles(1, FlatKnots.Length() - (aNewCurveDegree + 1));
Standard_Integer Status;
Standard_Integer aStatus;
TColStd_Array1OfReal Curve1Weights(1,Curve1->NbPoles());
Curve1->Weights(Curve1Weights);
for (ii=1;ii<=Curve1->NbPoles();ii++)
@ -1335,7 +1335,7 @@ void Geom2dConvert::ConcatC1(TColGeom2d_Array1OfBSplineCurve& ArrayOf
FlatKnots,
aNewCurveDegree,
NewPoles,
Status
aStatus
);
TColStd_Array1OfReal NewWeights(1, FlatKnots.Length() - (aNewCurveDegree + 1));
// BSplCLib::FunctionReparameterise(reparameterise_evaluator,
@ -1346,7 +1346,7 @@ void Geom2dConvert::ConcatC1(TColGeom2d_Array1OfBSplineCurve& ArrayOf
FlatKnots,
aNewCurveDegree,
NewWeights,
Status
aStatus
);
for (ii=1;ii<=NewPoles.Length();ii++) {
for (jj=1;jj<=2;jj++)

11
src/Geom2dHatch/Geom2dHatch_Hatcher.hxx
View File

@ -26,15 +26,14 @@
#include <TopAbs_Orientation.hxx>
#include <HatchGen_ErrorStatus.hxx>
class Standard_NoSuchObject;
class Standard_OutOfRange;
class StdFail_NotDone;
class Geom2dHatch_Intersector;
class Geom2dHatch_Element;
class Geom2dHatch_Hatching;
class HatchGen_PointOnHatching;
class HatchGen_Domain;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class Geom2dHatch_Hatcher
{
public:

4
src/Geom2dHatch/Geom2dHatch_Hatching.cxx
View File

@ -137,9 +137,9 @@ Standard_Boolean Geom2dHatch_Hatching::IsDone () const
// Purpose : Sets the error status.
//=======================================================================
void Geom2dHatch_Hatching::Status (const HatchGen_ErrorStatus Status)
void Geom2dHatch_Hatching::Status (const HatchGen_ErrorStatus theStatus)
{
myStatus = Status ;
myStatus = theStatus;
}
//=======================================================================

12
src/Geom2dHatch/Geom2dHatch_Hatching.hxx
View File

@ -28,13 +28,13 @@
#include <HatchGen_Domains.hxx>
#include <Standard_Real.hxx>
#include <Standard_Integer.hxx>
class Standard_OutOfRange;
class Geom2dAdaptor_Curve;
class HatchGen_PointOnHatching;
class HatchGen_Domain;
class gp_Pnt2d;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class Geom2dHatch_Hatching
{
@ -76,7 +76,7 @@ public:
Standard_EXPORT Standard_Boolean IsDone() const;
//! Sets the error status.
Standard_EXPORT void Status (const HatchGen_ErrorStatus Status);
Standard_EXPORT void Status (const HatchGen_ErrorStatus theStatus);
//! Returns the error status.
Standard_EXPORT HatchGen_ErrorStatus Status() const;

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++)

7
src/HLRBRep/HLRBRep_EdgeData.hxx
View File

@ -30,10 +30,11 @@
#include <Standard_ShortReal.hxx>
#include <Standard_Real.hxx>
class TopoDS_Edge;
class HLRAlgo_EdgeStatus;
class HLRBRep_Curve;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class HLRBRep_EdgeData
{

6
src/HLRBRep/HLRBRep_PolyAlgo.cxx
View File

@ -612,12 +612,12 @@ Normal (const Standard_Integer iNode,
gp_Pnt P;
gp_Dir Norma;
Standard_Boolean OK;
CSLib_DerivativeStatus Status;
CSLib_DerivativeStatus aStatus;
CSLib_NormalStatus NStat;
myBSurf.D1(Nod1RValues.UV.X(), Nod1RValues.UV.Y(), P, D1U, D1V);
CSLib::Normal(D1U,D1V,Standard_Real(Precision::Angular()),
Status,Norma);
if (Status != CSLib_Done) {
aStatus,Norma);
if (aStatus != CSLib_Done) {
myBSurf.D2(Nod1RValues.UV.X(), Nod1RValues.UV.Y(), P, D1U, D1V, D2U, D2V, D2UV);
CSLib::Normal(D1U,D1V,D2U,D2V,D2UV,
Precision::Angular(),OK,NStat,Norma);

4
src/IGESSelect/IGESSelect_SelectSubordinate.hxx
View File

@ -27,6 +27,10 @@ class Standard_Transient;
class Interface_InterfaceModel;
class TCollection_AsciiString;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class IGESSelect_SelectSubordinate;
DEFINE_STANDARD_HANDLE(IGESSelect_SelectSubordinate, IFSelect_SelectExtract)

12
src/IntAna/IntAna_IntQuadQuad.cxx
View File

@ -1089,15 +1089,15 @@ Standard_Boolean IntAna_IntQuadQuad::HasNextCurve(const Standard_Integer I) cons
//purpose :
//=======================================================================
Standard_Integer IntAna_IntQuadQuad::PreviousCurve (const Standard_Integer I,
Standard_Boolean& Opposite) const
Standard_Boolean& theOpposite) const
{
if(HasPreviousCurve(I)) {
if(previouscurve[I-1]>0) {
Opposite = Standard_False;
theOpposite = Standard_False;
return(previouscurve[I-1]);
}
else {
Opposite = Standard_True;
theOpposite = Standard_True;
return( - previouscurve[I-1]);
}
}
@ -1110,15 +1110,15 @@ Standard_Integer IntAna_IntQuadQuad::PreviousCurve (const Standard_Integer I,
//purpose :
//=======================================================================
Standard_Integer IntAna_IntQuadQuad::NextCurve (const Standard_Integer I,
Standard_Boolean& Opposite) const
Standard_Boolean& theOpposite) const
{
if(HasNextCurve(I)) {
if(nextcurve[I]>0) {
Opposite = Standard_False;
theOpposite = Standard_False;
return(nextcurve[I-1]);
}
else {
Opposite = Standard_True;
theOpposite = Standard_True;
return( - nextcurve[I-1]);
}
}

8
src/IntAna/IntAna_IntQuadQuad.hxx
View File

@ -102,13 +102,13 @@ public:
//! If HasNextCurve(I) returns True, this function
//! returns the Index J of the curve which has a
//! common bound with the curve I. If Opposite ==
//! common bound with the curve I. If theOpposite ==
//! True , then the last parameter of the curve I, and
//! the last parameter of the curve J give the same
//! point. Else the last parameter of the curve I and
//! the first parameter of the curve J are the same
//! point.
Standard_EXPORT Standard_Integer NextCurve (const Standard_Integer I, Standard_Boolean& Opposite) const;
Standard_EXPORT Standard_Integer NextCurve (const Standard_Integer I, Standard_Boolean& theOpposite) const;
//! Returns True if the Curve I shares its first bound
//! with another curve.
@ -116,13 +116,13 @@ public:
//! if HasPreviousCurve(I) returns True, this function
//! returns the Index J of the curve which has a
//! common bound with the curve I. If Opposite ==
//! common bound with the curve I. If theOpposite ==
//! True , then the first parameter of the curve I,
//! and the first parameter of the curve J give the
//! same point. Else the first parameter of the curve
//! I and the last parameter of the curve J are the
//! same point.
Standard_EXPORT Standard_Integer PreviousCurve (const Standard_Integer I, Standard_Boolean& Opposite) const;
Standard_EXPORT Standard_Integer PreviousCurve (const Standard_Integer I, Standard_Boolean& theOpposite) const;

109
src/IntCurve/IntCurve_IntConicConic_1.cxx
View File

@ -864,7 +864,7 @@ void IntCurve_IntConicConic::Perform(const gp_Circ2d& Circle1
IntRes2d_Transition T1a,T1b,T2a,T2b;
IntRes2d_Position Pos1a,Pos1b,Pos2a,Pos2b;
Standard_Boolean Opposite =
Standard_Boolean isOpposite =
((Circle1.Location().SquareDistance(Circle2.Location())) > (R1*R1+R2*R2)) ?
Standard_True : Standard_False;
@ -873,8 +873,8 @@ void IntCurve_IntConicConic::Perform(const gp_Circ2d& Circle1
for(i=0; i<NbSolTotal; i++)
{
Standard_Real C2inf=(Opposite)? SolutionC2[i].Bsup : SolutionC2[i].Binf;
Standard_Real C2sup=(Opposite)? SolutionC2[i].Binf : SolutionC2[i].Bsup;
Standard_Real C2inf = isOpposite ? SolutionC2[i].Bsup : SolutionC2[i].Binf;
Standard_Real C2sup = isOpposite ? SolutionC2[i].Binf : SolutionC2[i].Bsup;
Standard_Real C1tinf = SolutionC1[i].Binf, C2tinf = C2inf;
Standard_Real C1inf=NormalizeOnCircleDomain(C1tinf,DomainCirc1);
C2inf=NormalizeOnCircleDomain(C2tinf,DomainCirc2);
@ -977,7 +977,7 @@ void IntCurve_IntConicConic::Perform(const gp_Circ2d& Circle1
//--------------------------------------------------
if(Opposite)
if (isOpposite)
{
if(nbsol!=3)
{
@ -994,9 +994,7 @@ void IntCurve_IntConicConic::Perform(const gp_Circ2d& Circle1
}
IntRes2d_IntersectionPoint NewPoint2(P1b,C1sup,PIpPI-C2sup,T1b,T2b,Standard_False);
IntRes2d_IntersectionSegment NewSeg(NewPoint1,NewPoint2,
(Opposite==Standard_True)? Standard_False : Standard_True,
Standard_False);
IntRes2d_IntersectionSegment NewSeg (NewPoint1,NewPoint2, !isOpposite, Standard_False);
Append(NewSeg);
}
else
@ -1032,7 +1030,7 @@ void IntCurve_IntConicConic::Perform(const gp_Circ2d& Circle1
//--------------------------------------------------
if(Opposite)
if (isOpposite)
{
if(C2inf<C2sup)
C2inf+=PIpPI;
@ -1044,7 +1042,7 @@ void IntCurve_IntConicConic::Perform(const gp_Circ2d& Circle1
}
IntRes2d_IntersectionPoint NewPoint2(P1b,C1sup,C2sup,T1b,T2b,Standard_False);
IntRes2d_IntersectionSegment NewSeg(NewPoint1,NewPoint2,Opposite,Standard_False);
IntRes2d_IntersectionSegment NewSeg(NewPoint1,NewPoint2,isOpposite,Standard_False);
Append(NewSeg);
}
else
@ -1243,7 +1241,7 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
gp_Vec2d Tan2=L2.Direction();
Standard_Real aCosT1T2 = Tan1.Dot(Tan2);
Standard_Boolean Opposite=(aCosT1T2 < 0.0)? Standard_True : Standard_False;
Standard_Boolean isOpposite = (aCosT1T2 < 0.0) ? Standard_True : Standard_False;
done=Standard_True;
@ -1355,8 +1353,8 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
Standard_Real U2inf,U2sup;
Standard_Real Res2inf,Res2sup;
if(Opposite) { U2inf = U1pU2 -Res1sup; U2sup= U1pU2-Res1inf; }
else { U2inf = Res1inf-U1mU2; U2sup= Res1sup-U1mU2; }
if (isOpposite) { U2inf = U1pU2 -Res1sup; U2sup= U1pU2-Res1inf; }
else { U2inf = Res1inf-U1mU2; U2sup= Res1sup-U1mU2; }
DomainIntersection(Domain2,U2inf,U2sup,Res2inf,Res2sup,Pos2a,Pos2b);
@ -1373,7 +1371,7 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
//-- Attention, les bornes Res1inf(sup) bougent donc il faut
//-- eventuellement recalculer les attributs
if(Opposite) { Res1inf=U1pU2-Res2sup; Res1sup=U1pU2-Res2inf;
if(isOpposite) { Res1inf=U1pU2-Res2sup; Res1sup=U1pU2-Res2inf;
Standard_Real Tampon=Res2inf; Res2inf=Res2sup; Res2sup=Tampon;
IntRes2d_Position Pos=Pos2a; Pos2a=Pos2b; Pos2b=Pos;
}
@ -1393,8 +1391,8 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
T2a.SetValue(Standard_False,Pos2a,IntRes2d_Out);
}
else {
T1a.SetValue(Standard_False,Pos1a,IntRes2d_Unknown,Opposite);
T2a.SetValue(Standard_False,Pos2a,IntRes2d_Unknown,Opposite);
T1a.SetValue (Standard_False, Pos1a, IntRes2d_Unknown, isOpposite);
T2a.SetValue (Standard_False, Pos2a, IntRes2d_Unknown, isOpposite);
}
@ -1461,13 +1459,13 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
T2b.SetValue(Standard_False,Pos2b,IntRes2d_Out);
}
else {
T1b.SetValue(Standard_False,Pos1b,IntRes2d_Unknown,Opposite);
T2b.SetValue(Standard_False,Pos2b,IntRes2d_Unknown,Opposite);
T1b.SetValue (Standard_False, Pos1b, IntRes2d_Unknown, isOpposite);
T2b.SetValue (Standard_False, Pos2b, IntRes2d_Unknown, isOpposite);
}
gp_Pnt2d Ptdebut;
if(Pos1a==IntRes2d_Middle) {
Standard_Real t3;
if(Opposite) {
if (isOpposite) {
t3 = (Pos2a == IntRes2d_Head)? Res2sup : Res2inf;
}
else {
@ -1495,8 +1493,7 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
Res2sup=ElCLib::Parameter(L2,Ptfin);
}
PtSeg2.SetValues(Ptfin,Res1sup,Res2sup,T1b,T2b,Standard_False);
IntRes2d_IntersectionSegment Segment(PtSeg1,PtSeg2
,Opposite,Standard_False);
IntRes2d_IntersectionSegment Segment (PtSeg1, PtSeg2, isOpposite, Standard_False);
Append(Segment);
}
else { //-- Extremite(L1 ou L2) ------> Point Middle(L1 et L2)
@ -1512,14 +1509,14 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
T2b.SetValue(Standard_False,Pos2b,IntRes2d_Out);
}
else {
T1b.SetValue(Standard_False,Pos1b,IntRes2d_Unknown,Opposite);
T2b.SetValue(Standard_False,Pos2b,IntRes2d_Unknown,Opposite);
T1b.SetValue (Standard_False, Pos1b, IntRes2d_Unknown, isOpposite);
T2b.SetValue (Standard_False, Pos2b, IntRes2d_Unknown, isOpposite);
}
PtSeg2.SetValues(ElCLib::Value(U2,L2),U1,U2,T1b,T2b,Standard_False);
if((Abs(Res1inf-U1) >LongMiniSeg) && (Abs(Res2inf-U2) >LongMiniSeg)) {
IntRes2d_IntersectionSegment Segment(PtSeg1,PtSeg2,Opposite,Standard_False);
IntRes2d_IntersectionSegment Segment (PtSeg1, PtSeg2, isOpposite, Standard_False);
Append(Segment);
}
else {
@ -1538,7 +1535,7 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
gp_Pnt2d Ptfin;
if(Pos1b==IntRes2d_Middle) {
Standard_Real t2;
if(Opposite) {
if (isOpposite) {
t2 = (Pos2b == IntRes2d_Head)? Res2sup : Res2inf;
}
else {
@ -1568,8 +1565,8 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
T2b.SetValue(Standard_False,Pos2b,IntRes2d_Out);
}
else {
T1b.SetValue(Standard_False,Pos1b,IntRes2d_Unknown,Opposite);
T2b.SetValue(Standard_False,Pos2b,IntRes2d_Unknown,Opposite);
T1b.SetValue (Standard_False, Pos1b, IntRes2d_Unknown, isOpposite);
T2b.SetValue (Standard_False, Pos2b, IntRes2d_Unknown, isOpposite);
}
PtSeg2.SetValues(Ptfin,Res1sup,Res2sup,T1b,T2b,Standard_False);
Append(PtSeg2);
@ -1587,8 +1584,8 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
T2b.SetValue(Standard_False,Pos2b,IntRes2d_Out);
}
else {
T1b.SetValue(Standard_False,Pos1b,IntRes2d_Unknown,Opposite);
T2b.SetValue(Standard_False,Pos2b,IntRes2d_Unknown,Opposite);
T1b.SetValue (Standard_False, Pos1b, IntRes2d_Unknown, isOpposite);
T2b.SetValue (Standard_False, Pos2b, IntRes2d_Unknown, isOpposite);
}
PtSeg1.SetValues(ElCLib::Value(U2,L2),U1,U2,T1b,T2b,Standard_False);
Append(PtSeg1);
@ -1607,8 +1604,8 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
T2b.SetValue(Standard_False,Pos2b,IntRes2d_Out);
}
else {
T1b.SetValue(Standard_False,Pos1b,IntRes2d_Unknown,Opposite);
T2b.SetValue(Standard_False,Pos2b,IntRes2d_Unknown,Opposite);
T1b.SetValue (Standard_False, Pos1b, IntRes2d_Unknown, isOpposite);
T2b.SetValue (Standard_False, Pos2b, IntRes2d_Unknown, isOpposite);
}
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
//~~ Ajustement des parametres et du point renvoye
@ -1628,8 +1625,7 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
||(Abs(U2-Res2sup)>LongMiniSeg)) {
//-- Modif du 1er Octobre 92 (Pour Composites)
IntRes2d_IntersectionSegment Segment(PtSeg1,PtSeg2
,Opposite,Standard_False);
IntRes2d_IntersectionSegment Segment (PtSeg1, PtSeg2, isOpposite, Standard_False);
Append(Segment);
}
else {
@ -1698,7 +1694,7 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
//== 1 : L1 borne
if(Domain1.HasFirstPoint()) ResHasFirstPoint=1;
if(Domain1.HasLastPoint()) ResHasLastPoint=1;
if(Opposite) {
if (isOpposite) {
if(Domain2.HasLastPoint()) ResHasFirstPoint+=2;
if(Domain2.HasFirstPoint()) ResHasLastPoint+=2;
}
@ -1708,17 +1704,16 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
}
if(ResHasFirstPoint==0 && ResHasLastPoint==0) {
//~~~~ Creation d un segment infini avec Opposite
Append(IntRes2d_IntersectionSegment(Opposite));
Append (IntRes2d_IntersectionSegment (isOpposite));
}
else { //-- On obtient au pire une demi-droite
switch(ResHasFirstPoint) {
case 1:
ParamStart=Domain1.FirstParameter();
ParamStart2=(Opposite)? (Org2SurL1-ParamStart)
:(ParamStart-Org2SurL1);
ParamStart2 = isOpposite ? (Org2SurL1 - ParamStart) : (ParamStart - Org2SurL1);
break;
case 2:
if(Opposite) {
if (isOpposite) {
ParamStart2=Domain2.LastParameter();
ParamStart=Org2SurL1 - ParamStart2;
}
@ -1728,7 +1723,7 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
}
break;
case 3:
if(Opposite) {
if (isOpposite) {
ParamStart2=Domain2.LastParameter();
ParamStart=Org2SurL1 - ParamStart2;
if(ParamStart < Domain1.FirstParameter()) {
@ -1752,11 +1747,10 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
switch(ResHasLastPoint) {
case 1:
ParamEnd=Domain1.LastParameter();
ParamEnd2=(Opposite)? (Org2SurL1-ParamEnd)
:(ParamEnd-Org2SurL1);
ParamEnd2 = isOpposite ? (Org2SurL1 - ParamEnd) : (ParamEnd - Org2SurL1);
break;
case 2:
if(Opposite) {
if (isOpposite) {
ParamEnd2=Domain2.FirstParameter();
ParamEnd=Org2SurL1 - ParamEnd2;
}
@ -1766,7 +1760,7 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
}
break;
case 3:
if(Opposite) {
if (isOpposite) {
ParamEnd2=Domain2.FirstParameter();
ParamEnd=Org2SurL1 - ParamEnd2;
if(ParamEnd > Domain1.LastParameter()) {
@ -1798,8 +1792,8 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
IntRes2d_Position Pos1,Pos2;
Pos1=FindPositionLL(ParamStart,Domain1);
Pos2=FindPositionLL(ParamStart2,Domain2);
Tinf.SetValue(Standard_True,Pos1,IntRes2d_Unknown,Opposite);
Tsup.SetValue(Standard_True,Pos2,IntRes2d_Unknown,Opposite);
Tinf.SetValue (Standard_True, Pos1, IntRes2d_Unknown, isOpposite);
Tsup.SetValue (Standard_True, Pos2, IntRes2d_Unknown, isOpposite);
IntRes2d_IntersectionPoint P1(ElCLib::Value(ParamStart,L1)
,ParamStart,ParamStart2
,Tinf,Tsup,Standard_False);
@ -1807,13 +1801,13 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
//~~~ Le segment est assez long
Pos1=FindPositionLL(ParamEnd,Domain1);
Pos2=FindPositionLL(ParamEnd2,Domain2);
Tinf.SetValue(Standard_True,Pos1,IntRes2d_Unknown,Opposite);
Tsup.SetValue(Standard_True,Pos2,IntRes2d_Unknown,Opposite);
Tinf.SetValue (Standard_True, Pos1, IntRes2d_Unknown, isOpposite);
Tsup.SetValue (Standard_True, Pos2, IntRes2d_Unknown, isOpposite);
IntRes2d_IntersectionPoint P2(ElCLib::Value(ParamEnd,L1)
,ParamEnd,ParamEnd2
,Tinf,Tsup,Standard_False);
IntRes2d_IntersectionSegment Seg(P1,P2,Opposite,Standard_False);
IntRes2d_IntersectionSegment Seg (P1, P2, isOpposite, Standard_False);
Append(Seg);
}
else { //~~~~ le segment est de longueur inferieure a Tol
@ -1825,26 +1819,26 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1
//~~~ Creation de la demi droite |----------->
IntRes2d_Position Pos1=FindPositionLL(ParamStart,Domain1);
IntRes2d_Position Pos2=FindPositionLL(ParamStart2,Domain2);
Tinf.SetValue(Standard_True,Pos1,IntRes2d_Unknown,Opposite);
Tsup.SetValue(Standard_True,Pos2,IntRes2d_Unknown,Opposite);
Tinf.SetValue (Standard_True, Pos1, IntRes2d_Unknown, isOpposite);
Tsup.SetValue (Standard_True, Pos2, IntRes2d_Unknown, isOpposite);
IntRes2d_IntersectionPoint P(ElCLib::Value(ParamStart,L1)
,ParamStart,ParamStart2
,Tinf,Tsup,Standard_False);
IntRes2d_IntersectionSegment Seg(P,Standard_True,Opposite,Standard_False);
IntRes2d_IntersectionSegment Seg (P, Standard_True, isOpposite, Standard_False);
Append(Seg);
}
}
else {
IntRes2d_Position Pos1=FindPositionLL(ParamEnd,Domain1);
IntRes2d_Position Pos2=FindPositionLL(ParamEnd2,Domain2);
Tinf.SetValue(Standard_True,Pos1,IntRes2d_Unknown,Opposite);
Tsup.SetValue(Standard_True,Pos2,IntRes2d_Unknown,Opposite);
Tinf.SetValue (Standard_True, Pos1, IntRes2d_Unknown, isOpposite);
Tsup.SetValue (Standard_True, Pos2, IntRes2d_Unknown, isOpposite);
IntRes2d_IntersectionPoint P2(ElCLib::Value(ParamEnd,L1)
,ParamEnd,ParamEnd2
,Tinf,Tsup,Standard_False);
IntRes2d_IntersectionSegment Seg(P2,Standard_False,Opposite,Standard_False);
IntRes2d_IntersectionSegment Seg (P2, Standard_False, isOpposite, Standard_False);
Append(Seg);
//~~~ Creation de la demi droite <-----------|
}
@ -2053,7 +2047,7 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& Line
ElCLib::CircleD1(SolutionCircle[0].Binf,CircleAxis,R,P1a,Tan1);
ElCLib::LineD1(SolutionLine[0].Binf,LineAxis,P2a,Tan2);
Standard_Boolean Opposite=((Tan1.Dot(Tan2))<0.0)? Standard_True : Standard_False;
Standard_Boolean isOpposite = (Tan1.Dot (Tan2) < 0.0);
for(i=0; i<NbSolTotal; i++ ) {
@ -2099,8 +2093,8 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& Line
//-- Fin 7 aout 97
Standard_Real Linf=(Opposite)? SolutionLine[i].Bsup : SolutionLine[i].Binf;
Standard_Real Lsup=(Opposite)? SolutionLine[i].Binf : SolutionLine[i].Bsup;
Standard_Real Linf = isOpposite ? SolutionLine[i].Bsup : SolutionLine[i].Binf;
Standard_Real Lsup = isOpposite ? SolutionLine[i].Binf : SolutionLine[i].Bsup;
//---------------------------------------------------------------
//-- Si les parametres sur le cercle sont en premier
@ -2191,8 +2185,7 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& Line
|| (T1a.TransitionType() != T2a.TransitionType())) {
//-- Verifier egalement les transitions
IntRes2d_IntersectionSegment NewSeg(NewPoint1,NewPoint2
,Opposite,ReversedParameters());
IntRes2d_IntersectionSegment NewSeg (NewPoint1, NewPoint2, isOpposite, ReversedParameters());
Append(NewSeg);
}
else {

32
src/IntTools/IntTools_FClass2d.cxx
View File

@ -557,7 +557,7 @@ TopAbs_State IntTools_FClass2d::Perform
Standard_Real v = _Puv.Y();
Standard_Real uu = u;
Standard_Real vv = v;
TopAbs_State Status = TopAbs_UNKNOWN;
TopAbs_State aStatus = TopAbs_UNKNOWN;
Handle(BRepAdaptor_HSurface) surf = new BRepAdaptor_HSurface();
surf->ChangeSurface().Initialize( Face, Standard_False );
@ -616,7 +616,7 @@ TopAbs_State IntTools_FClass2d::Perform
bUseClassifier = Standard_True;
}
else {
Status = (dedans == 1) ? TopAbs_IN : TopAbs_OUT;
aStatus = (dedans == 1) ? TopAbs_IN : TopAbs_OUT;
}
} // if(TabOrien(1)!=-1) {
//compute state of the point using face classifier
@ -640,14 +640,14 @@ TopAbs_State IntTools_FClass2d::Perform
//
BRepClass_FaceClassifier aClassifier;
aClassifier.Perform(Face,Puv,aFCTol);
Status = aClassifier.State();
aStatus = aClassifier.State();
}
if (!RecadreOnPeriodic || (!IsUPer && !IsVPer))
return Status;
return aStatus;
if (Status == TopAbs_IN || Status == TopAbs_ON)
return Status;
if (aStatus == TopAbs_IN || aStatus == TopAbs_ON)
return aStatus;
if (!urecadre){
u = uu;
@ -673,7 +673,7 @@ TopAbs_State IntTools_FClass2d::Perform
u = uu;
if (v > Vmax || !IsVPer) {
return Status;
return aStatus;
}
}
} //while (1)
@ -705,7 +705,7 @@ TopAbs_State IntTools_FClass2d::TestOnRestriction
const Standard_Boolean IsVPer = surf->IsVPeriodic();
const Standard_Real uperiod = IsUPer ? surf->UPeriod() : 0.0;
const Standard_Real vperiod = IsVPer ? surf->VPeriod() : 0.0;
TopAbs_State Status = TopAbs_UNKNOWN;
TopAbs_State aStatus = TopAbs_UNKNOWN;
Standard_Boolean urecadre = Standard_False, vrecadre = Standard_False;
Standard_Integer dedans = 1;
@ -745,25 +745,25 @@ TopAbs_State IntTools_FClass2d::TestOnRestriction
}
}
if(dedans==0) {
Status = TopAbs_ON;
aStatus = TopAbs_ON;
}
if(dedans == 1) {
Status = TopAbs_IN;
aStatus = TopAbs_IN;
}
if(dedans == -1) {
Status = TopAbs_OUT;
aStatus = TopAbs_OUT;
}
}
else { //-- TabOrien(1)=-1 Wrong Wire
BRepClass_FaceClassifier aClassifier;
aClassifier.Perform(Face,Puv,Tol);
Status = aClassifier.State();
aStatus = aClassifier.State();
}
if (!RecadreOnPeriodic || (!IsUPer && !IsVPer))
return Status;
if (Status == TopAbs_IN || Status == TopAbs_ON)
return Status;
return aStatus;
if (aStatus == TopAbs_IN || aStatus == TopAbs_ON)
return aStatus;
if (!urecadre)
{
@ -787,7 +787,7 @@ TopAbs_State IntTools_FClass2d::TestOnRestriction
u = uu;
if (v > Vmax || !IsVPer)
return Status;
return aStatus;
}
} //for (;;)
}

22
src/IntWalk/IntWalk_IWalking_3.gxx
View File

@ -74,7 +74,7 @@ void IntWalk_IWalking::ComputeOpenLine(const TColStd_SequenceOfReal& Umult,
Handle(IntWalk_TheIWLine) CurrentLine; // line under construction
Standard_Boolean Tgtend;
IntWalk_StatusDeflection Status, StatusPrecedent;
IntWalk_StatusDeflection aStatus, StatusPrecedent;
Standard_Integer NbDivision;
// number of divisions of step for each section
@ -238,10 +238,10 @@ void IntWalk_IWalking::ComputeOpenLine(const TColStd_SequenceOfReal& Umult,
}
}
}
Status = TestDeflection(Func, Arrive, UVap, StatusPrecedent,
aStatus = TestDeflection(Func, Arrive, UVap, StatusPrecedent,
NbDivision,PasC,StepSign);
StatusPrecedent = Status;
if (Status == IntWalk_PasTropGrand) {
StatusPrecedent = aStatus;
if (aStatus == IntWalk_PasTropGrand) {
Arrive = Standard_False;
ArretAjout = Standard_False;
Tgtend = Standard_False; // jag 940615
@ -255,7 +255,7 @@ void IntWalk_IWalking::ComputeOpenLine(const TColStd_SequenceOfReal& Umult,
else if (ArretAjout || Cadre) {
Arrive = Standard_True;
CurrentLine->AddStatusLast(Standard_False);
//if (Status != IntWalk_ArretSurPointPrecedent)
//if (aStatus != IntWalk_ArretSurPointPrecedent)
CurrentLine->AddPoint(Psol);
//Remove <SaveN> from <seqAlone>
for (Standard_Integer iseq = 1; iseq <= seqAlone.Length(); iseq++)
@ -270,7 +270,7 @@ void IntWalk_IWalking::ComputeOpenLine(const TColStd_SequenceOfReal& Umult,
seqAjout.Append(lines.Length()+1);
}
}
else if (Status == IntWalk_ArretSurPointPrecedent) {
else if (aStatus == IntWalk_ArretSurPointPrecedent) {
if (CurrentLine->NbPoints() == 1) { //cancel the line
Arrive = Standard_False;
break;
@ -285,7 +285,7 @@ void IntWalk_IWalking::ComputeOpenLine(const TColStd_SequenceOfReal& Umult,
}
else if (Arrive) {
if (CurrentLine->NbPoints() == 1 && // cancel the line
(N == I || Status == IntWalk_PointConfondu) ) {
(N == I || aStatus == IntWalk_PointConfondu) ) {
// if N == I the main uv is probably lost
// or the point is a point of accumulation
// if point is confused the start data is bad
@ -301,7 +301,7 @@ void IntWalk_IWalking::ComputeOpenLine(const TColStd_SequenceOfReal& Umult,
// if (etat1N < 11) { // passing point that is a stop
if (Abs(etat1N) < 11) { // passing point that is a stop
// modified by NIZHNY-MKK Thu Nov 2 15:12:11 2000.END
if (Status == IntWalk_ArretSurPoint) {
if (aStatus == IntWalk_ArretSurPoint) {
CurrentLine->AddStatusLast(Standard_False);
Tgtend = Standard_True; // need check
}
@ -333,7 +333,7 @@ void IntWalk_IWalking::ComputeOpenLine(const TColStd_SequenceOfReal& Umult,
// modified by NIZHNY-MKK Fri Oct 27 12:45:33 2000.END
}
}
else if (Status == IntWalk_ArretSurPoint) {
else if (aStatus == IntWalk_ArretSurPoint) {
Arrive = Standard_True;
CurrentLine->AddStatusLast(Standard_False);
Tgtend = Standard_True;
@ -343,13 +343,13 @@ void IntWalk_IWalking::ComputeOpenLine(const TColStd_SequenceOfReal& Umult,
seqAlone.Append(lines.Length() + 1);
seqAjout.Append(lines.Length() + 1);
}
else if (Status == IntWalk_OK) {
else if (aStatus == IntWalk_OK) {
MakeWalkingPoint(2, UVap(1), UVap(2), Func, previousPoint);
previousd3d = Func.Direction3d();
previousd2d = Func.Direction2d();
CurrentLine->AddPoint(previousPoint);
}
else if (Status == IntWalk_PointConfondu)
else if (aStatus == IntWalk_PointConfondu)
{
aNbIter --;
}

22
src/IntWalk/IntWalk_IWalking_4.gxx
View File

@ -61,7 +61,7 @@ void IntWalk_IWalking::ComputeCloseLine(const TColStd_SequenceOfReal& Umult,
Standard_Integer StepSign;
IntWalk_StatusDeflection Status = IntWalk_OK, StatusPrecedent;
IntWalk_StatusDeflection aStatus = IntWalk_OK, StatusPrecedent;
Standard_Integer NbDivision ; // number of divisions of step
// during calculation of 1 section
@ -245,7 +245,7 @@ void IntWalk_IWalking::ComputeCloseLine(const TColStd_SequenceOfReal& Umult,
Standard_Real aScaleCoeff = 0.0;
// Avoid finite cycle which lead to stop computing iline.
if (Status != IntWalk_PasTropGrand)
if (aStatus != IntWalk_PasTropGrand)
{
// Make linear extrapolation.
if ( Abs(uv[aCoordIdx - 1] - uvprev[aCoordIdx - 1]) > gp::Resolution())
@ -303,11 +303,11 @@ void IntWalk_IWalking::ComputeCloseLine(const TColStd_SequenceOfReal& Umult,
Arrive = (wd2[I].etat == 12); // the line is open
}
}
Status = TestDeflection(Func, Arrive,Uvap,StatusPrecedent,
aStatus = TestDeflection(Func, Arrive,Uvap,StatusPrecedent,
NbDivision,PasC,StepSign);
StatusPrecedent = Status;
if (Status == IntWalk_PasTropGrand) {// division of the step
StatusPrecedent = aStatus;
if (aStatus == IntWalk_PasTropGrand) {// division of the step
Arrive = Standard_False;
ArretAjout = Standard_False;
Tgtend = Standard_False; // jag 940616
@ -322,7 +322,7 @@ void IntWalk_IWalking::ComputeCloseLine(const TColStd_SequenceOfReal& Umult,
if (Arrive) { // line s is open
CurrentLine->AddStatusLast(Standard_False);
//if (Status != IntWalk_ArretSurPointPrecedent)
//if (aStatus != IntWalk_ArretSurPointPrecedent)
CurrentLine->AddPoint(Psol);
//Remove <SaveN> from <seqAlone> and, if it is first found point,
@ -370,7 +370,7 @@ void IntWalk_IWalking::ComputeCloseLine(const TColStd_SequenceOfReal& Umult,
StepSign = -1;
StatusPrecedent = IntWalk_OK;
PasC = PasSav;
if (Status == IntWalk_ArretSurPointPrecedent) {
if (aStatus == IntWalk_ArretSurPointPrecedent) {
CurrentLine->AddPoint(Psol);
OpenLine(0,Psol,Pnts1,Func,CurrentLine);
}
@ -407,7 +407,7 @@ void IntWalk_IWalking::ComputeCloseLine(const TColStd_SequenceOfReal& Umult,
}
}
}
else if ( Status == IntWalk_ArretSurPointPrecedent) {
else if (aStatus == IntWalk_ArretSurPointPrecedent) {
if (CurrentLine->NbPoints() == 1) { //cancel the line
Arrive = Standard_False;
RemoveTwoEndPoints(I);
@ -445,7 +445,7 @@ void IntWalk_IWalking::ComputeCloseLine(const TColStd_SequenceOfReal& Umult,
AddPointInCurrentLine(N,PathPnt,CurrentLine);
}
}
else if (Status == IntWalk_ArretSurPoint) {
else if (aStatus == IntWalk_ArretSurPoint) {
if (wd2[I].etat >12) { //line should become open
wd2[I].etat = 12; //declare it open
Tgtbeg = Standard_True;
@ -479,14 +479,14 @@ void IntWalk_IWalking::ComputeCloseLine(const TColStd_SequenceOfReal& Umult,
}
}
}
else if (Status == IntWalk_OK) {
else if (aStatus == IntWalk_OK) {
if (Ipass!=0) CurrentLine->AddIndexPassing(Ipass);
previousPoint.SetValue(Func.Point(),reversed,Uvap(1),Uvap(2));
previousd3d = Func.Direction3d();
previousd2d = Func.Direction2d();
CurrentLine->AddPoint(previousPoint);
}
else if (Status == IntWalk_PointConfondu)
else if (aStatus == IntWalk_PointConfondu)
{
aNbIter --;
}

46
src/IntWalk/IntWalk_IWalking_5.gxx
View File

@ -51,7 +51,7 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
//11) calculate the step of advancement depending on the vector
//12) adjust the step depending on the previous steps
IntWalk_StatusDeflection Status = IntWalk_OK;
IntWalk_StatusDeflection aStatus = IntWalk_OK;
//---------------------------------------------------------------------------------
//-- lbr le 4 Avril 95 : it is possible that the status returns points confused
@ -80,7 +80,7 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
//if ((++NbPointsConfondusConsecutifs < 10) && (Norme <= epsilon)) { // the square is already taken in the constructor
if ((Norme <= epsilon) && ((Duv <= aTol) || (StatusPrecedent != IntWalk_OK)))
{ // the square is already taken in the constructor
Status = IntWalk_PointConfondu;
aStatus = IntWalk_PointConfondu;
if (StatusPrecedent == IntWalk_PasTropGrand) {
return IntWalk_ArretSurPointPrecedent;
}
@ -92,7 +92,7 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
if (Cosi*StepSign >= 0.) {// angle 3d <= pi/2 !!!!
const Standard_Real aDiv = previousd3d.SquareMagnitude()*Norme;
if(aDiv == 0)
return Status;
return aStatus;
Cosi2 = Cosi * Cosi / aDiv;
}
if (Cosi2 < CosRef3D) { //angle 3d too great
@ -100,10 +100,10 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
Standard_Real StepU = Abs(Step*previousd2d.X()),
StepV = Abs(Step*previousd2d.Y());
if (StepU < tolerance(1) && StepV < tolerance(2))
Status = IntWalk_ArretSurPointPrecedent;
aStatus = IntWalk_ArretSurPointPrecedent;
else
Status = IntWalk_PasTropGrand;
return Status;
aStatus = IntWalk_PasTropGrand;
return aStatus;
}
}
@ -128,7 +128,7 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
Standard_Real Cosi = StepSign * (Du * previousd2d.X() + Dv * previousd2d.Y());
if (Cosi < 0 && Status == IntWalk_PointConfondu)
if (Cosi < 0 && aStatus == IntWalk_PointConfondu)
return IntWalk_ArretSurPointPrecedent; // leave as step back
// with confused point
@ -138,7 +138,7 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
//if during routing one has subdivided more than MaxDivision for each
//previous step, bug on the square; do nothing (experience U4)
if ((NbDivision < MaxDivision) && (Status != IntWalk_PointConfondu) &&
if ((NbDivision < MaxDivision) && (aStatus != IntWalk_PointConfondu) &&
(StatusPrecedent!= IntWalk_PointConfondu))
{
Standard_Real Cosi2 = Cosi * Cosi / Duv;
@ -148,11 +148,11 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
StepV = Abs(Step*previousd2d.Y());
if (StepU < tolerance(1) && StepV < tolerance(2))
Status = IntWalk_ArretSurPointPrecedent;
aStatus = IntWalk_ArretSurPointPrecedent;
else
Status = IntWalk_PasTropGrand;
aStatus = IntWalk_PasTropGrand;
NbDivision = NbDivision + 1;
return Status;
return aStatus;
}
Cosi = Corde * sp.Direction3d();
@ -162,10 +162,10 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
Standard_Real StepU = Abs(Step*previousd2d.X()),
StepV = Abs(Step*previousd2d.Y());
if (StepU < tolerance(1) && StepV < tolerance(2))
Status = IntWalk_ArretSurPoint;
aStatus = IntWalk_ArretSurPoint;
else
Status = IntWalk_PasTropGrand;
return Status;
aStatus = IntWalk_PasTropGrand;
return aStatus;
}
Cosi = Du * sp.Direction2d().X() +
Dv * sp.Direction2d().Y();
@ -177,15 +177,15 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
Standard_Real StepU = Abs(Step*previousd2d.X()),
StepV = Abs(Step*previousd2d.Y());
if (StepU < tolerance(1) && StepV < tolerance(2))
Status = IntWalk_ArretSurPointPrecedent;
aStatus = IntWalk_ArretSurPointPrecedent;
else
Status = IntWalk_PasTropGrand;
return Status;
aStatus = IntWalk_PasTropGrand;
return aStatus;
}
}
if (!Finished) {
if (Status == IntWalk_PointConfondu)
if (aStatus == IntWalk_PointConfondu)
{
Standard_Real StepU = Min(Abs(1.5 * Du),pas*(UM-Um)),
StepV = Min(Abs(1.5 * Dv),pas*(VM-Vm));
@ -277,9 +277,9 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
StepV = Abs(Step*previousd2d.Y());
if (StepU < tolerance(1) && StepV < tolerance(2))
Status = IntWalk_ArretSurPointPrecedent;
aStatus = IntWalk_ArretSurPointPrecedent;
else
Status = IntWalk_PasTropGrand;
aStatus = IntWalk_PasTropGrand;
}
else
{
@ -305,9 +305,5 @@ IntWalk_StatusDeflection IntWalk_IWalking::TestDeflection
}
}
}
return Status;
return aStatus;
}

62
src/IntWalk/IntWalk_PWalking.cxx
View File

@ -721,7 +721,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
AddAPoint(line,previousPoint);
//
IntWalk_StatusDeflection Status = IntWalk_OK, aPrevStatus = IntWalk_OK;
IntWalk_StatusDeflection aStatus = IntWalk_OK, aPrevStatus = IntWalk_OK;
Standard_Boolean NoTestDeflection = Standard_False;
Standard_Real SvParam[4], f;
Standard_Integer LevelOfEmptyInmyIntersectionOn2S=0;
@ -736,7 +736,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
Arrive = Standard_False;
while(!Arrive) //010
{
aPrevStatus = Status;
aPrevStatus = aStatus;
LevelOfIterWithoutAppend++;
if(LevelOfIterWithoutAppend>20)
@ -856,7 +856,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
anAbsParamDist[1] < ResoV1 &&
anAbsParamDist[2] < ResoU2 &&
anAbsParamDist[3] < ResoV2 &&
Status != IntWalk_PasTropGrand)
aStatus != IntWalk_PasTropGrand)
{
isBadPoint = Standard_True;
aBestIso = IntImp_ConstIsoparametric((aBestIso + 1) % 4);
@ -930,7 +930,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
LevelOfEmptyInmyIntersectionOn2S=0;
if(LevelOfIterWithoutAppend < 10)
{
Status = TestDeflection(ChoixIso);
aStatus = TestDeflection(ChoixIso);
}
else
{
@ -947,11 +947,11 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
//============================================================
if(LevelOfPointConfondu > 5)
{
Status = IntWalk_ArretSurPoint;
aStatus = IntWalk_ArretSurPoint;
LevelOfPointConfondu = 0;
}
//
if(Status==IntWalk_OK)
if(aStatus==IntWalk_OK)
{
NbPasOKConseq++;
if(NbPasOKConseq >= 5)
@ -1026,12 +1026,12 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
}
while(pastroppetit);
}
}//Status==IntWalk_OK
}//aStatus==IntWalk_OK
else
NbPasOKConseq=0;
//
switch(Status)//007
switch(aStatus)//007
{
case IntWalk_ArretSurPointPrecedent:
{
@ -1150,7 +1150,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
// JMB 30th December 1999.
// Some statement below should not be put in comment because they are useful.
// See grid CTO 909 A1 which infinitely loops
if(Arrive==Standard_False && Status==IntWalk_ArretSurPoint)
if(Arrive==Standard_False && aStatus==IntWalk_ArretSurPoint)
{
Arrive=Standard_True;
#ifdef OCCT_DEBUG
@ -1238,7 +1238,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
}//pointisvalid
//====================================================
if(Status == IntWalk_ArretSurPoint)
if (aStatus == IntWalk_ArretSurPoint)
{
RepartirOuDiviser(DejaReparti,ChoixIso,Arrive);
}
@ -1608,7 +1608,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
}//$$$ end framing on border (!close)
}//004 fin TestArret return Arrive = True
} // 006case IntWalk_ArretSurPoint: end Processing Status = OK or ArretSurPoint
} //007 switch(Status)
} //007 switch(aStatus)
} //008 end processing point (TEST DEFLECTION)
} //009 end processing line (else if myIntersectionOn2S.IsDone())
} //010 end if first departure point allows marching while (!Arrive)
@ -1628,7 +1628,7 @@ Standard_Boolean IntWalk_PWalking::ExtendLineInCommonZone(const IntImp_ConstIsop
Standard_Boolean bStop = !myIntersectionOn2S.IsTangent();
Standard_Integer dIncKey = 1;
TColStd_Array1OfReal Param(1,4);
IntWalk_StatusDeflection Status = IntWalk_OK;
IntWalk_StatusDeflection aStatus = IntWalk_OK;
Standard_Integer nbIterWithoutAppend = 0;
Standard_Integer nbEqualPoints = 0;
Standard_Integer parit = 0;
@ -1690,9 +1690,9 @@ Standard_Boolean IntWalk_PWalking::ExtendLineInCommonZone(const IntImp_ConstIsop
return bOutOfTangentZone;
}
Status = TestDeflection(ChoixIso);
aStatus = TestDeflection(ChoixIso);
if(Status == IntWalk_OK) {
if(aStatus == IntWalk_OK) {
for(uvit = 0; uvit < 4; uvit++) {
if(pasuv[uvit] < pasInit[uvit]) {
@ -1701,7 +1701,7 @@ Standard_Boolean IntWalk_PWalking::ExtendLineInCommonZone(const IntImp_ConstIsop
}
}
switch(Status) {
switch(aStatus) {
case IntWalk_ArretSurPointPrecedent:
{
bStop = Standard_True;
@ -1907,8 +1907,8 @@ Standard_Boolean IntWalk_PWalking::ExtendLineInCommonZone(const IntImp_ConstIsop
}
if(!bExtendLine) {
// if(Status == IntWalk_OK || Status == IntWalk_ArretSurPoint) {
if(Status == IntWalk_OK) {
// if(aStatus == IntWalk_OK || aStatus == IntWalk_ArretSurPoint) {
if(aStatus == IntWalk_OK) {
bExtendLine = Standard_True;
if(aSeqOfNewPoint.Length() > 1) {
@ -2905,7 +2905,7 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso
STATIC_BLOCAGE_SUR_PAS_TROP_GRAND=STATIC_PRECEDENT_INFLEXION=0;
}
IntWalk_StatusDeflection Status = IntWalk_OK;
IntWalk_StatusDeflection aStatus = IntWalk_OK;
Standard_Real FlecheCourante , Ratio = 1.0;
// Caro1 and Caro2
@ -3020,7 +3020,7 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso
pasuv[choixIso] = pasInit[choixIso] = 2*LocalResol;
}
////////////////////////////////////////
Status = IntWalk_PointConfondu;
aStatus = IntWalk_PointConfondu;
}
//==================================================================================
@ -3097,7 +3097,7 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso
//== N o t T o o G r e a t (angle in space UV) ==
//== C h a n g e o f s i d e ==
//==================================================================================
if (Status != IntWalk_PointConfondu) {
if (aStatus != IntWalk_PointConfondu) {
if(Cosi1*Cosi1 < CosRef1*Duv1 || Cosi2*Cosi2 < CosRef2*Duv2) {
pasuv[0]*=0.5; pasuv[1]*=0.5; pasuv[2]*=0.5; pasuv[3]*=0.5;
if (pasuv[0]<ResoU1 && pasuv[1]<ResoV1 && pasuv[2]<ResoU2 && pasuv[3]<ResoV2) {
@ -3183,11 +3183,11 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso
return IntWalk_PasTropGrand;
}
}
if(Status == IntWalk_OK) {
if(aStatus == IntWalk_OK) {
STATIC_BLOCAGE_SUR_PAS_TROP_GRAND=0;
//-- Try to increase the step
}
return Status;
return aStatus;
}
else { //-- CurrentVector > vector*0.5
if (FlecheCourante > fleche) { //-- Current step too Great
@ -3206,7 +3206,7 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso
}
}
if(Status != IntWalk_PointConfondu)
if(aStatus != IntWalk_PointConfondu)
{
//Here, aCosBetweenTangent >= 0.0 definitely.
@ -3273,7 +3273,7 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso
if(aSinB2Max >= 0.0 && (aCosBetweenTangent <= 2.0 * aSinB2Max * aSinB2Max - 1.0))
{//Real deflection is greater or equal than tolconf
Status = IntWalk_PasTropGrand;
aStatus = IntWalk_PasTropGrand;
}
else
{//Real deflection is less than tolconf
@ -3282,17 +3282,17 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso
if((aSinB2Min < 0.0) || (aCosBetweenTangent >= 2.0 * aSinB2Min * aSinB2Min - 1.0))
{//Real deflection is less than tolconf/2.0
Status = IntWalk_StepTooSmall;
aStatus = IntWalk_StepTooSmall;
}
}
if(Status == IntWalk_PasTropGrand)
if(aStatus == IntWalk_PasTropGrand)
{
pasuv[0]*=0.5; pasuv[1]*=0.5; pasuv[2]*=0.5; pasuv[3]*=0.5;
return Status;
return aStatus;
}
if(Status == IntWalk_StepTooSmall)
if(aStatus == IntWalk_StepTooSmall)
{
pasuv[0] = Max(pasuv[0], AbsDu1);
pasuv[1] = Max(pasuv[1], AbsDv1);
@ -3304,7 +3304,7 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso
pasInit[2] = Max(pasInit[2], AbsDu2);
pasInit[3] = Max(pasInit[3], AbsDv2);
return Status;
return aStatus;
}
}
@ -3313,8 +3313,8 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso
pasuv[2] = Max(myStepMin[2],Min(Min(Ratio*AbsDu2,pasuv[2]),pasInit[2]));
pasuv[3] = Max(myStepMin[3],Min(Min(Ratio*AbsDv2,pasuv[3]),pasInit[3]));
if(Status == IntWalk_OK) STATIC_BLOCAGE_SUR_PAS_TROP_GRAND=0;
return Status;
if(aStatus == IntWalk_OK) STATIC_BLOCAGE_SUR_PAS_TROP_GRAND=0;
return aStatus;
}
Standard_Boolean IntWalk_PWalking::

4
src/Interface/Interface_Check.hxx
View File

@ -32,6 +32,10 @@ class Message_Msg;
class TCollection_HAsciiString;
class Message_Messenger;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class Interface_Check;
DEFINE_STANDARD_HANDLE(Interface_Check, MMgt_TShared)

4
src/Interface/Interface_CheckIterator.hxx
View File

@ -36,6 +36,10 @@ class Interface_Check;
class Standard_Transient;
class Message_Messenger;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! Result of a Check operation (especially from InterfaceModel)
class Interface_CheckIterator

9
src/Interface/Interface_Graph.hxx
View File

@ -24,21 +24,22 @@
#include <Interface_BitMap.hxx>
#include <Interface_InterfaceModel.hxx>
#include <TCollection_AsciiString.hxx>
#include <TCollection_HAsciiString.hxx>
#include <TColStd_HArray1OfInteger.hxx>
#include <TColStd_HArray1OfListOfInteger.hxx>
#include <TColStd_HSequenceOfTransient.hxx>
class Interface_InterfaceModel;
class Standard_DomainError;
class Interface_GeneralLib;
class Interface_Protocol;
class Interface_GTool;
class Standard_Transient;
class Interface_BitMap;
class Interface_EntityIterator;
class TCollection_HAsciiString;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! Gives basic data structure for operating and storing
//! graph results (usage is normally internal)

19
src/InterfaceGraphic/InterfaceGraphic.hxx
View File

@ -28,25 +28,18 @@
#include <stdio.h>
// exclude modern definitions and system-provided glext.h, should be defined before gl.h inclusion
#define GL_GLEXT_LEGACY
#define GLX_GLXEXT_LEGACY
#ifndef GL_GLEXT_LEGACY
#define GL_GLEXT_LEGACY
#endif
#ifndef GLX_GLXEXT_LEGACY
#define GLX_GLXEXT_LEGACY
#endif
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <GL/glx.h>
// workaround name conflicts with OCCT methods (in class TopoDS_Shape for example)
#ifdef Convex
#undef Convex
#endif
#ifdef Status
#undef Status
#endif
#ifdef Opposite
#undef Opposite
#endif
#endif
#endif // __INTERFACE_GRAPHIC_HXX

12
src/LProp/LProp_SLProps.gxx
View File

@ -29,7 +29,7 @@ static Standard_Boolean IsTangentDefined (LProp_SLProps& SProp,
const Standard_Real linTol,
const Standard_Integer Derivative,
Standard_Integer& Order,
LProp_Status& Status)
LProp_Status& theStatus)
{
Standard_Real Tol = linTol * linTol;
gp_Vec V[2];
@ -54,13 +54,13 @@ static Standard_Boolean IsTangentDefined (LProp_SLProps& SProp,
if(V[Derivative].SquareMagnitude() > Tol)
{
Status = LProp_Defined;
theStatus = LProp_Defined;
return Standard_True;
}
}//if(cn >= Order)
else
{
Status = LProp_Undefined;
theStatus = LProp_Undefined;
return Standard_False;
}
}
@ -324,9 +324,9 @@ Standard_Boolean LProp_SLProps::IsNormalDefined()
// status = UnDecided
// first try the standard computation of the normal.
CSLib_DerivativeStatus Status;
CSLib::Normal(myD1u, myD1v, myLinTol, Status, myNormal);
if (Status == CSLib_Done )
CSLib_DerivativeStatus aStatus = CSLib_Done;
CSLib::Normal(myD1u, myD1v, myLinTol, aStatus, myNormal);
if (aStatus == CSLib_Done)
{
myNormalStatus = LProp_Computed;
return Standard_True;

6
src/MeshTest/MeshTest.cxx
View File

@ -1422,7 +1422,7 @@ static Standard_Integer wavefront(Draw_Interpretor&, Standard_Integer nbarg, con
gp_Dir Nor;
gp_Pnt P;
Standard_Real U, V;
CSLib_DerivativeStatus Status;
CSLib_DerivativeStatus aStatus;
CSLib_NormalStatus NStat;
Standard_Real x, y, z;
Standard_Integer n1, n2, n3;
@ -1473,8 +1473,8 @@ static Standard_Integer wavefront(Draw_Interpretor&, Standard_Integer nbarg, con
V = UVNodes(i).Y();
BS.D1(U,V,P,D1U,D1V);
CSLib::Normal(D1U,D1V,Precision::Angular(),Status,Nor);
if (Status != CSLib_Done) {
CSLib::Normal (D1U, D1V, Precision::Angular(), aStatus, Nor);
if (aStatus != CSLib_Done) {
BS.D2(U,V,P,D1U,D1V,D2U,D2V,D2UV);
CSLib::Normal(D1U,D1V,D2U,D2V,D2UV,Precision::Angular(),OK,NStat,Nor);
}

4
src/Message/Message_Messenger.hxx
View File

@ -30,6 +30,10 @@ class Message_Printer;
class TCollection_AsciiString;
class TCollection_ExtendedString;
// resolve name collisions with WinAPI headers
#ifdef AddPrinter
#undef AddPrinter
#endif
class Message_Messenger;
DEFINE_STANDARD_HANDLE(Message_Messenger, MMgt_TShared)

3
src/OSD/OSD_Process.cxx
View File

@ -181,9 +181,6 @@ Standard_Integer OSD_Process::Error()const{
#endif
#include <windows.h>
#ifdef SetCurrentDirectory
# undef SetCurrentDirectory /* undefine SetCurrentDirectory from <winbase.h> to correctly include <OSD_Process.hxx> */
#endif
#include <OSD_Process.hxx>
#include <OSD_Path.hxx>

4
src/OSD/OSD_Process.hxx
View File

@ -29,6 +29,10 @@ class TCollection_AsciiString;
class Quantity_Date;
class OSD_Path;
// undefine SetCurrentDirectory that can be #defined by previous inclusion of windows.h
#ifdef SetCurrentDirectory
# undef SetCurrentDirectory
#endif
//! A set of system process tools
class OSD_Process

8
src/OpenGl/OpenGl_GlFunctions.hxx
View File

@ -36,8 +36,12 @@
#endif
// exclude modern definitions and system-provided glext.h, should be defined before gl.h inclusion
#define GL_GLEXT_LEGACY
#define GLX_GLXEXT_LEGACY
#ifndef GL_GLEXT_LEGACY
#define GL_GLEXT_LEGACY
#endif
#ifndef GLX_GLXEXT_LEGACY
#define GLX_GLXEXT_LEGACY
#endif
// include main OpenGL header provided with system
#if defined(__APPLE__)

6
src/QABugs/QABugs_18.cxx
View File

@ -152,7 +152,7 @@ static Standard_Integer OCC367 (Draw_Interpretor& di, Standard_Integer argc, con
Standard_Real goodY = Draw::Atof(argv[4]);
Standard_Real goodZ = Draw::Atof(argv[5]);
Standard_Real percent = Draw::Atof(argv[6]);
Standard_Boolean Status = Standard_False;
Standard_Boolean aStatus = Standard_False;
// Find the first vertex of the wire
BRepTools_WireExplorer wire_exp(myTopoDSWire);
@ -221,14 +221,14 @@ static Standard_Integer OCC367 (Draw_Interpretor& di, Standard_Integer argc, con
deltaY = delta_percent(FirstEdgeY, goodY);
deltaZ = delta_percent(FirstEdgeZ, goodZ);
if (deltaX <= percent && deltaY <= percent && deltaZ <= percent) {
Status = Standard_True;
aStatus = Standard_True;
}
}
}
}
di << "\n\nFirstEdge = " << FirstEdgeX <<" " << FirstEdgeY <<" " << FirstEdgeZ << "\n";
di << "deltaX = " << deltaX << " deltaY = " << deltaY << " deltaZ = " << deltaZ << "\n";
if (Status) {
if (aStatus) {
di << argv[0] << " : OK\n";
} else {
di << argv[0] << " : ERROR\n";

2
src/QABugs/QABugs_20.cxx
View File

@ -1281,7 +1281,7 @@ namespace AllocTest
// The test is based of occupying of all available virtual memory.
// Obviously it has no sense on 64-bit platforms.
enum Status
enum AllocTestStatus
{
NotApplicable = 0x1,
OUMCatchOK = 0x2,

10
src/QADNaming/QADNaming.cxx
View File

@ -107,9 +107,9 @@ TopoDS_Shape QADNaming::CurrentShape (const Standard_CString LabelName,
TCollection_AsciiString QADNaming::GetEntry (const TopoDS_Shape& Shape,
const Handle(TDF_Data)& DF,
Standard_Integer& Status)
Standard_Integer& theStatus)
{
Status = 0;
theStatus = 0;
//Handle(TNaming_UsedShapes) US;
//DF->Root().FindAttribute(TNaming_UsedShapes::GetID(),US);
@ -119,11 +119,11 @@ TCollection_AsciiString QADNaming::GetEntry (const TopoDS_Shape& Shape,
Standard_Integer Transdef;
TDF_Label Lab = TNaming_Tool::Label (DF->Root(), Shape,Transdef);
TCollection_AsciiString entry; TDF_Tool::Entry(Lab,entry);
//Update Status;
//Update theStatus;
TNaming_Iterator it(Lab,DF->Transaction());
for (; it.More(); it.Next()) {
Status++;
if (Status == 2) break;
theStatus++;
if (theStatus == 2) break;
}
return entry;
}

8
src/QADNaming/QADNaming.hxx
View File

@ -45,10 +45,10 @@ public:
Standard_EXPORT static void GetShape (const Standard_CString ShapeEntry, const Handle(TDF_Data)& Data, TopTools_ListOfShape& Shapes);
//! Status = 0 Not found,
//! Status = 1 One shape,
//! Status = 2 More than one shape.
Standard_EXPORT static TCollection_AsciiString GetEntry (const TopoDS_Shape& Shape, const Handle(TDF_Data)& Data, Standard_Integer& Status);
//! theStatus = 0 Not found,
//! theStatus = 1 One shape,
//! theStatus = 2 More than one shape.
Standard_EXPORT static TCollection_AsciiString GetEntry (const TopoDS_Shape& Shape, const Handle(TDF_Data)& Data, Standard_Integer& theStatus);
//! returns label by first two arguments (df and entry string)
Standard_EXPORT static Standard_Boolean Entry (const Standard_Address theArguments, TDF_Label& theLabel);

17
src/QADNaming/QADNaming_BasicCommands.cxx
View File

@ -160,14 +160,14 @@ static Standard_Integer Getentry (Draw_Interpretor& di, Standard_Integer n, cons
di << 0;
return 0;
}
Standard_Integer Status ;
TCollection_AsciiString Name = QADNaming::GetEntry(S,ND,Status);
if (Status == 0) {
Standard_Integer aStatus = 0;
TCollection_AsciiString Name = QADNaming::GetEntry (S, ND, aStatus);
if (aStatus == 0) {
di <<"E_NoName";
}
else {
di <<Name.ToCString();
if (Status == 2) {
if (aStatus == 2) {
di <<"Several shapes have the same name\n";
}
}
@ -429,15 +429,14 @@ static Standard_Integer Getcreationentry (Draw_Interpretor& di, Standard_Integer
di <<"E_NoName";
return 0;
}
Standard_Integer Status ;
TCollection_AsciiString Name = QADNaming::GetEntry(S,ND,Status);
if (Status == 0) {
Standard_Integer aStatus = 0;
TCollection_AsciiString Name = QADNaming::GetEntry (S, ND, aStatus);
if (aStatus == 0) {
di <<"E_NoName";
}
else {
di <<Name.ToCString();
if (Status == 2) {
if (aStatus == 2) {
di <<"Several shapes have the same name\n";
}
}

16
src/Resource/Resource_Manager.cxx
View File

@ -255,7 +255,7 @@ Standard_Boolean Resource_Manager::Save() const
TCollection_AsciiString aFilePath(dir);
OSD_Path anOSDPath(aFilePath);
OSD_Directory Dir = anOSDPath;
Standard_Boolean Status = Standard_True;
Standard_Boolean aStatus = Standard_True;
if ( !Dir.Exists() ) {
{
try {
@ -263,11 +263,11 @@ Standard_Boolean Resource_Manager::Save() const
Dir.Build(OSD_Protection(OSD_RX, OSD_RWXD, OSD_RX, OSD_RX));
}
catch (Standard_Failure) {
Status = Standard_False;
aStatus = Standard_False;
}
}
Status = Status && !Dir.Failed();
if (!Status) {
aStatus = aStatus && !Dir.Failed();
if (!aStatus) {
if (myVerbose)
cout << "Resource Manager: Error opening or creating directory \"" << aFilePath
<< "\". Permission denied. Cannot save resources." << endl;
@ -285,18 +285,18 @@ Standard_Boolean Resource_Manager::Save() const
OSD_File File = anOSDPath;
OSD_Protection theProt;
Status = Standard_True;
aStatus = Standard_True;
{
try {
OCC_CATCH_SIGNALS
File.Build(OSD_ReadWrite, theProt);
}
catch (Standard_Failure) {
Status = Standard_False;
aStatus = Standard_False;
}
}
Status = Status && !File.Failed();
if (!Status) {
aStatus = aStatus && !File.Failed();
if (!aStatus) {
if (myVerbose)
cout << "Resource Manager: Error opening or creating file \"" << aFilePath
<< "\". Permission denied. Cannot save resources." << endl;

4
src/SelectMgr/SelectMgr_ViewerSelector.hxx
View File

@ -37,6 +37,10 @@ class SelectMgr_SensitiveEntitySet;
class SelectMgr_EntityOwner;
class SelectBasics_SensitiveEntity;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
typedef NCollection_DataMap<Handle(SelectMgr_SelectableObject), Handle(SelectMgr_SensitiveEntitySet) > SelectMgr_MapOfObjectSensitives;
typedef NCollection_DataMap<Handle(SelectMgr_SelectableObject), Handle(SelectMgr_SensitiveEntitySet) >::Iterator SelectMgr_MapOfObjectSensitivesIterator;

4
src/ShapeAnalysis/ShapeAnalysis_BoxBndTree.hxx
View File

@ -84,8 +84,8 @@ class ShapeAnalysis_BoxBndTreeSelector
Standard_Boolean ContWire(Standard_Integer nbWire)
{ return myList.Contains(nbWire); }
inline Standard_Boolean LastCheckStatus (const ShapeExtend_Status Status) const
{ return ShapeExtend::DecodeStatus ( myStatus, Status ); }
inline Standard_Boolean LastCheckStatus (const ShapeExtend_Status theStatus) const
{ return ShapeExtend::DecodeStatus ( myStatus, theStatus ); }
Standard_Boolean Reject (const Bnd_Box& theBnd) const;
Standard_Boolean Accept (const Standard_Integer &);

4
src/ShapeAnalysis/ShapeAnalysis_CheckSmallFace.hxx
View File

@ -34,6 +34,10 @@ class gp_Pnt;
class TopoDS_Edge;
class TopoDS_Compound;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! Analysis of the face size
class ShapeAnalysis_CheckSmallFace

4
src/ShapeAnalysis/ShapeAnalysis_Edge.hxx
View File

@ -37,6 +37,10 @@ class gp_Vec2d;
class gp_Pnt;
class Adaptor3d_Curve;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! Tool for analyzing the edge.
//! Queries geometrical representations of the edge (3d curve, pcurve

5
src/ShapeAnalysis/ShapeAnalysis_Wire.hxx
View File

@ -35,7 +35,6 @@
class ShapeExtend_WireData;
class ShapeAnalysis_Surface;
class TopoDS_Wire;
class TopoDS_Face;
class Geom_Surface;
class TopLoc_Location;
class ShapeAnalysis_WireOrder;
@ -44,6 +43,10 @@ class gp_Pnt2d;
class TopoDS_Shape;
class TopoDS_Edge;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeAnalysis_Wire;
DEFINE_STANDARD_HANDLE(ShapeAnalysis_Wire, MMgt_TShared)

4
src/ShapeAnalysis/ShapeAnalysis_WireOrder.hxx
View File

@ -30,6 +30,10 @@ class Standard_TypeMismatch;
class gp_XYZ;
class gp_XY;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! This class is intended to control and, if possible, redefine
//! the order of a list of edges which define a wire

4
src/ShapeAnalysis/ShapeAnalysis_WireVertex.hxx
View File

@ -31,6 +31,10 @@ class ShapeExtend_WireData;
class TopoDS_Wire;
class gp_XYZ;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! Analyzes and records status of vertices in a Wire
//!

4
src/ShapeBuild/ShapeBuild_ReShape.hxx
View File

@ -27,6 +27,10 @@
#include <ShapeExtend_Status.hxx>
class TopoDS_Shape;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeBuild_ReShape;
DEFINE_STANDARD_HANDLE(ShapeBuild_ReShape, BRepTools_ReShape)

4
src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx
View File

@ -195,9 +195,9 @@ static Standard_Integer NbSurfIntervals(const Handle(GeomAdaptor_HSurface)& GAS,
//purpose :
//=======================================================================
Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::Status (const ShapeExtend_Status Status) const
Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::Status (const ShapeExtend_Status theStatus) const
{
return ShapeExtend::DecodeStatus (myStatus, Status);
return ShapeExtend::DecodeStatus (myStatus, theStatus);
}
//=======================================================================

7
src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.hxx
View File

@ -38,8 +38,11 @@ class ShapeAnalysis_Surface;
class Geom_Surface;
class Geom_Curve;
class Geom2d_Curve;
class gp_Pnt2d;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeConstruct_ProjectCurveOnSurface;
DEFINE_STANDARD_HANDLE(ShapeConstruct_ProjectCurveOnSurface, MMgt_TShared)
@ -99,7 +102,7 @@ public:
Standard_EXPORT Standard_Integer& AdjustOverDegenMode();
//! Returns the status of last Peform
Standard_EXPORT Standard_Boolean Status (const ShapeExtend_Status Status) const;
Standard_EXPORT Standard_Boolean Status (const ShapeExtend_Status theStatus) const;
//! Computes the projection of 3d curve onto a surface using the
//! specialized algorithm. Returns False if projector fails,

7
src/ShapeFix/ShapeFix_ComposeShell.hxx
View File

@ -35,14 +35,15 @@
#include <TopTools_SequenceOfShape.hxx>
class ShapeExtend_CompositeSurface;
class ShapeAnalysis_TransferParameters;
class TopLoc_Location;
class TopoDS_Face;
class TopoDS_Shape;
class ShapeExtend_WireData;
class gp_Lin2d;
class ShapeFix_WireSegment;
class Geom_Surface;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeFix_ComposeShell;
DEFINE_STANDARD_HANDLE(ShapeFix_ComposeShell, ShapeFix_Root)

5
src/ShapeFix/ShapeFix_Edge.hxx
View File

@ -33,6 +33,11 @@ class TopLoc_Location;
class ShapeAnalysis_Surface;
class ShapeBuild_ReShape;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeFix_Edge;
DEFINE_STANDARD_HANDLE(ShapeFix_Edge, MMgt_TShared)

5
src/ShapeFix/ShapeFix_Face.hxx
View File

@ -32,13 +32,16 @@
#include <ShapeExtend_Status.hxx>
class ShapeAnalysis_Surface;
class ShapeFix_Wire;
class TopoDS_Face;
class Geom_Surface;
class ShapeExtend_BasicMsgRegistrator;
class TopoDS_Wire;
class ShapeExtend_WireData;
class TopoDS_Vertex;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeFix_Face;
DEFINE_STANDARD_HANDLE(ShapeFix_Face, ShapeFix_Root)

5
src/ShapeFix/ShapeFix_Shape.hxx
View File

@ -31,7 +31,6 @@
#include <Message_ProgressIndicator.hxx>
class ShapeFix_Solid;
class TopoDS_Shape;
class Message_ProgressIndicator;
class ShapeFix_Shell;
class ShapeFix_Face;
@ -39,6 +38,10 @@ class ShapeFix_Wire;
class ShapeFix_Edge;
class ShapeExtend_BasicMsgRegistrator;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeFix_Shape;
DEFINE_STANDARD_HANDLE(ShapeFix_Shape, ShapeFix_Root)

8
src/ShapeFix/ShapeFix_Shell.hxx
View File

@ -26,11 +26,13 @@
#include <ShapeExtend_Status.hxx>
class ShapeFix_Face;
class TopoDS_Shell;
class TopoDS_Shape;
class TopoDS_Compound;
class ShapeExtend_BasicMsgRegistrator;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeFix_Shell;
DEFINE_STANDARD_HANDLE(ShapeFix_Shell, ShapeFix_Root)

5
src/ShapeFix/ShapeFix_Solid.hxx
View File

@ -30,9 +30,12 @@ class ShapeFix_Shell;
class TopoDS_Solid;
class Message_ProgressIndicator;
class TopoDS_Shell;
class TopoDS_Shape;
class ShapeExtend_BasicMsgRegistrator;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeFix_Solid;
DEFINE_STANDARD_HANDLE(ShapeFix_Solid, ShapeFix_Root)

7
src/ShapeUpgrade/ShapeUpgrade_FaceDivide.hxx
View File

@ -21,16 +21,17 @@
#include <Standard_Type.hxx>
#include <TopoDS_Face.hxx>
#include <TopoDS_Shape.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Integer.hxx>
#include <ShapeUpgrade_Tool.hxx>
#include <ShapeExtend_Status.hxx>
class ShapeUpgrade_SplitSurface;
class ShapeUpgrade_WireDivide;
class TopoDS_Face;
class TopoDS_Shape;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeUpgrade_FaceDivide;
DEFINE_STANDARD_HANDLE(ShapeUpgrade_FaceDivide, ShapeUpgrade_Tool)

6
src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.hxx
View File

@ -28,11 +28,13 @@
#include <ShapeExtend_Status.hxx>
class ShapeUpgrade_SplitCurve3d;
class ShapeUpgrade_SplitCurve2d;
class TopoDS_Edge;
class TopoDS_Face;
class Geom_Curve;
class Geom2d_Curve;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeUpgrade_FixSmallCurves;
DEFINE_STANDARD_HANDLE(ShapeUpgrade_FixSmallCurves, ShapeUpgrade_Tool)

5
src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.hxx
View File

@ -28,8 +28,11 @@
#include <Standard_Integer.hxx>
#include <ShapeUpgrade_Tool.hxx>
#include <ShapeExtend_Status.hxx>
class TopoDS_Shape;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeUpgrade_RemoveInternalWires;
DEFINE_STANDARD_HANDLE(ShapeUpgrade_RemoveInternalWires, ShapeUpgrade_Tool)

5
src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.hxx
View File

@ -30,9 +30,12 @@
class ShapeUpgrade_FaceDivide;
class ShapeBuild_ReShape;
class ShapeExtend_BasicMsgRegistrator;
class TopoDS_Shape;
class Message_Msg;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! Divides a all faces in shell with given criteria Shell.
class ShapeUpgrade_ShapeDivide

4
src/ShapeUpgrade/ShapeUpgrade_SplitCurve.hxx
View File

@ -27,6 +27,10 @@
#include <Standard_Boolean.hxx>
#include <ShapeExtend_Status.hxx>
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeUpgrade_SplitCurve;
DEFINE_STANDARD_HANDLE(ShapeUpgrade_SplitCurve, MMgt_TShared)

4
src/ShapeUpgrade/ShapeUpgrade_SplitSurface.hxx
View File

@ -29,6 +29,10 @@
class Geom_Surface;
class ShapeExtend_CompositeSurface;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeUpgrade_SplitSurface;
DEFINE_STANDARD_HANDLE(ShapeUpgrade_SplitSurface, MMgt_TShared)

6
src/ShapeUpgrade/ShapeUpgrade_WireDivide.hxx
View File

@ -31,12 +31,14 @@ class ShapeUpgrade_SplitCurve2d;
class ShapeUpgrade_EdgeDivide;
class ShapeAnalysis_TransferParameters;
class ShapeUpgrade_FixSmallCurves;
class TopoDS_Wire;
class TopoDS_Face;
class Geom_Surface;
class TopoDS_Edge;
class TopLoc_Location;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeUpgrade_WireDivide;
DEFINE_STANDARD_HANDLE(ShapeUpgrade_WireDivide, ShapeUpgrade_Tool)

4
src/StepBasic/StepBasic_ApplicationProtocolDefinition.hxx
View File

@ -25,6 +25,10 @@
class TCollection_HAsciiString;
class StepBasic_ApplicationContext;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class StepBasic_ApplicationProtocolDefinition;
DEFINE_STANDARD_HANDLE(StepBasic_ApplicationProtocolDefinition, MMgt_TShared)

4
src/StepBasic/StepBasic_Approval.hxx
View File

@ -24,6 +24,10 @@
class StepBasic_ApprovalStatus;
class TCollection_HAsciiString;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class StepBasic_Approval;
DEFINE_STANDARD_HANDLE(StepBasic_Approval, MMgt_TShared)

10
src/StlTransfer/StlTransfer.cxx
View File

@ -59,7 +59,7 @@ static void Normal(const TopoDS_Face& aFace,
gp_Vec D2U,D2V,D2UV;
gp_Pnt P;
Standard_Real U, V;
CSLib_DerivativeStatus Status;
CSLib_DerivativeStatus aStatus;
CSLib_NormalStatus NStat;
S.Initialize(aFace, Standard_False);
const TColgp_Array1OfPnt2d& UVNodes = T->UVNodes();
@ -68,8 +68,8 @@ static void Normal(const TopoDS_Face& aFace,
U = UVNodes(i).X();
V = UVNodes(i).Y();
S.D1(U,V,P,D1U,D1V);
CSLib::Normal(D1U,D1V,Precision::Angular(),Status,Nor(i));
if (Status != CSLib_Done) {
CSLib::Normal (D1U, D1V, Precision::Angular(), aStatus, Nor (i));
if (aStatus != CSLib_Done) {
S.D2(U,V,P,D1U,D1V,D2U,D2V,D2UV);
CSLib::Normal(D1U,D1V,D2U,D2V,D2UV,Precision::Angular(),OK,NStat,Nor(i));
}
@ -81,8 +81,8 @@ static void Normal(const TopoDS_Face& aFace,
U = UVNodes(UVNodes.Lower()).X();
V = UVNodes(UVNodes.Lower()).Y();
S.D1(U,V,P,D1U,D1V);
CSLib::Normal(D1U,D1V,Precision::Angular(),Status,NPlane);
if (Status != CSLib_Done) {
CSLib::Normal (D1U, D1V, Precision::Angular(), aStatus, NPlane);
if (aStatus != CSLib_Done) {
S.D2(U,V,P,D1U,D1V,D2U,D2V,D2UV);
CSLib::Normal(D1U,D1V,D2U,D2V,D2UV,Precision::Angular(),OK,NStat,NPlane);
}

8
src/TNaming/TNaming_NamedShape.cxx
View File

@ -480,18 +480,18 @@ const
for ( ;It.More() ; It.Next()) {
const TopoDS_Shape& OS = It.OldShape();
const TopoDS_Shape& NS = It.NewShape();
TNaming_Evolution Status = It.Evolution();
TNaming_Evolution aStatus = It.Evolution();
// Modification_1 24.06.99 (szy)
TopoDS_Shape copOS, copNS;
if(Status != TNaming_PRIMITIVE)
if(aStatus != TNaming_PRIMITIVE)
TNaming_CopyShape::CopyTool(OS, Tab->TransientTable(), copOS);
else copOS.Nullify();
if(Status != TNaming_DELETE )
if(aStatus != TNaming_DELETE )
TNaming_CopyShape::CopyTool(NS, Tab->TransientTable(), copNS);
else copNS.Nullify();
switch (Status) {
switch (aStatus) {
case TNaming_PRIMITIVE :
{
B.Generated(copNS);

10
src/TopOpeBRep/TopOpeBRep_Point2d.hxx
View File

@ -34,13 +34,11 @@
class TopOpeBRep_Hctxff2d;
class TopOpeBRep_Hctxee2d;
class TopOpeBRep_EdgesIntersector;
class IntRes2d_IntersectionPoint;
class TopoDS_Vertex;
class TopOpeBRepDS_Transition;
class gp_Pnt;
class gp_Pnt2d;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class TopOpeBRep_Point2d
{

4
src/TopOpeBRepBuild/FILES
View File

@ -41,7 +41,7 @@ TopOpeBRepBuild_FaceBuilder.hxx
TopOpeBRepBuild_fctwes.cxx
TopOpeBRepBuild_ffsfs.cxx
TopOpeBRepBuild_ffwesk.cxx
TopOpeBRepBuild_Fill.hxx
TopOpeBRepBuild_Fill.pxx
TopOpeBRepBuild_FREGU.cxx
TopOpeBRepBuild_FuseFace.cxx
TopOpeBRepBuild_FuseFace.hxx
@ -111,7 +111,7 @@ TopOpeBRepBuild_SolidBuilder.hxx
TopOpeBRepBuild_SplitEdge.hxx
TopOpeBRepBuild_SplitFace.hxx
TopOpeBRepBuild_SplitShapes.hxx
TopOpeBRepBuild_SplitSolid.hxx
TopOpeBRepBuild_SplitSolid.pxx
TopOpeBRepBuild_SREGU.cxx
TopOpeBRepBuild_Tools.cxx
TopOpeBRepBuild_Tools.hxx

4
src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cxx
View File

@ -75,9 +75,9 @@ Standard_EXPORT void debchangesplit(const Standard_Integer i) {cout<<"++ debchan
static Standard_Integer STATIC_SOLIDINDEX = 0;
#include <TopOpeBRepBuild_SplitEdge.hxx>
#include <TopOpeBRepBuild_SplitFace.hxx>
#include <TopOpeBRepBuild_SplitSolid.hxx>
#include "TopOpeBRepBuild_SplitSolid.pxx"
#include <TopOpeBRepBuild_SplitShapes.hxx>
#include <TopOpeBRepBuild_Fill.hxx>
#include "TopOpeBRepBuild_Fill.pxx"
Standard_EXPORT TopOpeBRepBuild_Builder* GLOBAL_PBUILDER;

9
src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.hxx
View File

@ -52,8 +52,6 @@
class TopOpeBRepDS_HDataStructure;
class Standard_NoSuchObject;
class TopOpeBRepBuild_HBuilder;
class TopOpeBRepDS_BuildTool;
class TopoDS_Shape;
class TopOpeBRepTool_ShapeExplorer;
class TopOpeBRepBuild_ShapeSet;
class TopOpeBRepBuild_EdgeBuilder;
@ -67,11 +65,12 @@ class TopOpeBRepBuild_ShellFaceSet;
class TopOpeBRepDS_SurfaceIterator;
class TopOpeBRepDS_CurveIterator;
class TopoDS_Vertex;
class TopoDS_Edge;
class gp_Pnt;
class TopoDS_Face;
class TCollection_AsciiString;
// resolve name collisions with X11 headers
#ifdef FillSolid
#undef FillSolid
#endif
//! The Builder algorithm constructs topological
//! objects from an existing topology and new

0
src/TopOpeBRepBuild/TopOpeBRepBuild_Fill.hxx → src/TopOpeBRepBuild/TopOpeBRepBuild_Fill.pxx
View File

0
src/TopOpeBRepBuild/TopOpeBRepBuild_SplitSolid.hxx → src/TopOpeBRepBuild/TopOpeBRepBuild_SplitSolid.pxx
View File

8
src/TopoDS/TopoDS_Shape.hxx
View File

@ -27,11 +27,11 @@
#include <TopAbs_ShapeEnum.hxx>
#include <Standard_Integer.hxx>
class TopoDS_TShape;
class Standard_NullObject;
class Standard_DomainError;
class Standard_TypeMismatch;
class TopLoc_Location;
// resolve name collisions with X11 headers
#ifdef Convex
#undef Convex
#endif
//! Describes a shape which
//! - references an underlying shape with the potential

6
src/TopoDS/TopoDS_TShape.hxx
View File

@ -25,10 +25,14 @@
#include <MMgt_TShared.hxx>
#include <Standard_Boolean.hxx>
#include <TopAbs_ShapeEnum.hxx>
class Standard_ConstructionError;
class TopoDS_Iterator;
class TopoDS_Builder;
// resolve name collisions with X11 headers
#ifdef Convex
#undef Convex
#endif
class TopoDS_TShape;
DEFINE_STANDARD_HANDLE(TopoDS_TShape, MMgt_TShared)

6
src/TopoDS/TopoDS_TVertex.hxx
View File

@ -25,6 +25,12 @@
class TopoDS_TVertex;
// resolve name collisions with X11 headers
#ifdef Convex
#undef Convex
#endif
DEFINE_STANDARD_HANDLE(TopoDS_TVertex, TopoDS_TShape)
//! A Vertex is a topological point in two or three

4
src/Transfer/Transfer_Binder.hxx
View File

@ -29,6 +29,10 @@
class Interface_Check;
class Transfer_TransferFailure;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class Transfer_Binder;
DEFINE_STANDARD_HANDLE(Transfer_Binder, MMgt_TShared)

4
src/Transfer/Transfer_TransferIterator.hxx
View File

@ -32,6 +32,10 @@ class Transfer_Binder;
class Standard_Transient;
class Interface_Check;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! Defines an Iterator on the result of a Transfer
//! Available for Normal Results or not (Erroneous Transfer)

6
src/VrmlConverter/VrmlConverter_ShadedShape.cxx
View File

@ -387,7 +387,7 @@ void VrmlConverter_ShadedShape::ComputeNormal(const TopoDS_Face& aFace,
gp_Vec D2U,D2V,D2UV;
gp_Pnt P;
Standard_Real U, V;
CSLib_DerivativeStatus Status;
CSLib_DerivativeStatus aStatus;
CSLib_NormalStatus NStat;
S.Initialize(aFace);
const TColgp_Array1OfPnt2d& UVNodes = T->UVNodes();
@ -395,8 +395,8 @@ void VrmlConverter_ShadedShape::ComputeNormal(const TopoDS_Face& aFace,
U = UVNodes(i).X();
V = UVNodes(i).Y();
S.D1(U,V,P,D1U,D1V);
CSLib::Normal(D1U,D1V,Precision::Angular(),Status,Nor(i));
if (Status != CSLib_Done) {
CSLib::Normal(D1U,D1V,Precision::Angular(),aStatus,Nor(i));
if (aStatus != CSLib_Done) {
S.D2(U,V,P,D1U,D1V,D2U,D2V,D2UV);
CSLib::Normal(D1U,D1V,D2U,D2V,D2UV,Precision::Angular(),OK,NStat,Nor(i));
}

5
src/VrmlData/VrmlData_Scene.hxx
View File

@ -29,6 +29,11 @@
#include <Standard_Mutex.hxx>
#include <VrmlData_DataMapOfShapeAppearance.hxx>
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
struct VrmlData_InBuffer;
/**

4
src/gce/gce_Root.hxx
View File

@ -24,6 +24,10 @@
#include <gce_ErrorType.hxx>
#include <Standard_Boolean.hxx>
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! This class implements the common services for
//! all classes of gce which report error.

Some files were not shown because too many files have changed in this diff Show More