0027772: Foundation Classes - define Standard_Boolean using C++ type "bool" instead...

[occt.git] / src / TopOpeBRep / TopOpeBRep_FFTransitionTool.cxx

diff --git a/src/TopOpeBRep/TopOpeBRep_FFTransitionTool.cxx b/src/TopOpeBRep/TopOpeBRep_FFTransitionTool.cxx
index 0f20691..5df87f7 100644 (file)
--- a/src/TopOpeBRep/TopOpeBRep_FFTransitionTool.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_FFTransitionTool.cxx
@@ -14,26 +14,27 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <TopOpeBRepDS_SolidSurfaceInterference.hxx>
-#include <TopOpeBRepDS_CurvePointInterference.hxx>
-#include <TopOpeBRepDS_SurfaceCurveInterference.hxx>
-#include <TopAbs.hxx>
-#include <IntSurf_Transition.hxx>
-#include <IntSurf_TypeTrans.hxx>
-#include <IntSurf_Situation.hxx>
-#include <TopOpeBRep_FFTransitionTool.ixx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS.hxx>
+
 #include <BRep_Tool.hxx>
-#include <Geom_Surface.hxx>
 #include <Geom_Curve.hxx>
+#include <Geom_Surface.hxx>
 #include <GeomAPI_ProjectPointOnCurve.hxx>
 #include <gp_Vec.hxx>
-
-#ifdef DEB
-extern Standard_Boolean TopOpeBRepDS_GettraceDSF();
-#endif
+#include <IntSurf_Situation.hxx>
+#include <IntSurf_Transition.hxx>
+#include <IntSurf_TypeTrans.hxx>
+#include <TopAbs.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopOpeBRep_FFTransitionTool.hxx>
+#include <TopOpeBRep_LineInter.hxx>
+#include <TopOpeBRep_VPointInter.hxx>
+#include <TopOpeBRepDS_CurvePointInterference.hxx>
+#include <TopOpeBRepDS_SolidSurfaceInterference.hxx>
+#include <TopOpeBRepDS_SurfaceCurveInterference.hxx>
+#include <TopOpeBRepDS_Transition.hxx>
 
 //-----------------------------------------------------------------------
 //function : TransitionToOrientation
@@ -63,22 +64,12 @@ static Standard_Boolean TransitionToOrientation
     case IntSurf_Outside : result = TopAbs_EXTERNAL; break;
     case IntSurf_Unknown :
     Odefined = Standard_False;
-#ifdef DEB
-//    if ( TopOpeBRepDS_GettraceDSF() ) { 
-//      cout<<"TopOpeBRepDS:TransitionToOrientation : unknown situation"<<endl;
-//    }
-#endif
     break;
     }
     break;
 
   case IntSurf_Undecided :
   Odefined = Standard_False;
-#ifdef DEB
-//  if ( TopOpeBRepDS_GettraceDSF() ) { 
-//    cout<<"TopOpeBRepDS:TransitionToOrientation : undecided transition"<<endl;
-//  }
-#endif
   break;
   }
 
@@ -239,25 +230,14 @@ TopOpeBRepDS_Transition TopOpeBRep_FFTransitionTool::ProcessFaceTransition
       case IntSurf_Unknown :
 
        Odefined = Standard_False;
-#ifdef DEB
-       if ( TopOpeBRepDS_GettraceDSF() ) { 
-         cout<<"ProcessFaceTransition : unknown situation"<<endl;
-       }
-#endif
        break;
       }
       break;
       } // case Touch
 
     case IntSurf_Undecided :
-
-    Odefined = Standard_False;
-#ifdef DEB
-    if ( TopOpeBRepDS_GettraceDSF() ) { 
-      cout<<"ProcessFaceTransition : undecided transition"<<endl;
-    }
-#endif
-    break;
+      Odefined = Standard_False;
+      break;
 
     } // trans
   
@@ -288,21 +268,16 @@ static Standard_Boolean FUN_ProjectPoint(const gp_Pnt& P1,
   if ( C2.IsNull() ) {
     return Standard_False;
   }
-  Standard_Real res = Standard_False;
-  
+
   GeomAPI_ProjectPointOnCurve mydist(P1,C2,FC2,LC2);
   if ( mydist.Extrema().IsDone() ) {
     if ( mydist.NbPoints() ) {
       T2 = mydist.LowerDistanceParameter();
-      res = Standard_True;
+      return Standard_True;
     }
   }
-//#ifdef DEB
-//  return res; // BUG ???
-//#else
-  return (Standard_Boolean ) res ;
-//#endif
 
+  return Standard_False;
 }
 
 // -------------------------------------------------