0028838: Configuration - undefine macros coming from X11 headers in place of collision
[occt.git] / src / IntWalk / IntWalk_IWalking_3.gxx
index 203ee5f..0ae3d93 100644 (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 --;
             }