[SCM] OCE packaging branch, upstream, updated. OCE-0.6.0-230-g17bea23

Denis Barbier bouzim at gmail.com
Fri Feb 24 18:50:15 UTC 2012


The following commit has been merged in the upstream branch:
commit 8da6ce067188c07412eaa9f746f721361af0c48f
Author: Denis Barbier <bouzim at gmail.com>
Date:   Thu Dec 22 15:26:22 2011 +0100

    [warning-fix][unused-local-var]

diff --git a/inc/ApproxInt_ImpPrmSvSurfaces.gxx b/inc/ApproxInt_ImpPrmSvSurfaces.gxx
index a605b86..98dc3c3 100644
--- a/inc/ApproxInt_ImpPrmSvSurfaces.gxx
+++ b/inc/ApproxInt_ImpPrmSvSurfaces.gxx
@@ -46,11 +46,7 @@ void ApproxInt_ImpPrmSvSurfaces::Pnt(const Standard_Real u1,
   Standard_Real tu2=u2;
   Standard_Real tv1=v1;
   Standard_Real tv2=v2;
-#ifdef DEB
-  Standard_Boolean t=this->Compute(tu1,tv1,tu2,tv2,aP,aT,aTS1,aTS2);
-#else
   this->Compute(tu1,tv1,tu2,tv2,aP,aT,aTS1,aTS2);
-#endif
   P=MyPnt;
 }
 //--------------------------------------------------------------------------------
diff --git a/inc/ApproxInt_PrmPrmSvSurfaces.gxx b/inc/ApproxInt_PrmPrmSvSurfaces.gxx
index 5d51647..1b8f595 100644
--- a/inc/ApproxInt_PrmPrmSvSurfaces.gxx
+++ b/inc/ApproxInt_PrmPrmSvSurfaces.gxx
@@ -92,11 +92,7 @@ Standard_Boolean ApproxInt_PrmPrmSvSurfaces::Compute( Standard_Real& u1
   Param(1) = u1; Param(2) = v1;
   Param(3) = u2; Param(4) = v2;
   math_FunctionSetRoot  Rsnld(MyIntersectionOn2S.Function());
-#ifdef DEB
-  IntImp_ConstIsoparametric ChoixIso = MyIntersectionOn2S.Perform(Param,Rsnld);
-#else
   MyIntersectionOn2S.Perform(Param,Rsnld);
-#endif
   if (!MyIntersectionOn2S.IsDone())  { 
     MyHasBeenComputed = MyHasBeenComputedbis = Standard_False;
     return(Standard_False);
@@ -199,11 +195,7 @@ void ApproxInt_PrmPrmSvSurfaces::Pnt(const Standard_Real u1,
   Standard_Real tu2=u2;
   Standard_Real tv1=v1;
   Standard_Real tv2=v2;
-#ifdef DEB
-  Standard_Boolean t=this->Compute(tu1,tv1,tu2,tv2,aP,aT,aTS1,aTS2);
-#else
   this->Compute(tu1,tv1,tu2,tv2,aP,aT,aTS1,aTS2);
-#endif
   P=MyPnt;
 }
 //--------------------------------------------------------------------------------
diff --git a/inc/Approx_ComputeLine.gxx b/inc/Approx_ComputeLine.gxx
index ac475af..447faeb 100644
--- a/inc/Approx_ComputeLine.gxx
+++ b/inc/Approx_ComputeLine.gxx
@@ -78,7 +78,6 @@ static void DUMP(const AppParCurves_MultiCurve& C) {
   static Standard_Integer nbappel = 0;
   Standard_Integer i;
   Standard_Integer nbpoles = C.NbPoles();
-  Standard_Integer deg = C.Degree();
 
   Handle(Geom_BezierCurve) BSp;
   Handle(Geom2d_BezierCurve) BSp2d;
diff --git a/inc/Extrema_GLocateExtCC.gxx b/inc/Extrema_GLocateExtCC.gxx
index 6c974a3..045bd21 100644
--- a/inc/Extrema_GLocateExtCC.gxx
+++ b/inc/Extrema_GLocateExtCC.gxx
@@ -15,13 +15,6 @@ Extrema_GLocateExtCC::Extrema_GLocateExtCC (const Curve1&       C1,
 					    const Standard_Real V0)
 {
 
-#ifdef DEB
-  GeomAbs_CurveType type1 = Tool1::GetType(C1);
-  GeomAbs_CurveType type2 = Tool2::GetType(C2);
-#else
-  Tool1::GetType(C1);
-  Tool2::GetType(C2);
-#endif
   Standard_Real TolU = C1.Resolution(Precision::Confusion());
   Standard_Real TolV = C2.Resolution(Precision::Confusion());
   Extrema_POnCurv P1, P2;
diff --git a/inc/Extrema_GLocateExtCC2d.gxx b/inc/Extrema_GLocateExtCC2d.gxx
index 694fd5b..d1ba5a6 100644
--- a/inc/Extrema_GLocateExtCC2d.gxx
+++ b/inc/Extrema_GLocateExtCC2d.gxx
@@ -21,13 +21,6 @@ Extrema_GLocateExtCC2d::Extrema_GLocateExtCC2d (const Curve1&       C1,
 						const Standard_Real U0,
 						const Standard_Real V0)
 {
-#ifdef DEB
-  GeomAbs_CurveType type1 = Tool1::GetType(C1);
-  GeomAbs_CurveType type2 = Tool2::GetType(C2);
-#else
-  Tool1::GetType(C1);
-  Tool2::GetType(C2);
-#endif
   Standard_Real TolU = Tool1::Resolution(C1, Precision::Confusion());
   Standard_Real TolV = Tool2::Resolution(C2, Precision::Confusion());
   Extrema_POnCurv2d P1, P2;
diff --git a/inc/Extrema_GLocateExtPC.gxx b/inc/Extrema_GLocateExtPC.gxx
index 173beca..8575011 100644
--- a/inc/Extrema_GLocateExtPC.gxx
+++ b/inc/Extrema_GLocateExtPC.gxx
@@ -97,11 +97,6 @@ void Extrema_GLocateExtPC::Perform(const ThePoint&     P,
 				   const Standard_Real U0)
 {
   Standard_Integer i, i1, i2, inter;
-#ifdef DEB
-  Standard_Real Tol = TheCurveTool::Resolution(*((TheCurve*)myC), Precision::Confusion());
-#else
-  TheCurveTool::Resolution(*((TheCurve*)myC), Precision::Confusion());
-#endif
   Standard_Real Par, valU, valU2 = RealLast(),
   local_u0 ;
   Standard_Real myintuinf=0, myintusup=0;
diff --git a/inc/GCPnts_UniformAbscissa.gxx b/inc/GCPnts_UniformAbscissa.gxx
index d14ae71..85f75a3 100644
--- a/inc/GCPnts_UniformAbscissa.gxx
+++ b/inc/GCPnts_UniformAbscissa.gxx
@@ -160,10 +160,7 @@ PerformLengthParametrized( Handle(TColStd_HArray1OfReal)& HParameters,
 //  Standard_Real UCurrent;
   Standard_Real Delta, Ui;
   Standard_Real UU2 = Max(U1, U2);
-#ifdef DEB
-  Standard_Real L = 
-#endif
-    CPnts_AbscissaPoint::Length(C, UU1, UU2);
+  CPnts_AbscissaPoint::Length(C, UU1, UU2);
   Standard_Integer   Index ;
 
 // Ratio is defined as dl = Ratio * du
diff --git a/inc/GccGeo_Circ2dTanOnRad.gxx b/inc/GccGeo_Circ2dTanOnRad.gxx
index fc3b7a7..ce5ab44 100644
--- a/inc/GccGeo_Circ2dTanOnRad.gxx
+++ b/inc/GccGeo_Circ2dTanOnRad.gxx
@@ -447,13 +447,6 @@ GccGeo_Circ2dTanOnRad::
        cote1(1) = Radius;
        cote1(2) = -Radius;
      }
-#ifdef DEB
-     Standard_Real x1dir = dir1.X();
-     Standard_Real y1dir = dir1.Y();
-#else
-     dir1.X();
-     dir1.Y();
-#endif
      TheIntConicCurve Intp;
      for (Standard_Integer jcote1 = 1 ; jcote1 <= nbrcote1 ; jcote1++) {
        gp_Pnt2d Point(dir1.XY()+cote1(jcote1)*norm1.XY());
@@ -472,11 +465,6 @@ GccGeo_Circ2dTanOnRad::
 	     cirsol(NbrSol) = gp_Circ2d(gp_Ax2d(Center,dirx),Radius);
 //           =======================================================
 	     gp_Dir2d dc1(origin1.XY()-Center.XY());
-#ifdef DEB
-	     Standard_Real sign = dc1.Dot(norm1);
-#else
-             dc1.Dot(norm1);
-#endif
 	     if (!Qualified1.IsUnqualified()) { 
 	       qualifier1(NbrSol) = Qualified1.Qualifier();
 	     }
diff --git a/inc/GccIter_Circ2d2TanOn.gxx b/inc/GccIter_Circ2d2TanOn.gxx
index bc81629..73c11f9 100644
--- a/inc/GccIter_Circ2d2TanOn.gxx
+++ b/inc/GccIter_Circ2d2TanOn.gxx
@@ -76,11 +76,6 @@ GccIter_Circ2d2TanOn::
    Ufirst(4) = (point3.Distance(point2)+point3.Distance(point1))/2.;
    GccIter_FuncTCuCuOnCu Func(L1,Cu2,OnLine,Ufirst(4));
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
-#ifdef DEB
-   Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-   Func.Value(Ufirst,Umin);
-#endif
    if (Root.IsDone()) {
      Root.Root(Ufirst);
 //     gp_Vec2d Tan1,Tan2,Nor1,Nor2;
@@ -93,11 +88,9 @@ GccIter_Circ2d2TanOn::
      Standard_Real dist2 = point3.Distance(point2);
      if ( Abs(dist1-dist2)/2. <= Tol) {
        cirsol = gp_Circ2d(gp_Ax2d(point3,dirx),(dist1+dist2)/2.);
-       Standard_Real normetan1 = Tan1.Magnitude();
        Standard_Real normetan2 = Tan2.Magnitude();
        gp_Vec2d Vec1(point1,point3);
        gp_Vec2d Vec2(point2,point3);
-       Standard_Real normevec1 = Vec1.Magnitude();
        Standard_Real normevec2 = Vec2.Magnitude();
        Standard_Real angle2;
        if (normevec2 >= gp::Resolution() && normetan2 >= gp::Resolution()) {
@@ -183,11 +176,6 @@ GccIter_Circ2d2TanOn::
    Ufirst(4) = (point3.Distance(point2)+point3.Distance(point1))/2.;
    GccIter_FuncTCuCuOnCu Func(Cu1,Cu2,OnLine,Ufirst(4));
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
-#ifdef DEB
-   Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-   Func.Value(Ufirst,Umin);
-#endif
    if (Root.IsDone()) {
      Root.Root(Ufirst);
      gp_Vec2d Tan1,Tan2;
@@ -283,11 +271,6 @@ GccIter_Circ2d2TanOn::
    Ufirst(3) = (point3.Distance(Point2)+point3.Distance(point1))/2.;
    GccIter_FuncTCuCuOnCu Func(Cu1,Point2,OnLine,Ufirst(3));
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
-#ifdef DEB
-   Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-   Func.Value(Ufirst,Umin);
-#endif
    if (Root.IsDone()) {
      Root.Root(Ufirst);
      gp_Pnt2d point1,point3;
@@ -380,11 +363,6 @@ GccIter_Circ2d2TanOn::
    Ufirst(4) = (point3.Distance(point2)+point3.Distance(point1))/2.;
    GccIter_FuncTCuCuOnCu Func(C1,Cu2,OnLine,Ufirst(4));
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
-#ifdef DEB
-   Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-   Func.Value(Ufirst,Umin);
-#endif
    if (Root.IsDone()) {
      Root.Root(Ufirst);
 //     gp_Vec2d Tan1,Tan2,Nor1,Nor2;
@@ -401,11 +379,9 @@ GccIter_Circ2d2TanOn::
      Standard_Real dist2 = point3.Distance(point2);
      if ( Abs(dist1-dist2)/2. <= Tol) {
        cirsol = gp_Circ2d(gp_Ax2d(point3,dirx),(dist1+dist2)/2.);
-       Standard_Real normetan1 = Tan1.Magnitude();
        Standard_Real normetan2 = Tan2.Magnitude();
        gp_Vec2d Vec1(point1,point3);
        gp_Vec2d Vec2(point2,point3);
-       Standard_Real normevec1 = Vec1.Magnitude();
        Standard_Real normevec2 = Vec2.Magnitude();
        Standard_Real angle2;
        if (normevec2 >= gp::Resolution() && normetan2 >= gp::Resolution()) {
@@ -493,11 +469,6 @@ GccIter_Circ2d2TanOn::
    Ufirst(4) = (point3.Distance(point2)+point3.Distance(point1))/2.;
    GccIter_FuncTCuCuOnCu Func(C1,Cu2,OnCirc,Ufirst(4));
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
-#ifdef DEB
-   Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-   Func.Value(Ufirst,Umin);
-#endif
    if (Root.IsDone()) {
      Root.Root(Ufirst);
 //     gp_Vec2d Tan1,Tan2,Nor1;
@@ -512,11 +483,9 @@ GccIter_Circ2d2TanOn::
      Standard_Real dist2 = point3.Distance(point2);
      if ( Abs(dist1-dist2)/2. <= Tol) {
        cirsol = gp_Circ2d(gp_Ax2d(point3,dirx),(dist1+dist2)/2.);
-       Standard_Real normetan1 = Tan1.Magnitude();
        Standard_Real normetan2 = Tan2.Magnitude();
        gp_Vec2d Vec1(point1,point3);
        gp_Vec2d Vec2(point2,point3);
-       Standard_Real normevec1 = Vec1.Magnitude();
        Standard_Real normevec2 = Vec2.Magnitude();
        Standard_Real angle2;
        if (normevec2 >= gp::Resolution() && normetan2 >= gp::Resolution()) {
@@ -603,11 +572,6 @@ GccIter_Circ2d2TanOn::
    Ufirst(4) = (point3.Distance(point2)+point3.Distance(point1))/2.;
    GccIter_FuncTCuCuOnCu Func(L1,Cu2,OnCirc,Ufirst(4));
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
-#ifdef DEB
-   Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-   Func.Value(Ufirst,Umin);
-#endif
    if (Root.IsDone()) {
      Root.Root(Ufirst);
      gp_Pnt2d point1,point2;
@@ -622,11 +586,9 @@ GccIter_Circ2d2TanOn::
      Standard_Real dist2 = point3.Distance(point2);
      if ( Abs(dist1-dist2)/2. <= Tol) {
        cirsol = gp_Circ2d(gp_Ax2d(point3,dirx),(dist1+dist2)/2.);
-       Standard_Real normetan1 = Tan1.Magnitude();
        Standard_Real normetan2 = Tan2.Magnitude();
        gp_Vec2d Vec1(point1,point3);
        gp_Vec2d Vec2(point2,point3);
-       Standard_Real normevec1 = Vec1.Magnitude();
        Standard_Real normevec2 = Vec2.Magnitude();
        Standard_Real angle2;
        if (normevec2 >= gp::Resolution() && normetan2 >= gp::Resolution()) {
@@ -713,11 +675,6 @@ GccIter_Circ2d2TanOn::
    Ufirst(4) = (point3.Distance(point2)+point3.Distance(point1))/2.;
    GccIter_FuncTCuCuOnCu Func(Cu1,Cu2,OnCirc,Ufirst(4));
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
-#ifdef DEB
-   Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-   Func.Value(Ufirst,Umin);
-#endif
    if (Root.IsDone()) {
      Root.Root(Ufirst);
 //     gp_Vec2d Tan1,Tan2,Nor1;
@@ -817,11 +774,6 @@ GccIter_Circ2d2TanOn::
    Ufirst(3) = (point3.Distance(Point2)+point3.Distance(point1))/2.;
    GccIter_FuncTCuCuOnCu Func(Cu1,Point2,OnCirc,Ufirst(3));
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
-#ifdef DEB
-   Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-   Func.Value(Ufirst,Umin);
-#endif
    if (Root.IsDone()) {
      Root.Root(Ufirst);
      gp_Pnt2d point1,point3;
@@ -914,11 +866,6 @@ GccIter_Circ2d2TanOn::
    Ufirst(4) = (point3.Distance(point2)+point3.Distance(point1))/2.;
    GccIter_FuncTCuCuOnCu Func(Cu1,Cu2,OnCurv,Ufirst(4));
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
-#ifdef DEB
-   Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-   Func.Value(Ufirst,Umin);
-#endif
    if (Root.IsDone()) {
      Root.Root(Ufirst);
      gp_Vec2d Tan1,Tan2,Tan3;
@@ -1023,11 +970,6 @@ GccIter_Circ2d2TanOn::
    Ufirst(4) = (point3.Distance(point2)+point3.Distance(point1))/2.;
    GccIter_FuncTCuCuOnCu Func(C1,Cu2,OnCurv,Ufirst(4));
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
-#ifdef DEB
-   Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-   Func.Value(Ufirst,Umin);
-#endif
    if (Root.IsDone()) {
      Root.Root(Ufirst);
      gp_Vec2d Tan1,Tan2,Tan3;
@@ -1039,11 +981,9 @@ GccIter_Circ2d2TanOn::
      if ( Abs(dist1-dist2)/2. <= Tol) {
        gp_Dir2d dirx(1.,0.);
        cirsol = gp_Circ2d(gp_Ax2d(point3,dirx),(dist1+dist2)/2.);
-       Standard_Real normetan1 = Tan1.Magnitude();
        Standard_Real normetan2 = Tan2.Magnitude();
        gp_Vec2d Vec1(point1.XY(),point3.XY());
        gp_Vec2d Vec2(point2.XY(),point3.XY());
-       Standard_Real normevec1 = Vec1.Magnitude();
        Standard_Real normevec2 = Vec2.Magnitude();
        Standard_Real angle2;
        if (normevec2 >= gp::Resolution() && normetan2 >= gp::Resolution()) {
@@ -1130,11 +1070,6 @@ GccIter_Circ2d2TanOn::
    Ufirst(4) = (point3.Distance(point2)+point3.Distance(point1))/2.;
    GccIter_FuncTCuCuOnCu Func(L1,Cu2,OnCurv,Ufirst(4));
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
-#ifdef DEB
-   Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-   Func.Value(Ufirst,Umin);
-#endif
    if (Root.IsDone()) {
      Root.Root(Ufirst);
      gp_Vec2d Tan1,Tan2,Tan3;
@@ -1145,11 +1080,9 @@ GccIter_Circ2d2TanOn::
      Standard_Real dist2 = point3.Distance(point2);
      if ( Abs(dist1-dist2)/2. <= Tol) {
        cirsol = gp_Circ2d(gp_Ax2d(point3,dirx),(dist1+dist2)/2.);
-       Standard_Real normetan1 = Tan1.Magnitude();
        Standard_Real normetan2 = Tan2.Magnitude();
        gp_Vec2d Vec1(point1,point3);
        gp_Vec2d Vec2(point2,point3);
-       Standard_Real normevec1 = Vec1.Magnitude();
        Standard_Real normevec2 = Vec2.Magnitude();
        Standard_Real angle2;
        if (normevec2 >= gp::Resolution() && normetan2 >= gp::Resolution()) {
@@ -1227,11 +1160,6 @@ GccIter_Circ2d2TanOn::
   Ufirst(3) = (point3.Distance(Point2)+point3.Distance(point1))/2.;
   GccIter_FuncTCuCuOnCu Func(Cu1,Point2,OnCurv,Ufirst(3));
   math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
-#ifdef DEB
-  Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-  Func.Value(Ufirst,Umin);
-#endif
   if (Root.IsDone()) {
     Root.Root(Ufirst);
 //    gp_Vec2d Tan1,Tan2,Tan3;
diff --git a/inc/GccIter_Circ2d3Tan.gxx b/inc/GccIter_Circ2d3Tan.gxx
index 051ff7c..337d864 100644
--- a/inc/GccIter_Circ2d3Tan.gxx
+++ b/inc/GccIter_Circ2d3Tan.gxx
@@ -76,11 +76,6 @@ GccIter_Circ2d3Tan::
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
    if (Root.IsDone()) {
      Root.Root(Ufirst);
-#ifdef DEB
-     Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-     Func.Value(Ufirst,Umin);
-#endif
      gp_Pnt2d point1,point2,point3;
      gp_Vec2d Tan1,Tan2,Tan3;
      TheCurveTool::D1(Cu1,Ufirst(1),point1,Tan1);
@@ -203,11 +198,6 @@ GccIter_Circ2d3Tan::
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
    if (Root.IsDone()) {
      Root.Root(Ufirst);
-#ifdef DEB
-     Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-     Func.Value(Ufirst,Umin);
-#endif
      gp_Pnt2d centre1(C1.Location());
      Standard_Real R1 = C1.Radius();
      gp_Pnt2d point1(centre1.XY()+R1*gp_XY(Cos(Ufirst(1)),Sin(Ufirst(1))));
@@ -335,11 +325,6 @@ GccIter_Circ2d3Tan::
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
    if (Root.IsDone()) {
      Root.Root(Ufirst);
-#ifdef DEB
-     Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-     Func.Value(Ufirst,Umin);
-#endif
      gp_Pnt2d centre1(C1.Location());
      Standard_Real R1 = C1.Radius();
      gp_Pnt2d point1(centre1.XY()+R1*gp_XY(Cos(Ufirst(1)),Sin(Ufirst(1))));
@@ -470,11 +455,6 @@ GccIter_Circ2d3Tan::
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
    if (Root.IsDone()) {
      Root.Root(Ufirst);
-#ifdef DEB
-     Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-     Func.Value(Ufirst,Umin);
-#endif
      gp_Pnt2d centre1(L1.Location());
      gp_Pnt2d point1(centre1.XY()+Ufirst(1)*L1.Direction().XY());
      gp_Pnt2d point2,point3;
@@ -605,11 +585,6 @@ GccIter_Circ2d3Tan::
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
    if (Root.IsDone()) {
      Root.Root(Ufirst);
-#ifdef DEB
-     Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-     Func.Value(Ufirst,Umin);
-#endif
      gp_Pnt2d centre1(L1.Location());
      gp_Pnt2d point1(centre1.XY()+Ufirst(1)*L1.Direction().XY());
      gp_Pnt2d centre2(L2.Location());
@@ -733,11 +708,6 @@ GccIter_Circ2d3Tan::
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
    if (Root.IsDone()) {
      Root.Root(Ufirst);
-#ifdef DEB
-     Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-     Func.Value(Ufirst,Umin);
-#endif
      gp_Pnt2d point1,point2;
 //     gp_Vec2d Tan1,Tan2,Nor1,Nor2;
      gp_Vec2d Tan1,Tan2;
@@ -850,11 +820,6 @@ GccIter_Circ2d3Tan::
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
    if (Root.IsDone()) {
      Root.Root(Ufirst);
-#ifdef DEB
-     Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-     Func.Value(Ufirst,Umin);
-#endif
      gp_Pnt2d point3;
 //     gp_Vec2d Tan3,Nor3;
      gp_Vec2d Tan3;
@@ -964,11 +929,6 @@ GccIter_Circ2d3Tan::
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
    if (Root.IsDone()) {
      Root.Root(Ufirst);
-#ifdef DEB
-     Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-     Func.Value(Ufirst,Umin);
-#endif
      gp_Pnt2d centre1(L1.Location());
      gp_Pnt2d point1(centre1.XY()+Ufirst(2)*L1.Direction().XY());
      gp_Pnt2d point2;
@@ -1086,11 +1046,6 @@ GccIter_Circ2d3Tan::
    tol(3) = TheCurveTool::EpsX(Cu3,Abs(Tolerance));
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
    if (Root.IsDone()) {
-#ifdef DEB
-     Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-     Func.Value(Ufirst,Umin);
-#endif
      Root.Root(Ufirst);
      gp_Pnt2d centre1(C1.Location());
      Standard_Real R1 = C1.Radius();
@@ -1218,11 +1173,6 @@ GccIter_Circ2d3Tan::
    math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
    if (Root.IsDone()) {
      Root.Root(Ufirst);
-#ifdef DEB
-     Standard_Boolean Ok = Func.Value(Ufirst,Umin);
-#else
-     Func.Value(Ufirst,Umin);
-#endif
      gp_Pnt2d centre1(C1.Location());
      Standard_Real R1 = C1.Radius();
      gp_Pnt2d point1(centre1.XY()+R1*gp_XY(Cos(Ufirst(1)),Sin(Ufirst(1))));
diff --git a/inc/GccIter_FunctionTanCirCu.gxx b/inc/GccIter_FunctionTanCirCu.gxx
index 5d7e53a..9d380e5 100644
--- a/inc/GccIter_FunctionTanCirCu.gxx
+++ b/inc/GccIter_FunctionTanCirCu.gxx
@@ -87,11 +87,6 @@ Standard_Boolean GccIter_FunctionTanCirCu::
   TheCurveTool::D2(Curve,X,Point,Vect1,Vect2);
   Standard_Real NormeD1 = Vect1.SquareMagnitude();
   gp_Vec2d TheDirection(TheCirc.Location(),Point);
-#ifdef DEB
-  Standard_Real squaredir = TheDirection.SquareMagnitude();
-#else
-  TheDirection.SquareMagnitude();
-#endif
   Standard_Real cp1dott = TheDirection.Dot(Vect1);
   Deriv = -2.*(cp1dott/NormeD1)*
     ((TheDirection.Dot(Vect2))-cp1dott*Vect1.Dot(Vect2)/NormeD1);
diff --git a/inc/GccIter_FunctionTanCuCuOnCu.gxx b/inc/GccIter_FunctionTanCuCuOnCu.gxx
index 544fc24..e7f24e2 100644
--- a/inc/GccIter_FunctionTanCuCuOnCu.gxx
+++ b/inc/GccIter_FunctionTanCuCuOnCu.gxx
@@ -290,11 +290,6 @@ Standard_Boolean GccIter_FunctionTanCuCuOnCu::
 //norme des Tani.
   Standard_Real nnor1 = Tan1.Magnitude();
   Standard_Real nnor2 = Tan2.Magnitude();
-#ifdef DEB
-  Standard_Real nnor3 = Tan3.Magnitude();
-#else
-  Tan3.Magnitude();
-#endif
 // Fonctions Fui.
 // ==============
   Fval(1) = (P3P1.Dot(P3P1)-X(4)*X(4))/(FirstRad*FirstRad);
@@ -323,11 +318,6 @@ Standard_Boolean GccIter_FunctionTanCuCuOnCu::
 //normales au courbes normees Nori et non nromees nori et norme des nori.
   Standard_Real nnor1 = Tan1.Magnitude();
   Standard_Real nnor2 = Tan2.Magnitude();
-#ifdef DEB
-  Standard_Real nnor3 = Tan3.Magnitude();
-#else
-  Tan3.Magnitude();
-#endif
 // Derivees dFui/uj  1 <= ui <= 3 , 1 <= uj <= 3
 // =============================================
   Deriv(1,1) = 2.*Tan1.Dot(P3P1)/(FirstRad*FirstRad);
@@ -374,11 +364,6 @@ Standard_Boolean GccIter_FunctionTanCuCuOnCu::
 //normales au courbes normees Nori et non nromees nori et norme des nori.
   Standard_Real nnor1 = Tan1.Magnitude();
   Standard_Real nnor2 = Tan2.Magnitude();
-#ifdef DEB
-  Standard_Real nnor3 = Tan3.Magnitude();
-#else
-  Tan3.Magnitude();
-#endif
 // Fonctions Fui.
 // ==============
   Fval(1) = (P3P1.Dot(P3P1)-X(4)*X(4))/(FirstRad*FirstRad);
diff --git a/inc/GccIter_Lin2d2Tan.gxx b/inc/GccIter_Lin2d2Tan.gxx
index 18deb35..779a428 100644
--- a/inc/GccIter_Lin2d2Tan.gxx
+++ b/inc/GccIter_Lin2d2Tan.gxx
@@ -26,9 +26,6 @@ GccIter_Lin2d2Tan::
      
    par1sol = 0.;
    pararg1 = 0.;
-#ifdef DEB
-   Standard_Real Tol = Abs(Tolang);
-#endif
    WellDone = Standard_False;
    if (Qualified1.IsEnclosed()) { GccEnt_BadQualifier::Raise(); }
    gp_Circ2d C1 = Qualified1.Qualified();
diff --git a/inc/HatchGen_Hatcher.gxx b/inc/HatchGen_Hatcher.gxx
index a0b257d..e8e3127 100644
--- a/inc/HatchGen_Hatcher.gxx
+++ b/inc/HatchGen_Hatcher.gxx
@@ -753,10 +753,6 @@ Standard_Boolean HatchGen_Hatcher::GlobalTransition (HatchGen_PointOnHatching& P
   printf("\n       P:%+10.5g  Tg2d:%+10.5g , %+10.5g  N2d:%+10.5g , %+10.5g  Crv:%+10.5g\n\n",
 	 Point.Parameter(),Tangente.X(),Tangente.Y(),Normale.X(),Normale.Y(),Courbure);
 #endif
-#ifdef DEB
-  Standard_Real ParamAtIntersection = 
-#endif
-    Point.Parameter();
   for (Standard_Integer IPntE = 1 ; IPntE <= Point.NbPoints() ; IPntE++) {
 
     const HatchGen_PointOnElement& PntE = Point.Point (IPntE) ;
diff --git a/inc/IntCurveSurface_Inter.gxx b/inc/IntCurveSurface_Inter.gxx
index 0d33bb8..c057cb1 100644
--- a/inc/IntCurveSurface_Inter.gxx
+++ b/inc/IntCurveSurface_Inter.gxx
@@ -419,11 +419,6 @@ void IntCurveSurface_Inter::Perform(const TheCurve&   curve,
   done = Standard_True;
   Standard_Integer NbUOnS = TheSurfaceTool::NbUIntervals(surface,GeomAbs_C2);
   Standard_Integer NbVOnS = TheSurfaceTool::NbVIntervals(surface,GeomAbs_C2);
-#ifdef DEB
-  Standard_Integer NbOnC  = TheCurveTool::NbIntervals(curve,GeomAbs_C2);
-#else
-  TheCurveTool::NbIntervals(curve,GeomAbs_C2);
-#endif
   Standard_Real U0,U1,V0,V1; 
   
   if(NbUOnS > 1) { 
@@ -1069,11 +1064,6 @@ void IntCurveSurface_Inter::InternalPerformCurveQuadric(const TheCurve&
   IntCurveSurface_TheQuadCurvExactInter QuadCurv(surface,curve);  
   if(QuadCurv.IsDone()) { 
     Standard_Integer NbRoots = QuadCurv.NbRoots();
-#ifdef DEB
-    Standard_Integer NbInter = QuadCurv.NbIntervals();
-#else
-    QuadCurv.NbIntervals();
-#endif
     Standard_Real u,v,w;
     for(Standard_Integer i = 1; i<= NbRoots; i++) { 
       w = QuadCurv.Root(i); 
@@ -1127,11 +1117,6 @@ void IntCurveSurface_Inter::InternalPerform(const TheCurve&       curve,
     IntCurveSurface_TheQuadCurvExactInter QuadCurv(surface,curve);  
     if(QuadCurv.IsDone()) { 
       Standard_Integer NbRoots = QuadCurv.NbRoots();
-#ifdef DEB
-      Standard_Integer NbInter = QuadCurv.NbIntervals();
-#else
-      QuadCurv.NbIntervals();
-#endif
       Standard_Real u,v,w;
       for(Standard_Integer i = 1; i<= NbRoots; i++) { 
 	w = QuadCurv.Root(i); 
diff --git a/inc/IntCurveSurface_Polyhedron.gxx b/inc/IntCurveSurface_Polyhedron.gxx
index a5d8bf8..fcafabc 100644
--- a/inc/IntCurveSurface_Polyhedron.gxx
+++ b/inc/IntCurveSurface_Polyhedron.gxx
@@ -420,10 +420,6 @@ Standard_Integer IntCurveSurface_Polyhedron::TriConnex
    Standard_Integer&      TriCon,
    Standard_Integer&      OtherP) const
 {
-#ifdef DEB
-  Standard_Integer nbdeltaUp1 = nbdeltaU + 1;
-  Standard_Integer nbdeltaUm2 = nbdeltaU + nbdeltaU;
-#endif
   Standard_Integer Pivotm1    = Pivot-1;
   Standard_Integer nbdeltaVp1 = nbdeltaV+1;
   Standard_Integer nbdeltaVm2 = nbdeltaV + nbdeltaV;
diff --git a/inc/IntPatch_ImpImpIntersection_0.gxx b/inc/IntPatch_ImpImpIntersection_0.gxx
index 519114d..33d4d8a 100644
--- a/inc/IntPatch_ImpImpIntersection_0.gxx
+++ b/inc/IntPatch_ImpImpIntersection_0.gxx
@@ -1075,9 +1075,6 @@ Standard_Boolean FindLine (gp_Pnt& Psurf,
 	  //-- le point n a pas ete trouve par bete projection.
 	  //-- on essaie l intersection avec la restriction en 2d
 	  Standard_Real theparamonarc = theparameteronarc;
-#ifdef DEB
-	  Standard_Real anpara=para;
-#endif
 	  gp_Pnt CopiePsurf=Psurf;
 	  Standard_Boolean ok=IntersectionWithAnArc(CopiePsurf,alin,para,thearc,theparamonarc,thepointonarc,QuadSurf,lower,upper,dist);
 
diff --git a/inc/IntPatch_ImpImpIntersection_5.gxx b/inc/IntPatch_ImpImpIntersection_5.gxx
index 8c0d762..8c46955 100644
--- a/inc/IntPatch_ImpImpIntersection_5.gxx
+++ b/inc/IntPatch_ImpImpIntersection_5.gxx
@@ -546,13 +546,6 @@ Standard_Boolean IntCoSp(const IntSurf_Quadric& Quad1,
     {
       gp_Vec Tgt;
       gp_Pnt ptref;
-#ifndef DEB
-      Co.Apex();
-#else
-      gp_Pnt apex(Co.Apex());
-      //Standard_Real param;
-      Standard_Real paramapex   =  ElCLib::LineParameter(Co.Axis(),apex);
-#endif
 
       for (i=1; i<=NbSol; i++) {
 	gp_Circ cirsol = inter.Circle(i);
@@ -647,11 +640,6 @@ Standard_Boolean IntCoSp(const IntSurf_Quadric& Quad1,
 
 	gp_Pnt ptvalid, ptf, ptl;
 	gp_Vec tgvalid;
-#ifdef DEB
-	Standard_Real paramapex   = 
-#endif
-	  ElCLib::LineParameter(Co.Axis(),
-				Co.Apex());
 	Standard_Real first,last,para;
 	Standard_Boolean tgfound,firstp,lastp,kept;
 	Standard_Integer kount;
diff --git a/inc/IntWalk_IWalking_1.gxx b/inc/IntWalk_IWalking_1.gxx
index 5e70f9d..e3cbc24 100644
--- a/inc/IntWalk_IWalking_1.gxx
+++ b/inc/IntWalk_IWalking_1.gxx
@@ -79,9 +79,6 @@ void IntWalk_IWalking::Perform(const ThePOPIterator& Pnts1,
       etat1(I) = etat1(I) + 1;
 
     Standard_Integer etat1I=etat1(I);
-#ifdef DEB
-    Standard_Integer multi=0;
-#endif
     //-- cout<<" \n Etat1("<<I<<") = "<<etat1I<<endl;
     if(etat1I==2) {  //-- lbr le 15 fev 99 
       etat1(I)=11;      
diff --git a/inc/IntWalk_IWalking_2.gxx b/inc/IntWalk_IWalking_2.gxx
index a345604..406e863 100644
--- a/inc/IntWalk_IWalking_2.gxx
+++ b/inc/IntWalk_IWalking_2.gxx
@@ -314,10 +314,7 @@ Standard_Boolean IntWalk_IWalking::TestArretPassage
 	  if (Arrive) {
 	    static math_Vector bidF(1,1);
 	    static math_Matrix bidD(1,1,1,2);
-#ifdef DEB
-	    Standard_Boolean bidB = 
-#endif
-	      sp.Values(UV,bidF,bidD);
+	    sp.Values(UV,bidF,bidD);
 	    break;
 	  }
 	}
@@ -559,10 +556,7 @@ Standard_Boolean IntWalk_IWalking::TestArretAjout
 	UV(2) = V1;
 	static math_Vector bidF(1,1);
 	static math_Matrix bidD(1,1,1,2);
-#ifdef DEB
-	Standard_Boolean bidB = 
-#endif
-	  sp.Values(UV,bidF,bidD);
+	sp.Values(UV,bidF,bidD);
 	break;
       }
     }
@@ -659,10 +653,7 @@ void IntWalk_IWalking::TestArretCadre
 	if (Found) {
 	  static math_Vector bidF(1,1);
 	  static math_Matrix bidD(1,1,1,2);
-#ifdef DEB
-	  Standard_Boolean bidB = 
-#endif
-	    sp.Values(UV,bidF,bidD);
+	  sp.Values(UV,bidF,bidD);
 	  Standard_Integer NBP =  Line->NbPoints();
 	  Standard_Integer Indextg;	  
 	  Line->TangentVector(Indextg);
@@ -737,10 +728,7 @@ void IntWalk_IWalking::TestArretCadre
 	Irang = -Irang; // jag 941017
 	static math_Vector bidF(1,1);
 	static math_Matrix bidD(1,1,1,2);
-#ifdef DEB
-	Standard_Boolean bidB = 
-#endif
-	  sp.Values(UV,bidF,bidD);
+	sp.Values(UV,bidF,bidD);
 	return;
       }
     }
diff --git a/inc/IntWalk_IWalking_3.gxx b/inc/IntWalk_IWalking_3.gxx
index f986a1f..447d629 100644
--- a/inc/IntWalk_IWalking_3.gxx
+++ b/inc/IntWalk_IWalking_3.gxx
@@ -484,10 +484,7 @@ static Standard_Boolean TestPassedSolutionWithNegativeState(const TColStd_Sequen
 	if (Arrive) {
 	  static math_Vector bidF(1,1);
 	  static math_Matrix bidD(1,1,1,2);
-#ifdef DEB
-	  Standard_Boolean bidB = 
-#endif
-	    sp.Values(UV,bidF,bidD);
+	  sp.Values(UV,bidF,bidD);
 	  break;
 	}
       }
diff --git a/inc/IntWalk_IWalking_6.gxx b/inc/IntWalk_IWalking_6.gxx
index 6a2f2a8..16e581a 100644
--- a/inc/IntWalk_IWalking_6.gxx
+++ b/inc/IntWalk_IWalking_6.gxx
@@ -38,9 +38,6 @@ void IntWalk_IWalking::MakeWalkingPoint
   if (Case == 1) 
     Psol.SetValue(sp.Point(),reversed, U, V);
   else if (Case == 2) {
-#ifdef DEB
-    Standard_Boolean foo = sp.IsTangent(); 
-#endif
     Psol.SetValue(sp.Point(),reversed, U, V);
   }
   else if (Case == 11 || Case == 12 ) {
diff --git a/inc/Intf_InterferencePolygonPolyhedron.gxx b/inc/Intf_InterferencePolygonPolyhedron.gxx
index b69aad6..4c8b620 100644
--- a/inc/Intf_InterferencePolygonPolyhedron.gxx
+++ b/inc/Intf_InterferencePolygonPolyhedron.gxx
@@ -17,9 +17,6 @@
 #include <Intf_SeqOfTangentZone.hxx>
 #include <Intf.hxx>
 
-#ifdef DEB
-static  Standard_Integer debug=0;
-#endif
 #if 0
 static  Standard_Real PRCANG=0.1;
 #endif
diff --git a/inc/TopOpeBRepBuild_SplitEdge.hxx b/inc/TopOpeBRepBuild_SplitEdge.hxx
index 75fcc7a..e41ec61 100644
--- a/inc/TopOpeBRepBuild_SplitEdge.hxx
+++ b/inc/TopOpeBRepBuild_SplitEdge.hxx
@@ -36,11 +36,6 @@ void TopOpeBRepBuild_Builder::SplitEdge1(const TopoDS_Shape& Eoriented,
 {
   // work on a FORWARD edge <Eforward>
 
-#ifdef DEB
-  TopAbs_Orientation Eori =
-#endif
-                            Eoriented.Orientation();
-
   TopoDS_Shape Eforward = Eoriented; 
   Eforward.Orientation(TopAbs_FORWARD);
 
@@ -66,8 +61,6 @@ void TopOpeBRepBuild_Builder::SplitEdge1(const TopoDS_Shape& Eoriented,
   TopTools_ListOfShape LE1,LE2;
   LE1.Append(Eforward);
   FindSameDomain(LE1,LE2);
-  Standard_Integer n1 = LE1.Extent();
-  Standard_Integer n2 = LE2.Extent();
 
 #ifdef DEB
   if(tSPS){GdumpSAMDOM(LE1, (char *) "1 : ");}
diff --git a/src/AIS/AIS_EqualDistanceRelation.cxx b/src/AIS/AIS_EqualDistanceRelation.cxx
index 45c9480..9dab353 100644
--- a/src/AIS/AIS_EqualDistanceRelation.cxx
+++ b/src/AIS/AIS_EqualDistanceRelation.cxx
@@ -617,8 +617,6 @@ void AIS_EqualDistanceRelation::ComputeTwoVerticesLength( const Handle( Prs3d_Pr
   AIS::ComputeGeometry( FirstVertex, FirstAttach, Plane, isOnPlane1);
   AIS::ComputeGeometry( SecondVertex, SecondAttach, Plane, isOnPlane2);
 
-  //Computation of Val
-  Standard_Real Val = FirstAttach.Distance( SecondAttach );
   Standard_Real confusion(Precision::Confusion());
   Standard_Boolean samePoint(FirstAttach.IsEqual(SecondAttach,confusion));
 
diff --git a/src/AIS/AIS_InteractiveContext.cxx b/src/AIS/AIS_InteractiveContext.cxx
index c55a02a..26ffc1d 100644
--- a/src/AIS/AIS_InteractiveContext.cxx
+++ b/src/AIS/AIS_InteractiveContext.cxx
@@ -273,15 +273,14 @@ void AIS_InteractiveContext::DisplayedObjects(AIS_ListOfInteractive& aListOfIO,
 #endif
 
     //balayons tous les contextes locaux...
+#ifdef DEBUG
     Standard_Integer NbDisp;
     for(AIS_DataMapIteratorOfDataMapOfILC it1(myLocalContexts);it1.More();it1.Next()){
       const Handle(AIS_LocalContext)& LC = it1.Value();
       NbDisp =  LC->DisplayedObjects(theMap);
-#ifdef DEBUG
       cout<<"\tIn Local Context "<<it1.Key()<<" : "<<NbDisp<<endl;
-#endif
-      
     }
+#endif
     Handle(AIS_InteractiveObject) curIO;
     Handle(Standard_Transient) Tr;
       for(TColStd_MapIteratorOfMapOfTransient it2(theMap);it2.More();it2.Next()){
diff --git a/src/AIS2D/AIS2D_InteractiveContext.cxx b/src/AIS2D/AIS2D_InteractiveContext.cxx
index f8bd6a7..aafe9d5 100644
--- a/src/AIS2D/AIS2D_InteractiveContext.cxx
+++ b/src/AIS2D/AIS2D_InteractiveContext.cxx
@@ -245,9 +245,7 @@ void AIS2D_InteractiveContext::Display(
     	GStatus->AddDisplayMode( aDispMode );
 		if ( GStatus->IsSubIntensityOn() ) {
 #ifdef DEB
-		   Standard_Integer indCol = myMainVwr->InitializeColor(mySubIntensity);
-           //myMainPM->SetHighlightColor( indCol );
-	       //myMainPM->ColorHighlight( anIObj, indCol, aDispMode );
+		   myMainVwr->InitializeColor(mySubIntensity);
 #endif
 		}
       }
@@ -483,10 +481,6 @@ Standard_Integer AIS2D_InteractiveContext::OpenLocalContext( const Standard_Bool
                                                              const Standard_Boolean AcceptEraseOfObj ) {
   if ( !IsCurrent( myLastPicked ) ) 
     if ( !myLastPicked.IsNull() ) {
-#ifdef DEB
-      AIS2D_TypeOfDetection HiMod = myLastPicked -> HasHighlightMode() ? 
-		              myLastPicked->HighlightMode() : myLastPicked->DefaultHighlightMode();
-#endif
       myLastPicked->Unhighlight();
 	 }
   
@@ -545,9 +539,6 @@ void AIS2D_InteractiveContext::CloseLocalContext( const Standard_Integer ind,
    
    if ( GoodIndex == myCurLocalIndex ) {
      myCurLocalIndex = HighestIndex();
-#ifdef DEB
-     const Handle(AIS2D_LocalContext)& LocCtx = myLocalContexts(myCurLocalIndex);
-#endif
    }
    
  }
@@ -1767,10 +1758,6 @@ void AIS2D_InteractiveContext::Highlight( const Handle(AIS2D_InteractiveObject)&
 	 break;
    }
    case AIS2D_DS_Erased:	{
-#ifdef DEB
-     Standard_Integer HiMode = anIObj->HasHighlightMode() ? 
-                      anIObj->HighlightMode() : anIObj->DefaultHighlightMode();
-#endif
      anIObj->Highlight(myCollectorVwr->InitializeColor( mySelectionColor ));
      if ( updateVwr ) myCollectorVwr->Update();
      break;
@@ -1815,10 +1802,6 @@ void AIS2D_InteractiveContext::HighlightWithColor( const Handle(AIS2D_Interactiv
 	    break;
       }
       case AIS2D_DS_Erased: {
-#ifdef DEB
-	    Standard_Integer HiMode = anIObj->HasHighlightMode()? anIObj->HighlightMode():0;
-	    Standard_Integer indCol = myCollectorVwr->InitializeColor( aCol );
-#endif
 		if ( updateVwr) myCollectorVwr->Update();
 	    break;
       }
@@ -2160,9 +2143,6 @@ AIS2D_StatusOfPick AIS2D_InteractiveContext::Select( const Standard_Boolean Upda
 	  myLocalContexts( myCurLocalIndex )->SetSelected( myLastPicked, UpdateVwr );
 	  return AIS2D_SOP_OneSelected;
   }
-#ifdef DEB
-  AIS2D_StatusOfPick PS( AIS2D_SOP_NothingSelected );
-#endif
   
  if ( ! mySeqOfDetIO->IsEmpty() ) {
     Handle(AIS2D_InteractiveObject) theIO;
diff --git a/src/AIS2D/AIS2D_LocalContext.cxx b/src/AIS2D/AIS2D_LocalContext.cxx
index cff3147..a073d4b 100644
--- a/src/AIS2D/AIS2D_LocalContext.cxx
+++ b/src/AIS2D/AIS2D_LocalContext.cxx
@@ -317,10 +317,6 @@ AIS2D_StatusOfDetection AIS2D_LocalContext::MoveTo(
    }
    if ( !myLastPicked.IsNull() )
     if ( !myLastPicked->State() ) {
-#ifdef DEB
-        AIS2D_TypeOfDetection HiMod = myLastPicked->HasHighlightMode() ? 
-             myLastPicked->HighlightMode() : myLastPicked->DefaultHighlightMode();
-#endif
         myLastPicked->Unhighlight();
 	    UpdVwr = Standard_True;
     } // end if the last picked object isn't selected one
@@ -374,9 +370,6 @@ AIS2D_StatusOfDetection AIS2D_LocalContext::MoveTo(
         }
         case AIS2D_TOD_VERTEX: {
 	     myLastPickPrim = myLastPicked->Primitive(myLastPicked->PickedIndex());
-#ifdef DEB
-         Standard_Integer pInd = myLastPicked->PickedIndex();
-#endif
          if ( myLastPickPrim != myLastSelPrim ||
             ( myLastPickPrim == myLastSelPrim && 
               myLastPickPrim->PickedIndex() != myLastSelElInd ) ||
diff --git a/src/AdvApp2Var/AdvApp2Var_SysBase.cxx b/src/AdvApp2Var/AdvApp2Var_SysBase.cxx
index f8695fc..4d4cad7 100644
--- a/src/AdvApp2Var/AdvApp2Var_SysBase.cxx
+++ b/src/AdvApp2Var/AdvApp2Var_SysBase.cxx
@@ -944,7 +944,7 @@ int macrmsg_(const char *,//crout,
   
   /* Local variables */
   static integer inum;
-  static char cfm[80], cln[3];
+  static char cln[3];
   
 
 /* ***********************************************************************
diff --git a/src/AlienImage/AlienImage_X11XWDAlienData.cxx b/src/AlienImage/AlienImage_X11XWDAlienData.cxx
index 8672265..d644d82 100644
--- a/src/AlienImage/AlienImage_X11XWDAlienData.cxx
+++ b/src/AlienImage/AlienImage_X11XWDAlienData.cxx
@@ -336,10 +336,6 @@ Standard_Boolean AlienImage_X11XWDAlienData::Read( OSD_File& file )
 	    	}
 	}
 
-#ifdef DEB
-	AlienImage_X11XColor *p  = ( AlienImage_X11XColor * )myColors ;
-#endif
-
 #ifdef TRACE
 	if ( Verbose ) 	{ 
 	  AlienImage_X11XColor *p = ( AlienImage_X11XColor * )myColors;
diff --git a/src/BRep/BRep_Builder.cxx b/src/BRep/BRep_Builder.cxx
index 4f3357f..168fcd4 100644
--- a/src/BRep/BRep_Builder.cxx
+++ b/src/BRep/BRep_Builder.cxx
@@ -98,12 +98,6 @@ static void UpdateCurves(BRep_ListOfCurveRepresentation& lcr,
     GC = Handle(BRep_GCurve)::DownCast(itcr.Value());
     if (!GC.IsNull()) {
       if (GC->IsCurve3D()) {
-#ifdef DEB
-        const Handle(Geom_Curve)& Crv =
-#endif
-                                      GC->Curve3D();
-//      if (!C.IsNull()) { //xpu031198, edge degeneree
-
         // xpu151298 : parameters can be setted for null curves
         //             see lbo & flo, to determine whether range is defined
         //             compare first and last parameters with default values.
@@ -168,12 +162,6 @@ static void UpdateCurves(BRep_ListOfCurveRepresentation& lcr,
     GC = Handle(BRep_GCurve)::DownCast(itcr.Value());
     if (!GC.IsNull()) {
       if (GC->IsCurve3D()) {
-#ifdef DEB
-        const Handle(Geom_Curve)& Crv =
-#endif
-                                      GC->Curve3D();
-//      if (!C.IsNull()) { //xpu031198, edge degeneree
-
         // xpu151298 : parameters can be setted for null curves
         //             see lbo & flo, to determine whether range is defined
         //             compare first and last parameters with default values.
diff --git a/src/BRepAlgo/BRepAlgo_Loop.cxx b/src/BRepAlgo/BRepAlgo_Loop.cxx
index 02aac8c..b010151 100644
--- a/src/BRepAlgo/BRepAlgo_Loop.cxx
+++ b/src/BRepAlgo/BRepAlgo_Loop.cxx
@@ -494,26 +494,22 @@ void BRepAlgo_Loop::Perform()
 #ifdef DEB
   if (AffichLoop) {
     cout <<"NewLoop"<<endl;
-    Standard_Integer NbEdges = 1;
     NbLoops++;
 #ifdef DRAW
+    Standard_Integer NbEdges = 1;
     sprintf(name,"FLoop_%d",NbLoops);
     DBRep::Set(name,myFace);
-#endif
     for (Mapit.Initialize(myVerOnEdges); Mapit.More(); Mapit.Next()) { 
       const TopoDS_Edge& E = TopoDS::Edge(Mapit.Key());
-#ifdef DRAW
       sprintf(name,"EEE_%d_%d",NbLoops,NbEdges++);
       DBRep::Set(name,E);
-#endif
     }
     for (itl.Initialize(myConstEdges); itl.More(); itl.Next()) {
       const TopoDS_Edge& E = TopoDS::Edge(itl.Value());    
-#ifdef DRAW
       sprintf(name,"EEE_%d_%d",NbLoops,NbEdges++);
       DBRep::Set(name,E);
-#endif
     }
+#endif
   }
 #endif
   
diff --git a/src/BRepBlend/BRepBlend_RstRstConstRad.cxx b/src/BRepBlend/BRepBlend_RstRstConstRad.cxx
index 041438e..38e1203 100644
--- a/src/BRepBlend/BRepBlend_RstRstConstRad.cxx
+++ b/src/BRepBlend/BRepBlend_RstRstConstRad.cxx
@@ -806,9 +806,6 @@ Standard_Boolean BRepBlend_RstRstConstRad::Section(const Blend_Point& P,
   math_Matrix gradsol(1, 2, 1, 2);
   
   Standard_Real prm       = P.Parameter();
-#ifdef DEB
-  Standard_Integer NbSpan = (Poles.Length() - 1) / 2;
-#endif
   Standard_Integer low    = Poles.Lower();
   Standard_Integer upp    = Poles.Upper();
   Standard_Boolean istgt;
diff --git a/src/BRepBlend/BRepBlend_RstRstEvolRad.cxx b/src/BRepBlend/BRepBlend_RstRstEvolRad.cxx
index 9370e96..6180cb8 100644
--- a/src/BRepBlend/BRepBlend_RstRstEvolRad.cxx
+++ b/src/BRepBlend/BRepBlend_RstRstEvolRad.cxx
@@ -909,9 +909,6 @@ Standard_Boolean BRepBlend_RstRstEvolRad::Section(const Blend_Point& P,
   math_Matrix gradsol(1, 2, 1, 2);
   
   Standard_Real prm       = P.Parameter();
-#ifdef DEB
-  Standard_Integer NbSpan = (Poles.Length() - 1) / 2;
-#endif
   Standard_Integer low    = Poles.Lower();
   Standard_Integer upp    = Poles.Upper();
   Standard_Boolean istgt;
diff --git a/src/BRepBlend/BRepBlend_SurfCurvConstRadInv.cxx b/src/BRepBlend/BRepBlend_SurfCurvConstRadInv.cxx
index 8a03cca..f98f598 100644
--- a/src/BRepBlend/BRepBlend_SurfCurvConstRadInv.cxx
+++ b/src/BRepBlend/BRepBlend_SurfCurvConstRadInv.cxx
@@ -102,9 +102,6 @@ Standard_Boolean BRepBlend_SurfCurvConstRadInv::Derivatives(const math_Vector& X
   Standard_Real normd1gui = d1gui.Magnitude();
   Standard_Real unsurnormd1gui = 1./normd1gui;
   gp_Vec nplan = d1gui.Multiplied(unsurnormd1gui);
-#ifdef DEB
-  Standard_Real theD = -(nplan.XYZ().Dot(ptgui.XYZ()));
-#endif
   gp_Vec dnplan;
   dnplan.SetLinearForm(-nplan.Dot(d2gui),nplan,d2gui);
   dnplan.Multiply(unsurnormd1gui);
diff --git a/src/BRepBlend/BRepBlend_SurfCurvEvolRadInv.cxx b/src/BRepBlend/BRepBlend_SurfCurvEvolRadInv.cxx
index cc4b2de..e4a41fa 100644
--- a/src/BRepBlend/BRepBlend_SurfCurvEvolRadInv.cxx
+++ b/src/BRepBlend/BRepBlend_SurfCurvEvolRadInv.cxx
@@ -100,9 +100,6 @@ const Handle(Adaptor3d_HCurve)& Cg,
   ray=sg1*ray;
   dray=sg1*dray;
   gp_Vec nplan = d1gui.Multiplied(unsurnormd1gui);
-#ifdef DEB
-  Standard_Real theD = -(nplan.XYZ().Dot(ptgui.XYZ()));
-#endif
   gp_Vec dnplan;
   dnplan.SetLinearForm(-nplan.Dot(d2gui),nplan,d2gui);
   dnplan.Multiply(unsurnormd1gui);
diff --git a/src/BRepBlend/BRepBlend_SurfRstConstRad.cxx b/src/BRepBlend/BRepBlend_SurfRstConstRad.cxx
index 461e9f0..6e55eed 100644
--- a/src/BRepBlend/BRepBlend_SurfRstConstRad.cxx
+++ b/src/BRepBlend/BRepBlend_SurfRstConstRad.cxx
@@ -870,9 +870,6 @@ Standard_Boolean BRepBlend_SurfRstConstRad::Section
   math_Matrix gradsol(1,3,1,3);
   
   Standard_Real prm = P.Parameter();
-#ifdef DEB
-  Standard_Integer NbSpan=(Poles.Length()-1)/2;
-#endif
   Standard_Integer low = Poles.Lower();
   Standard_Integer upp = Poles.Upper();
   Standard_Boolean istgt;
diff --git a/src/BRepBlend/BRepBlend_SurfRstEvolRad.cxx b/src/BRepBlend/BRepBlend_SurfRstEvolRad.cxx
index 8d6db06..cec43a3 100644
--- a/src/BRepBlend/BRepBlend_SurfRstEvolRad.cxx
+++ b/src/BRepBlend/BRepBlend_SurfRstEvolRad.cxx
@@ -877,9 +877,6 @@ TColStd_Array1OfReal& DWeigths)
   math_Matrix gradsol(1,3,1,3);
   
   Standard_Real prm = P.Parameter(),rayprim;
-#ifdef DEB
-  Standard_Integer NbSpan=(Poles.Length()-1)/2;
-#endif
   Standard_Integer low = Poles.Lower();
   Standard_Integer upp = Poles.Upper();
   Standard_Boolean istgt;
diff --git a/src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx b/src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx
index 200d0c3..e7bd06b 100644
--- a/src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx
+++ b/src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx
@@ -909,9 +909,6 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfCurvFuncInv&
 						       Handle(Adaptor3d_HVertex)&  Vtx) 
 {
   Standard_Boolean recadre = Standard_False;
-#ifdef DEB
-  Standard_Boolean byinter = (line->NbPoints() != 0);
-#endif
   gp_Pnt2d pt2d, lastpt2d;
   Standard_Integer IndexSol, nbarc;
   Standard_Real pmin;
diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx
index 4def89c..e499429 100644
--- a/src/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx
@@ -157,6 +157,7 @@ static void Update (   TopTools_DataMapOfShapeListOfShape& Mod,
 
 static void DEBControl (const TopTools_DataMapOfShapeListOfShape& MG)
 {
+#ifdef DRAW
   char name[100];
   Standard_Integer IK = 0;
   
@@ -164,19 +165,16 @@ static void DEBControl (const TopTools_DataMapOfShapeListOfShape& MG)
   for (; it.More(); it.Next()) {
     const TopoDS_Shape& OS = it.Key();
     sprintf(name, "SK_%d",++IK);
-#ifdef DRAW
     DBRep::Set(name,OS);
-#endif
     TopTools_ListIteratorOfListOfShape itl(MG(OS));
     Standard_Integer IV = 1;
     for (; itl.More(); itl.Next()) {
       const TopoDS_Shape& NS = itl.Value();
       sprintf(name, "SV_%d_%d",IK,IV++);
-#ifdef DRAW
       DBRep::Set(name,NS);
-#endif
     }
   }
+#endif
 }
 #endif
 //=======================================================================
diff --git a/src/BRepCheck/BRepCheck_Face.cxx b/src/BRepCheck/BRepCheck_Face.cxx
index bee93a4..494dbb0 100644
--- a/src/BRepCheck/BRepCheck_Face.cxx
+++ b/src/BRepCheck/BRepCheck_Face.cxx
@@ -266,10 +266,6 @@ BRepCheck_Status BRepCheck_Face::ClassifyWires(const Standard_Boolean Update)
     TopoDS_Shape aLocalShape = myShape.EmptyCopied();
     TopoDS_Face newFace = TopoDS::Face(aLocalShape);
 //    TopoDS_Face newFace = TopoDS::Face(myShape.EmptyCopied());
-#ifdef DEB
-    TopAbs_Orientation orWire = 
-#endif
-      wir1.Orientation();
     newFace.Orientation(TopAbs_FORWARD);
     B.Add(newFace,wir1);
 
diff --git a/src/BRepCheck/BRepCheck_Shell.cxx b/src/BRepCheck/BRepCheck_Shell.cxx
index a45c86e..34c42b2 100644
--- a/src/BRepCheck/BRepCheck_Shell.cxx
+++ b/src/BRepCheck/BRepCheck_Shell.cxx
@@ -433,7 +433,6 @@ BRepCheck_Status BRepCheck_Shell::Orientation(const Standard_Boolean Update)
   if (BRepCheck_Trace(0) > 1) {
     TopTools_DataMapIteratorOfDataMapOfShapeInteger itt(MapOfShapeOrientation);
     Standard_Integer upper = MapOfShapeOrientation.NbBuckets();
-    Standard_Integer code = 0;
     cout << "La map shape Orientation :" << endl;
     for (; itt.More(); itt.Next()) {
       PrintShape(itt.Key(), upper);
diff --git a/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx b/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx
index 477787d..ba45e5a 100644
--- a/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx
+++ b/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx
@@ -89,10 +89,6 @@ Standard_Boolean BRepClass3d_SolidExplorer::FindAPointInTheFace
     if(numedg==0 || nedg++==numedg) { 
       TopoDS_Edge Edge = TopoDS::Edge(faceexplorer.Current());
       c.Initialize(Edge,face);
-#ifdef DEB
-      Standard_Integer nbinterval = 
-#endif
-	c.NbIntervals(GeomAbs_C1); 
       c.D1((c.LastParameter() - c.FirstParameter()) * param_ + c.FirstParameter(),P,T);
       
       Standard_Real x=T.X();
diff --git a/src/BRepFeat/BRepFeat.cxx b/src/BRepFeat/BRepFeat.cxx
index fbb9c68..0f93bf0 100644
--- a/src/BRepFeat/BRepFeat.cxx
+++ b/src/BRepFeat/BRepFeat.cxx
@@ -175,11 +175,7 @@ Standard_Real BRepFeat::ParametricBarycenter(const TopoDS_Shape& S,
 	  }
 	}
 	nbp++;
-#ifdef DEB
-	Standard_Real prmp = extpc.Point(kmin).Parameter();
-#else
         extpc.Point(kmin).Parameter();
-#endif
       }	  
     }
   }
diff --git a/src/BRepFeat/BRepFeat_MakeLinearForm.cxx b/src/BRepFeat/BRepFeat_MakeLinearForm.cxx
index b759f43..d311d20 100644
--- a/src/BRepFeat/BRepFeat_MakeLinearForm.cxx
+++ b/src/BRepFeat/BRepFeat_MakeLinearForm.cxx
@@ -622,10 +622,6 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
 	counter1++;
 	NewListOfEdges.Append(edg);
 	theEdge = eeee;
-#ifdef DEB
-	Standard_Real dist1 = 
-#endif
-	  theLastPnt.Distance(myLastPnt);
 
 	if(dist <= myTol) 
 	  theFEdge = edg;
@@ -1147,13 +1143,7 @@ void BRepFeat_MakeLinearForm::Perform()
       // on arrive pas a chainer la section
       return Standard_False;
     }
-// #ifdef DEB
-//     Standard_Boolean isnb=
-// #endif
     TopTools_ListOfShape thelist1;
-#ifdef DEB
-     Standard_Boolean isnb=
-#endif
     mySlface.Bind(CurrentFace, thelist1);
     mySlface(CurrentFace).Append(edg1);
     myListOfEdges.Append(edg1);
@@ -1196,10 +1186,6 @@ static void MajMap(const TopoDS_Shape& theB,
   
   for (exp.Init(theB,TopAbs_EDGE); exp.More(); exp.Next()) {
     if (!theMap.IsBound(exp.Current())) {
-#ifdef DEB
-      const TopoDS_Edge& e = 
-#endif
-      TopoDS::Edge(exp.Current());
       TopTools_ListOfShape thelist2; 
       theMap.Bind(exp.Current(), thelist2);
       theMap(exp.Current()) = theP.Shapes(exp.Current());
diff --git a/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx b/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx
index 321f0d0..10b4f7e 100644
--- a/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx
+++ b/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx
@@ -438,14 +438,6 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
     
     if(Sliding && !PtOnFirstEdge) {
       BRepExtrema_ExtCF ext1(TopoDS::Edge(ee1.Shape()), FirstFace);
-#ifdef DEB
-      Standard_Integer nb = 
-#endif
-                            ext1.NbExt();
-#ifdef DEB
-      Standard_Real dist =
-#endif
-                            ext1.SquareDistance(1);
       if(ext1.NbExt() < 1 || ext1.SquareDistance(1) > Precision::Confusion() * Precision::Confusion()) 
 	Sliding = Standard_False;
     }
@@ -755,10 +747,6 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
 	counter1++;
 	NewListOfEdges.Append(edg);
 	theEdge = eeee;
-#ifdef DEB
-	Standard_Real dist1 = 
-#endif
-	  theLastPnt.Distance(myLastPnt);
 	if(dist <= myTol) 
 	  theFEdge = edg;
 	theLastPnt = BRep_Tool::Pnt(TopExp::LastVertex(theEdge,Standard_True));
@@ -1733,10 +1721,6 @@ static void MajMap(const TopoDS_Shape& theB,
 
   for (exp.Init(theB,TopAbs_EDGE); exp.More(); exp.Next()) {
     if (!theMap.IsBound(exp.Current())) {
-#ifdef DEB
-      const TopoDS_Edge& e = 
-#endif
-      TopoDS::Edge(exp.Current());
       TopTools_ListOfShape thelist2;
       theMap.Bind(exp.Current(), thelist2);
       theMap(exp.Current()) = theP.Shapes(exp.Current());
diff --git a/src/BRepFill/BRepFill_CompatibleWires.cxx b/src/BRepFill/BRepFill_CompatibleWires.cxx
index e04c24d..a1a23a8 100644
--- a/src/BRepFill/BRepFill_CompatibleWires.cxx
+++ b/src/BRepFill/BRepFill_CompatibleWires.cxx
@@ -424,10 +424,6 @@ static Standard_Boolean EdgeIntersectOnWire (const gp_Pnt& P1,
       TopoDS_Shape aLocalShape = DSS.SupportOnShape2(isol);
       TopoDS_Edge E = TopoDS::Edge(aLocalShape);
 //      TopoDS_Edge E = TopoDS::Edge(DSS.SupportOnShape2(isol));
-#ifdef DEB
-      Standard_Real tol = 
-#endif
-	Precision::PConfusion();
       Standard_Real first,last,param;
       DSS.ParOnEdgeS2(isol,param);
       BRep_Tool::Range(E,first,last);
@@ -866,11 +862,6 @@ void BRepFill_CompatibleWires::
     
     // extremite du premier wire
     V1 = TopoDS::Vertex(SeqV.Value(1));	
-    // wire precedent
-#ifdef DEB
-    const TopoDS_Wire& wire2 = 
-#endif
-      TopoDS::Wire(myWork(i-1));
     // boucle sur les vertex de wire1
     for (ii=1;ii<=SeqV.Length();ii++) {
       
diff --git a/src/BRepFill/BRepFill_Draft.cxx b/src/BRepFill/BRepFill_Draft.cxx
index eeb4740..6e5d85f 100644
--- a/src/BRepFill/BRepFill_Draft.cxx
+++ b/src/BRepFill/BRepFill_Draft.cxx
@@ -388,9 +388,6 @@ static Standard_Boolean GoodOrientation(const Bnd_Box& B,
 // boite englobant la shape d'arret
   Bnd_Box BSurf;//, TheBox;
   Standard_Real Umin, Umax, Vmin, Vmax;
-#ifdef DEB
-  Standard_Real Tol = Precision::Confusion()/10;
-#endif
 //  BRepTools B;
 //  BRep_Tool BT;
   Handle(Geom_Surface) Surf;
diff --git a/src/BRepFill/BRepFill_Evolved.cxx b/src/BRepFill/BRepFill_Evolved.cxx
index fddb0db..90621ff 100644
--- a/src/BRepFill/BRepFill_Evolved.cxx
+++ b/src/BRepFill/BRepFill_Evolved.cxx
@@ -116,9 +116,11 @@
 #include <stdio.h>
 #endif
 
-#ifdef DEB
-static Standard_Boolean AffichGeom = Standard_False;
+#if defined(DRAW) || defined(DEB)
 static Standard_Boolean AffichEdge = Standard_False;
+#endif
+#ifdef DRAW
+static Standard_Boolean AffichGeom = Standard_False;
 static Standard_Integer NbFACES       = 0;
 static Standard_Integer NbTRIMFACES   = 0;
 static Standard_Integer NbVEVOS       = 0;
@@ -327,10 +329,6 @@ static Standard_Boolean IsPlanar(const TopoDS_Edge& E)
 static Standard_Integer Side(const TopoDS_Wire&  Profil,
 			     const Standard_Real Tol)
 {
-#ifdef DEB
-  Standard_Boolean OnLeft  = Standard_False;
-  Standard_Boolean OnRight = Standard_False;
-#endif
   TopoDS_Vertex    V1,V2;
   // Rem : il suffit de tester sur le premier edge du Wire.
   //       ( Correctement decoupe dans PrepareProfil)
@@ -1844,10 +1842,7 @@ void BRepFill_Evolved::Add(      BRepFill_Evolved& Vevo,
 #else
     Standard_Boolean   Commun;
 #endif
-#ifdef DEB
-    TopAbs_Orientation OriSide = 
-#endif
-      Relative(myProfile,Prof,
+    Relative(myProfile,Prof,
 	       TopoDS::Vertex(VV),
 	       Commun);
 
@@ -2939,11 +2934,6 @@ TopAbs_Orientation OriEdgeInFace (const TopoDS_Edge& E,
 				  const TopoDS_Face& F )
 
 {
-#ifdef DEB
-  TopAbs_Orientation O = 
-#endif
-    F.Orientation();
-
   TopExp_Explorer Exp(F.Oriented(TopAbs_FORWARD),TopAbs_EDGE);
 
   for (; Exp.More() ;Exp.Next()) {
diff --git a/src/BRepFill/BRepFill_MultiLine.cxx b/src/BRepFill/BRepFill_MultiLine.cxx
index d2dcd39..7b4cdfb 100644
--- a/src/BRepFill/BRepFill_MultiLine.cxx
+++ b/src/BRepFill/BRepFill_MultiLine.cxx
@@ -39,7 +39,7 @@
 #include <DrawTrSurf.hxx>
 #endif
 
-#ifdef DEB
+#ifdef DRAW
 static Standard_Boolean AffichCurve = Standard_False;
 static Standard_Integer NbProj = 1;
 #endif
diff --git a/src/BRepFill/BRepFill_OffsetWire.cxx b/src/BRepFill/BRepFill_OffsetWire.cxx
index 1f0f8d0..7adfa73 100644
--- a/src/BRepFill/BRepFill_OffsetWire.cxx
+++ b/src/BRepFill/BRepFill_OffsetWire.cxx
@@ -96,13 +96,14 @@
 #include <DBRep.hxx>
 #endif
 
-#ifdef DEB
+#if defined(DRAW) || defined(DEB)
+static Standard_Boolean AffichEdge  = Standard_False;
+#endif
+#ifdef DRAW
 static Standard_Boolean AffichGeom  = Standard_False;
 static Standard_Boolean Affich2d    = Standard_False;
-static Standard_Boolean AffichEdge  = Standard_False;
 static Standard_Integer NbTRIMEDGES = 0;
 static Standard_Integer NbOFFSET    = 0;
-static Standard_Integer NbEDGES     = 0;
 static Standard_Integer NbBISSEC    = 0;
 #ifndef WNT
 static char tname[100];
@@ -1836,10 +1837,6 @@ void MakeOffset (const TopoDS_Edge&        E,
     // si l offset est superieur ou egal au rayon et du cote de la 
     // concavite du cercle => edge null.
     gp_Circ2d C1(AC.Circle());
-#ifdef DEB
-    Standard_Real radius = 
-#endif
-                           C1.Radius();
     gp_Ax22d axes( C1.Axis());
     gp_Dir2d Xd = axes.XDirection();
     gp_Dir2d Yd = axes.YDirection();
diff --git a/src/BRepFill/BRepFill_TrimShellCorner.cxx b/src/BRepFill/BRepFill_TrimShellCorner.cxx
index b48971d..bb9255e 100644
--- a/src/BRepFill/BRepFill_TrimShellCorner.cxx
+++ b/src/BRepFill/BRepFill_TrimShellCorner.cxx
@@ -547,7 +547,6 @@ Standard_Boolean MakeFacesNonSec(const Standard_Integer                     theI
     aFace.Orientation(TopAbs_FORWARD);
 
     TopExp_Explorer anExpE(aFace, TopAbs_EDGE);
-    const TopoDS_Shape& aCheckEdge = (fit == 1) ? aE1 : aE2;
 
     if(bHasNewEdge) {
       aNewEdge.Orientation(TopAbs_FORWARD);
diff --git a/src/BRepOffset/BRepOffset_Inter2d.cxx b/src/BRepOffset/BRepOffset_Inter2d.cxx
index 376e601..f67a699 100644
--- a/src/BRepOffset/BRepOffset_Inter2d.cxx
+++ b/src/BRepOffset/BRepOffset_Inter2d.cxx
@@ -37,8 +37,7 @@
 
 #ifdef DRAW 
 #include <DBRep.hxx>
-#endif
-#ifdef DEB
+
 #ifndef WNT
 extern Standard_Integer AffichInt2d;
 #else
@@ -1402,7 +1401,7 @@ void BRepOffset_Inter2d::Compute (const Handle(BRepAlgo_AsDes)&   AsDes,
 				  const TopTools_MapOfShape&      NewEdges,
 				  const Standard_Real             Tol)
 {
-#ifdef DEB
+#ifdef DRAW
   NbF2d++;
   NbE2d = 0;
 #endif 
diff --git a/src/BRepOffset/BRepOffset_MakeLoops.cxx b/src/BRepOffset/BRepOffset_MakeLoops.cxx
index bdafdc0..0e12810 100644
--- a/src/BRepOffset/BRepOffset_MakeLoops.cxx
+++ b/src/BRepOffset/BRepOffset_MakeLoops.cxx
@@ -25,7 +25,7 @@
 #ifdef DRAW
 #include <DBRep.hxx>
 #endif
-#ifdef DEB
+#ifdef DRAW
 Standard_Integer NbF = 1;
 static Standard_Boolean Affich = Standard_False;
 //POP pour NT
diff --git a/src/BRepOffset/BRepOffset_MakeOffset.cxx b/src/BRepOffset/BRepOffset_MakeOffset.cxx
index 437ad0a..05a8fb8 100644
--- a/src/BRepOffset/BRepOffset_MakeOffset.cxx
+++ b/src/BRepOffset/BRepOffset_MakeOffset.cxx
@@ -130,9 +130,11 @@
 static void DEBVerticesControl (const TopTools_MapOfShape&    NewEdges,
 				      Handle(BRepAlgo_AsDes)  AsDes)
 {
+#ifdef DRAW
   Standard_Integer NVP = 0;
   Standard_Integer NVM = 0;
   Standard_Integer NVN = 0;
+#endif
 
   TopTools_ListOfShape               LVP;
   TopTools_MapIteratorOfMapOfShape   it;
@@ -1011,9 +1013,6 @@ void BRepOffset_MakeOffset::BuildOffsetByInter()
   TopoDS_Shape    NE;
   TopoDS_Edge     TNE;
   TopoDS_Face     NF;
-#ifdef DEB
-  TopAbs_Orientation Or;
-#endif
   
   for (Exp.Init(myShape,TopAbs_FACE) ; Exp.More(); Exp.Next()) {
     const TopoDS_Face& FI = TopoDS::Face(Exp.Current());
@@ -1540,9 +1539,6 @@ void BRepOffset_MakeOffset::BuildOffsetByArc()
   BRepOffset_Type    RT = BRepOffset_Concave;
   if (myOffset < 0.) RT = BRepOffset_Convex;
   BRepOffset_DataMapIteratorOfDataMapOfShapeOffset It(MapSF);
-#ifdef DEB
-  Standard_Integer MapSFNb = MapSF.Extent();
-#endif
   for ( ; It.More(); It.Next()) {
     const TopoDS_Shape& SI = It.Key(); 
     const BRepOffset_Offset& SF = It.Value();
diff --git a/src/BRepOffset/BRepOffset_Offset.cxx b/src/BRepOffset/BRepOffset_Offset.cxx
index 9152386..4f1dbf0 100644
--- a/src/BRepOffset/BRepOffset_Offset.cxx
+++ b/src/BRepOffset/BRepOffset_Offset.cxx
@@ -1300,9 +1300,9 @@ void BRepOffset_Offset::Init(const TopoDS_Vertex&        Vertex,
 #endif
     Standard_Integer NbEdges = 1;
     for (it.Initialize(LEdge); it.More(); it.Next()) {
-      const TopoDS_Edge& CurE = TopoDS::Edge(it.Value());
       sprintf(name,"EOnSph_%d_%d",NbOFFSET,NbEdges++);
 #ifdef DRAW
+      const TopoDS_Edge& CurE = TopoDS::Edge(it.Value());
       DBRep::Set(name, CurE);
 #endif
     }
diff --git a/src/BRepOffset/BRepOffset_Tool.cxx b/src/BRepOffset/BRepOffset_Tool.cxx
index c50db9b..c90a1b1 100644
--- a/src/BRepOffset/BRepOffset_Tool.cxx
+++ b/src/BRepOffset/BRepOffset_Tool.cxx
@@ -146,9 +146,11 @@
 #include <DBRep.hxx>
 #endif
 
-#ifdef DEB       
-Standard_Boolean AffichInter  = Standard_False;
+#if defined(DRAW) || defined(DEB)
 static Standard_Boolean AffichExtent = Standard_False;
+#endif
+#ifdef DRAW
+Standard_Boolean AffichInter  = Standard_False;
 static Standard_Integer NbNewEdges  = 1;
 static Standard_Integer NbFaces     = 1;
 static Standard_Integer NbFOB       = 1;
@@ -185,10 +187,6 @@ TopAbs_Orientation BRepOffset_Tool::OriEdgeInFace (const TopoDS_Edge& E,
 						   const TopoDS_Face& F )
 
 {
-#ifdef DEB
-  TopAbs_Orientation O = 
-#endif
-    F.Orientation();
   TopExp_Explorer Exp;
   Exp.Init(F.Oriented(TopAbs_FORWARD),TopAbs_EDGE);
 
diff --git a/src/BRepTest/BRepTest_FillingCommands.cxx b/src/BRepTest/BRepTest_FillingCommands.cxx
index 081a082..d6175c9 100644
--- a/src/BRepTest/BRepTest_FillingCommands.cxx
+++ b/src/BRepTest/BRepTest_FillingCommands.cxx
@@ -193,10 +193,7 @@ static Standard_Integer plate (Draw_Interpretor & di,Standard_Integer n,const ch
     DBRep::Set(name, E);
     MW.Add(E);
     if (MW.IsDone()==Standard_False) {
-#if DEB
-      BRepBuilderAPI_WireError err =
-#endif
-                                     MW.Error();
+      MW.Error();
       Standard_Failure::Raise("mkWire is over ");
     }
       
@@ -429,10 +426,7 @@ static Standard_Integer approxplate (Draw_Interpretor & di,Standard_Integer n,co
     BRepLib::BuildCurve3d(E);
     MW.Add(E);
     if (MW.IsDone()==Standard_False) {
-#ifdef DEB
-      BRepBuilderAPI_WireError err =
-#endif
-                                     MW.Error();
+      MW.Error();
       Standard_Failure::Raise("mkWire is over ");
     }
   }
diff --git a/src/BRepTest/BRepTest_SurfaceCommands.cxx b/src/BRepTest/BRepTest_SurfaceCommands.cxx
index 88b7f8b..461af1f 100644
--- a/src/BRepTest/BRepTest_SurfaceCommands.cxx
+++ b/src/BRepTest/BRepTest_SurfaceCommands.cxx
@@ -338,21 +338,11 @@ static Standard_Integer continuity (Draw_Interpretor& ,
   aFind.Dump();
 
   for (i=1; i<=aFind.NbContigousEdges(); i++) {
-#ifdef DEB
-    const TopoDS_Edge& edge =
-#endif
-                              aFind.ContigousEdge(i);
     const TopTools_ListOfShape& list = aFind.ContigousEdgeCouple(i);
     const TopoDS_Edge& sec1 = TopoDS::Edge(list.First());
     const TopoDS_Edge& sec2 = TopoDS::Edge(list.Last());
-#ifdef DEB
-    const TopoDS_Edge& bound1 =
-#endif
-                                aFind.SectionToBoundary(sec1);
-#ifdef DEB
-    const TopoDS_Edge& bound2 =
-#endif
-                                aFind.SectionToBoundary(sec2);
+    aFind.SectionToBoundary(sec1);
+    aFind.SectionToBoundary(sec2);
   }
 
   return 0;
diff --git a/src/BRepTools/BRepTools_Quilt.cxx b/src/BRepTools/BRepTools_Quilt.cxx
index a6c65f3..5ded198 100644
--- a/src/BRepTools/BRepTools_Quilt.cxx
+++ b/src/BRepTools/BRepTools_Quilt.cxx
@@ -194,11 +194,6 @@ void BRepTools_Quilt::Add(const TopoDS_Shape& S)
 	  TopoDS_Wire NW;
 	  B.MakeWire(NW);
 	  TopoDS_Iterator ite(W,Standard_False);
-#ifdef DEB
-	  Standard_Real   Tol = BRep_Tool::Tolerance(F);
-#else
-          BRep_Tool::Tolerance(F);
-#endif
 	  Standard_Real   UFirst,ULast;
 	  
 	  // Reconstruction des wires.
diff --git a/src/Bisector/Bisector_Inter.cxx b/src/Bisector/Bisector_Inter.cxx
index 1aa4bad..1b177c9 100644
--- a/src/Bisector/Bisector_Inter.cxx
+++ b/src/Bisector/Bisector_Inter.cxx
@@ -27,8 +27,7 @@
 #include <Draw_Appli.hxx>
 #include <DrawTrSurf_Curve2d.hxx>
 #include <Draw_Marker2D.hxx>
-#endif
-#ifdef DEB
+
 static Standard_Boolean Affich = Standard_False;
 #endif
 
diff --git a/src/BlendFunc/BlendFunc_CSConstRad.cxx b/src/BlendFunc/BlendFunc_CSConstRad.cxx
index e04080b..43c3320 100644
--- a/src/BlendFunc/BlendFunc_CSConstRad.cxx
+++ b/src/BlendFunc/BlendFunc_CSConstRad.cxx
@@ -871,9 +871,6 @@ Standard_Boolean BlendFunc_CSConstRad::Section
   math_Matrix gradsol(1,3,1,3);
 
   Standard_Real prm = P.Parameter();
-#ifdef DEB
-  Standard_Integer NbSpan=(Poles.Length()-1)/2;
-#endif
   Standard_Integer low = Poles.Lower();
   Standard_Integer upp = Poles.Upper();
   Standard_Boolean istgt;
diff --git a/src/BlendFunc/BlendFunc_Chamfer.cxx b/src/BlendFunc/BlendFunc_Chamfer.cxx
index 4b7d91b..733a2f9 100644
--- a/src/BlendFunc/BlendFunc_Chamfer.cxx
+++ b/src/BlendFunc/BlendFunc_Chamfer.cxx
@@ -12,9 +12,6 @@
 #include <ElCLib.hxx>
 #include <Precision.hxx>
 #include <Standard_NotImplemented.hxx>
-#ifdef DEB
-static Standard_Boolean putsderivatives = 0;
-#endif
 
 //=======================================================================
 //function : BlendFunc_Chamfer
diff --git a/src/ChFi2d/ChFi2d_Builder.cxx b/src/ChFi2d/ChFi2d_Builder.cxx
index 8efcb79..aae3a2a 100644
--- a/src/ChFi2d/ChFi2d_Builder.cxx
+++ b/src/ChFi2d/ChFi2d_Builder.cxx
@@ -623,10 +623,7 @@ TopoDS_Edge ChFi2d_Builder::BuildNewEdge(const TopoDS_Edge& E1,
   TopoDS_Edge anEdge = makeEdge;
   anEdge.Orientation(E1.Orientation());
 //  anEdge.Location(E1.Location());
-#ifdef DEB
-  BRepLib_EdgeError error = 
-#endif
-    makeEdge.Error();
+  makeEdge.Error();
   return anEdge;
 }
 
diff --git a/src/DBRep/DBRep_IsoBuilder.cxx b/src/DBRep/DBRep_IsoBuilder.cxx
index f16fa56..eb451b1 100644
--- a/src/DBRep/DBRep_IsoBuilder.cxx
+++ b/src/DBRep/DBRep_IsoBuilder.cxx
@@ -112,10 +112,7 @@ DBRep_IsoBuilder::DBRep_IsoBuilder (const TopoDS_Face&     TopologicalFace,
     //-- Test if a TrimmedCurve is necessary
     if(   Abs(PCurve->FirstParameter()-U1)<= Precision::PConfusion() 
        && Abs(PCurve->LastParameter()-U2)<= Precision::PConfusion()) { 
-#ifdef DEB
-      Standard_Integer IndE =
-#endif
-                              AddElement (PCurve, TopologicalEdge.Orientation()) ;      
+      AddElement (PCurve, TopologicalEdge.Orientation());
     }
     else { 
       if (!PCurve->IsPeriodic()) {
@@ -123,10 +120,7 @@ DBRep_IsoBuilder::DBRep_IsoBuilder (const TopoDS_Face&     TopologicalFace,
 	if (!TrimPCurve.IsNull()) {
 	  if (TrimPCurve->BasisCurve()->FirstParameter()-U1 > Precision::PConfusion() ||
 	      U2-TrimPCurve->BasisCurve()->LastParameter()  > Precision::PConfusion()) {
-#ifdef DEB
-	    Standard_Integer IndE =
-#endif
-                                    AddElement (PCurve, TopologicalEdge.Orientation()) ;      
+	    AddElement (PCurve, TopologicalEdge.Orientation()) ;      
 #ifdef DEB
 	    cout<<"DBRep_IsoBuilder TrimPCurve : parameters out of range "<<endl;
 	    cout<<"    U1("<<U1<<"), Umin("<<PCurve->FirstParameter()
@@ -157,10 +151,7 @@ DBRep_IsoBuilder::DBRep_IsoBuilder (const TopoDS_Face&     TopologicalFace,
       if (Abs(U1-U2) <= Precision::PConfusion()) continue;
       
       Handle (Geom2d_TrimmedCurve) TrimPCurve = new Geom2d_TrimmedCurve (PCurve, U1, U2) ;
-#ifdef DEB
-      Standard_Integer IndE =
-#endif
-                              AddElement (TrimPCurve, TopologicalEdge.Orientation()) ;
+      AddElement (TrimPCurve, TopologicalEdge.Orientation()) ;
     }
   }
 
diff --git a/src/DDataStd/DDataStd_DrawDriver.cxx b/src/DDataStd/DDataStd_DrawDriver.cxx
index eb6e96c..f19513d 100644
--- a/src/DDataStd/DDataStd_DrawDriver.cxx
+++ b/src/DDataStd/DDataStd_DrawDriver.cxx
@@ -62,12 +62,6 @@ static Standard_Integer DISCRET    = 100;
 static Standard_Integer NBISOS     = 10;
 static Standard_Real    THESIZE       = 1000.;
 
-// Unused
-#ifdef DEB
-static Standard_Real    PLANETHESIZE  = 100.;
-static Standard_Real    DEFLECTION = 0.0;
-#endif
-
 static Handle(DDataStd_DrawDriver) DrawDriver;
 
 
diff --git a/src/DDocStd/DDocStd.cxx b/src/DDocStd/DDocStd.cxx
index 11a9e12..ffd62b6 100644
--- a/src/DDocStd/DDocStd.cxx
+++ b/src/DDocStd/DDocStd.cxx
@@ -77,9 +77,6 @@ Standard_Boolean DDocStd::Find (const Handle(TDocStd_Document)& D,
 				const Standard_Boolean  Complain)
 {
   Label.Nullify();
-#ifdef DEB
-  Standard_Boolean Found;
-#endif
   TDF_Tool::Label(D->GetData(),Entry,Label,Standard_False);
   if (Label.IsNull() && Complain) cout<<"No label for entry "<<Entry<<endl;
   return !Label.IsNull();
@@ -96,9 +93,6 @@ Standard_Boolean DDocStd::Find (const Handle(TDocStd_Document)& D,
 				Handle(TDF_Attribute)&  A,
 				const Standard_Boolean  Complain) 
 {
-#ifdef DEB
-  Standard_Boolean found;
-#endif
   TDF_Label L;
   if (Find(D,Entry,L,Complain)) {
     if (L.FindAttribute(ID,A)) return Standard_True;
diff --git a/src/Draw/Draw_VariableCommands.cxx b/src/Draw/Draw_VariableCommands.cxx
index cf34682..79c925c 100644
--- a/src/Draw/Draw_VariableCommands.cxx
+++ b/src/Draw/Draw_VariableCommands.cxx
@@ -791,9 +791,10 @@ void Draw::Set(const Standard_CString Name, const Standard_Real val)
 Handle(Draw_Drawable3D) Draw::Get(Standard_CString& name, 
 			          const Standard_Boolean )
 {
+#if !((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))) || defined(USE_NON_CONST)
   Standard_PCharacter pName;
-  //
   pName=(Standard_PCharacter)name;
+#endif
   //
   Standard_Boolean pick = ((name[0] == '.') && (name[1] == '\0'));
   Handle(Draw_Drawable3D) D;
diff --git a/src/Draw/Draw_Viewer.cxx b/src/Draw/Draw_Viewer.cxx
index 822cd0e..9f17e42 100644
--- a/src/Draw/Draw_Viewer.cxx
+++ b/src/Draw/Draw_Viewer.cxx
@@ -498,9 +498,6 @@ void   Draw_Viewer::RotateView  (const Standard_Integer id,
   if (Draw_Batch) return;
   if (myViews[id]) {
     gp_Trsf T = myViews[id]->Matrix;
-#ifdef DEB
-    Standard_Real z = myViews[id]->Zoom;
-#endif
 
     T.Invert();
     gp_Pnt PP(0,0,0);
diff --git a/src/Draw/Draw_Window.cxx b/src/Draw/Draw_Window.cxx
index aea14a7..582094e 100644
--- a/src/Draw/Draw_Window.cxx
+++ b/src/Draw/Draw_Window.cxx
@@ -751,7 +751,7 @@ Standard_Boolean Draw_Window::Save (const char* theFileName) const
 
 void ProcessEvent(Draw_Window& win, XEvent& xev)
 {
-  Standard_Integer X,Y,button,lenk;
+  Standard_Integer X,Y,button;
   KeySym keysym;
   XComposeStatus stat;
   char chainekey[10];
@@ -778,7 +778,7 @@ void ProcessEvent(Draw_Window& win, XEvent& xev)
     break;
 
   case KeyPress :
-    lenk = XLookupString(&(xev.xkey),
+    XLookupString(&(xev.xkey),
                          chainekey,
                          10,
                          &keysym,
diff --git a/src/DrawDim/DrawDim_Angle.cxx b/src/DrawDim/DrawDim_Angle.cxx
index f37c8bc..e35027e 100644
--- a/src/DrawDim/DrawDim_Angle.cxx
+++ b/src/DrawDim/DrawDim_Angle.cxx
@@ -165,10 +165,6 @@ void DrawDim_Angle::DrawOn(Draw_Display& ) const
       gp_Vec curvec (AxePosition, curpt);
       gp_XYZ curXYZ = curvec.XYZ();
       gp_XYZ Norm (curXYZ.Crossed(AxeXYZ));
-#ifdef DEB
-      Standard_Real NormMod =
-#endif
-                              Norm.Modulus();
       if (Norm.Modulus() > gp::Resolution()) {
 	Standard_Real curdist = curpos.Distance (curpt);
 	if (curdist < dist) {
diff --git a/src/DrawDim/DrawDim_PlanarAngle.cxx b/src/DrawDim/DrawDim_PlanarAngle.cxx
index e033d02..d876bff 100644
--- a/src/DrawDim/DrawDim_PlanarAngle.cxx
+++ b/src/DrawDim/DrawDim_PlanarAngle.cxx
@@ -39,14 +39,6 @@
 #include <DBRep_DrawableShape.hxx>
 #include <TopoDS.hxx>
 
-#ifdef DEB
-static Standard_Integer DISCRET    = 100;
-static Standard_Integer NBISOS     = 2;
-static Standard_Real    SIZE       = 100.;
-static Standard_Real    DEFLECTION = 0.0;
-static Standard_Real    RAP        = 0.4;
-#endif
-
 //=======================================================================
 //function : DrawDim_PlanarAngle
 //purpose  : 
diff --git a/src/DrawFairCurve/DrawFairCurve_Batten.cxx b/src/DrawFairCurve/DrawFairCurve_Batten.cxx
index cf23436..7d72b2d 100644
--- a/src/DrawFairCurve/DrawFairCurve_Batten.cxx
+++ b/src/DrawFairCurve/DrawFairCurve_Batten.cxx
@@ -22,10 +22,7 @@ DrawFairCurve_Batten::DrawFairCurve_Batten(const Standard_Address TheBatten)
 void DrawFairCurve_Batten::Compute()
 {
   FairCurve_AnalysisCode Iana;
-#ifdef DEB
-  Standard_Boolean Ok =
-#endif
-                        ((FairCurve_Batten*)MyBatten)->Compute(Iana, 50, 1.0e-2);
+  ((FairCurve_Batten*)MyBatten)->Compute(Iana, 50, 1.0e-2);
   curv = ((FairCurve_Batten*)MyBatten)->Curve();
 }
 void DrawFairCurve_Batten::SetPoint(const Standard_Integer Side, const gp_Pnt2d& Point)
diff --git a/src/DsgPrs/DsgPrs.cxx b/src/DsgPrs/DsgPrs.cxx
index 6778b3c..8e97c78 100644
--- a/src/DsgPrs/DsgPrs.cxx
+++ b/src/DsgPrs/DsgPrs.cxx
@@ -588,16 +588,8 @@ void DsgPrs::ComputeFilletRadiusPresentation( const Standard_Real ArrowLength,
       FilletCirc.SetRadius( Center.Distance( FirstPoint ) ); //***
       gp_Vec vec1( dir1 );
       vec1 *= FilletCirc.Radius();
-#ifdef DEB
-      gp_Pnt p1 =
-#endif
-                  Center.Translated( vec1 );
       gp_Vec vec2( dir2 );
       vec2 *= FilletCirc.Radius();
-#ifdef DEB
-      gp_Pnt p2 =
-#endif
-                  Center.Translated( vec2 );
       gp_Vec PosVec;
       if(! Center.IsEqual( Position, Precision::Confusion() ))
 	PosVec.SetXYZ( gp_Vec(Center, Position).XYZ() );
diff --git a/src/DsgPrs/DsgPrs_ShapeDirPresentation.cxx b/src/DsgPrs/DsgPrs_ShapeDirPresentation.cxx
index 864962d..2ec0bca 100644
--- a/src/DsgPrs/DsgPrs_ShapeDirPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_ShapeDirPresentation.cxx
@@ -118,10 +118,6 @@ static Standard_Boolean FindPointOnFace(const TopoDS_Face& face, gp_Pnt2d& pt2d)
   // verify that (upar vpar) is a point on the face
 
   BRepClass_FaceClassifier fClass(face, pt2d, gp::Resolution());
-#ifdef DEB
-  TopAbs_State state =
-#endif
-                       fClass.State();
   if ((fClass.State() == TopAbs_OUT) || (fClass.State() == TopAbs_UNKNOWN)) {
     // try to find a point on face
     pt2d=points(1);
diff --git a/src/DsgPrs/DsgPrs_SymmetricPresentation.cxx b/src/DsgPrs/DsgPrs_SymmetricPresentation.cxx
index 99b8bcb..d0305cf 100644
--- a/src/DsgPrs/DsgPrs_SymmetricPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_SymmetricPresentation.cxx
@@ -537,10 +537,6 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
   if (parcur < parmin) parmin = parcur;
   if (parcur > parmax) parmax = parcur;
   parcur = ElCLib::Parameter(L3,OffsetPnt);
-#ifdef DEB
-  gp_Pnt offp =
-#endif
-                ElCLib::Value(parcur,L3);
 
   Standard_Boolean outside = Standard_False;
   if (parcur < parmin) {
@@ -890,10 +886,6 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
     if (parcur < parmin) parmin = parcur;
     if (parcur > parmax) parmax = parcur;
     parcur = ElCLib::Parameter(L3,OffsetPoint);
-#ifdef DEB
-    gp_Pnt offp =
-#endif
-                  ElCLib::Value(parcur,L3);
     
     Standard_Boolean outside = Standard_False;
     if (parcur < parmin) {
diff --git a/src/DsgPrs/DsgPrs_XYZAxisPresentation.cxx b/src/DsgPrs/DsgPrs_XYZAxisPresentation.cxx
index d517e36..5a644ff 100644
--- a/src/DsgPrs/DsgPrs_XYZAxisPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_XYZAxisPresentation.cxx
@@ -71,11 +71,6 @@ void DsgPrs_XYZAxisPresentation::Add(const Handle(Prs3d_Presentation)& aPresenta
   A(1).SetCoord(xo,yo,zo);
   A(2).SetCoord(x,y,z);
  
-#ifdef DEB
-  Quantity_Length arrowAngle = anArrowAspect->Angle();
-  Quantity_Length textHeight = aTextAspect->Height();
-#endif
-
   G->SetPrimitivesAspect(aLineAspect->Aspect());
   G->Polyline(A);
   G->SetPrimitivesAspect( anArrowAspect->Aspect() );
diff --git a/src/Extrema/Extrema_ExtElC.cxx b/src/Extrema/Extrema_ExtElC.cxx
index 65d44c8..2ee100f 100644
--- a/src/Extrema/Extrema_ExtElC.cxx
+++ b/src/Extrema/Extrema_ExtElC.cxx
@@ -53,7 +53,6 @@ class ExtremaExtElC_TrigonometricRoots {
   }
   //
   Standard_Boolean IsARoot(Standard_Real u) {
-    Standard_Integer i;
     Standard_Real PIpPI, aEps;
     //
     aEps=RealEpsilon();
diff --git a/src/Extrema/Extrema_ExtPElC.cxx b/src/Extrema/Extrema_ExtPElC.cxx
index 4ccf82f..e5a307d 100644
--- a/src/Extrema/Extrema_ExtPElC.cxx
+++ b/src/Extrema/Extrema_ExtPElC.cxx
@@ -280,11 +280,6 @@ Methode:
   Standard_Real R = C.MajorRadius();
   Standard_Real r = C.MinorRadius();
   gp_Vec OPp (O,Pp);
-#ifdef DEB
-  Standard_Real OPpMagn = OPp.Magnitude();
-#else
-  OPp.Magnitude();
-#endif
   Standard_Real X = OPp.Dot(gp_Vec(C.XAxis().Direction()));
   Standard_Real Y = OPp.Dot(gp_Vec(C.YAxis().Direction()));
 
@@ -374,11 +369,6 @@ Methode:
 
   Standard_Real F = C.Focal();
   gp_Vec OPp (O,Pp);
-#ifdef DEB
-  Standard_Real OPpMagn = OPp.Magnitude();
-#else
-  OPp.Magnitude();
-#endif
   Standard_Real X = OPp.Dot(gp_Vec(C.XAxis().Direction()));
 //  Standard_Real Y = Sqrt(OPpMagn*OPpMagn-X*X);
   Standard_Real Y = OPp.Dot(gp_Vec(C.YAxis().Direction()));
diff --git a/src/Extrema/Extrema_ExtPElC2d.cxx b/src/Extrema/Extrema_ExtPElC2d.cxx
index d735a28..02dce8f 100644
--- a/src/Extrema/Extrema_ExtPElC2d.cxx
+++ b/src/Extrema/Extrema_ExtPElC2d.cxx
@@ -144,11 +144,6 @@ void Extrema_ExtPElC2d::Perform (const gp_Pnt2d&     P,
     myDone = Standard_False;
   }
   else {
-#ifdef DEB
-    Standard_Real VMagn = V.Magnitude();
-#else
-    V.Magnitude();
-#endif
     Standard_Real X = V.Dot(gp_Vec2d(E.XAxis().Direction()));
     Standard_Real Y = V.Dot(gp_Vec2d(E.YAxis().Direction()));
 
@@ -195,11 +190,6 @@ void Extrema_ExtPElC2d::Perform(const gp_Pnt2d&     P,
   Standard_Real R = H.MajorRadius();
   Standard_Real r = H.MinorRadius();
   gp_Vec2d OPp(O,P);
-#ifdef DEB
-  Standard_Real OPpMagn = OPp.Magnitude();
-#else
-  OPp.Magnitude();
-#endif
   Standard_Real Tol2 = Tol * Tol;
   Standard_Real X = OPp.Dot(gp_Vec2d(H.XAxis().Direction()));
   Standard_Real Y = OPp.Dot(gp_Vec2d(H.YAxis().Direction()));
@@ -263,11 +253,6 @@ void Extrema_ExtPElC2d::Perform(const gp_Pnt2d&     P,
   Standard_Real Tol2 = Tol * Tol;
   Standard_Real F = C.Focal();
   gp_Vec2d OPp (O,P);
-#ifdef DEB
-  Standard_Real OPpMagn = OPp.Magnitude();
-#else
-  OPp.Magnitude();
-#endif
   Standard_Real X = OPp.Dot(gp_Vec2d(C.MirrorAxis().Direction()));
   Standard_Real Y = OPp.Dot(gp_Vec2d(C.Axis().YAxis().Direction()));
 
diff --git a/src/Extrema/Extrema_ExtPElS.cxx b/src/Extrema/Extrema_ExtPElS.cxx
index 22942e1..24437c6 100644
--- a/src/Extrema/Extrema_ExtPElS.cxx
+++ b/src/Extrema/Extrema_ExtPElS.cxx
@@ -124,11 +124,6 @@ void Extrema_ExtPElS::Perform(const gp_Pnt&       P,
 
   Standard_Real L2 = MP.SquareMagnitude();
   Standard_Real Vm = -(S.RefRadius() / Sin(A));
-#ifdef DEB
-  Standard_Real Zm = gp_Vec(O, M).Dot(OZ);
-#else
-  gp_Vec(O, M).Dot(OZ);
-#endif
 
 // Cas ou P est confondu avec S ...
   if (L2 < Tol * Tol) {
diff --git a/src/FEmTool/FEmTool_Assembly.cxx b/src/FEmTool/FEmTool_Assembly.cxx
index b300677..e025e19 100644
--- a/src/FEmTool/FEmTool_Assembly.cxx
+++ b/src/FEmTool/FEmTool_Assembly.cxx
@@ -80,11 +80,7 @@ FEmTool_Assembly::FEmTool_Assembly(const TColStd_Array2OfInteger& Dependence,
 
   TColStd_Array1OfInteger FirstIndexes(1, B.Length()); FirstIndexes.Init(B.Length());
 
-#ifdef DEB
-  Standard_Integer dim, el, nvar, Imax, Imin, I0 = 1 - B.Lower(), i;
-#else
   Standard_Integer dim, el, nvar, Imin, I0 = 1 - B.Lower(), i;
-#endif
   Standard_Integer diml = Table->LowerRow(), dimu = Table->UpperRow(),
                    ell = Table->LowerCol(), elu = Table->UpperCol(), nvarl, nvaru;
 
@@ -137,11 +133,7 @@ void FEmTool_Assembly::AddMatrix(const Standard_Integer Element,
 
   Standard_Integer nvarl = T1.Lower(), nvaru = Min(T1.Upper(), nvarl + Mat.RowNumber() - 1);
 
-#ifdef DEB
-  Standard_Integer I, J, I0 = 1 - B.Lower(), i, ii, j, jj, 
-#else
   Standard_Integer I, J, I0 = 1 - B.Lower(), i, ii, j,
-#endif
                    i0 = Mat.LowerRow() - nvarl, j0 = Mat.LowerCol() - nvarl;
 
   for(i = nvarl; i <= nvaru; i++) {
diff --git a/src/GccAna/GccAna_Circ2d2TanOn.cxx b/src/GccAna/GccAna_Circ2d2TanOn.cxx
index cba02b3..0fe0a45 100644
--- a/src/GccAna/GccAna_Circ2d2TanOn.cxx
+++ b/src/GccAna/GccAna_Circ2d2TanOn.cxx
@@ -73,11 +73,6 @@ GccAna_Circ2d2TanOn::
   gp_Pnt2d center1(C1.Location());
   gp_Pnt2d center2(C2.Location());
   TColStd_Array1OfReal Radius(1,2);
-#ifdef DEB
-  Standard_Real distance = center1.Distance(center2);
-#else
-  center1.Distance(center2);
-#endif
   Standard_Real dist1 = OnLine.Distance(center1);
   Standard_Real dist2 = OnLine.Distance(center2);
   Standard_Real d1 = dist1+R1;
diff --git a/src/GccAna/GccAna_Circ2d2TanOn_10.cxx b/src/GccAna/GccAna_Circ2d2TanOn_10.cxx
index 937fe7e..0ebafc3 100644
--- a/src/GccAna/GccAna_Circ2d2TanOn_10.cxx
+++ b/src/GccAna/GccAna_Circ2d2TanOn_10.cxx
@@ -77,12 +77,6 @@
   gp_Dir2d dir(OnCirc.Location().XY()-Point2.XY());
   gp_Pnt2d pinterm(Point2.XY()+(distpc+Ron)*dir.XY());
   Standard_Real dist1 = L1.Distance(pinterm);
-  if (Abs(dist1-distpc-Ron) > Tol) {
-#ifdef DEB
-    gp_Pnt2d pinterm(Point2.XY()+(distpc-Ron)*dir.XY()); // Unused ! BUG ???
-    Standard_Real dist1 = L1.Distance(pinterm); // Unused ! BUG ???
-#endif
-  }
   if (Abs(dist1-distpc+Ron) <= Tol) {
     dir = gp_Dir2d(-dirL1.Y(),dirL1.X());
     gp_Dir2d direc(originL1.XY()-pinterm.XY());
diff --git a/src/GccAna/GccAna_Circ2d2TanOn_6.cxx b/src/GccAna/GccAna_Circ2d2TanOn_6.cxx
index 41242e2..14e1c2d 100644
--- a/src/GccAna/GccAna_Circ2d2TanOn_6.cxx
+++ b/src/GccAna/GccAna_Circ2d2TanOn_6.cxx
@@ -71,11 +71,6 @@ GccAna_Circ2d2TanOn::
   TColStd_Array1OfReal Rradius(1,2);
   gp_Pnt2d center1(C1.Location());
   gp_Pnt2d center2(C2.Location());
-#ifdef DEB
-  Standard_Real distance = center1.Distance(center2);
-#else
-  center1.Distance(center2);
-#endif
   Standard_Real R1 = C1.Radius();
   Standard_Real R2 = C2.Radius();
 
diff --git a/src/GccAna/GccAna_Circ2d2TanOn_9.cxx b/src/GccAna/GccAna_Circ2d2TanOn_9.cxx
index bfffb57..8c363c5 100644
--- a/src/GccAna/GccAna_Circ2d2TanOn_9.cxx
+++ b/src/GccAna/GccAna_Circ2d2TanOn_9.cxx
@@ -43,9 +43,6 @@ GccAna_Circ2d2TanOn::
   NbrSol = 0;
   
   gp_Dir2d dirx(1.,0.);
-#ifdef DEB
-  Standard_Real Tol = Abs(Tolerance);
-#endif
   if (!(Qualified1.IsEnclosed() ||
 	Qualified1.IsOutside() || Qualified1.IsUnqualified()) ||
       !(Qualified2.IsEnclosed() ||
diff --git a/src/GccAna/GccAna_Circ2d2TanRad_4.cxx b/src/GccAna/GccAna_Circ2d2TanRad_4.cxx
index 7fc5baf..c232533 100644
--- a/src/GccAna/GccAna_Circ2d2TanRad_4.cxx
+++ b/src/GccAna/GccAna_Circ2d2TanRad_4.cxx
@@ -53,9 +53,6 @@ GccAna_Circ2d2TanRad::
 {
 
   gp_Dir2d dirx(1.0,0.0);
-#ifdef DEB
-  Standard_Real Tol = Abs(Tolerance);
-#endif
   TColStd_Array1OfReal cote1(1,2);
   TColStd_Array1OfReal cote2(1,2);
   Standard_Integer nbrcote1=0;
diff --git a/src/GccAna/GccAna_Circ2d3Tan_3.cxx b/src/GccAna/GccAna_Circ2d3Tan_3.cxx
index 0d5dc02..1e0d020 100644
--- a/src/GccAna/GccAna_Circ2d3Tan_3.cxx
+++ b/src/GccAna/GccAna_Circ2d3Tan_3.cxx
@@ -57,9 +57,6 @@ GccAna_Circ2d3Tan::
    TheSame2.Init(0);
    TheSame3.Init(0);
    gp_Dir2d dirx(1.0,0.0);
-#ifdef DEB
-   Standard_Real Tol = Abs(Tolerance);
-#endif
    WellDone = Standard_False;
    NbrSol = 0;
    if (!(Qualified1.IsEnclosed() ||
diff --git a/src/GccAna/GccAna_Circ2d3Tan_8.cxx b/src/GccAna/GccAna_Circ2d3Tan_8.cxx
index d912ce4..9e0ab55 100644
--- a/src/GccAna/GccAna_Circ2d3Tan_8.cxx
+++ b/src/GccAna/GccAna_Circ2d3Tan_8.cxx
@@ -95,11 +95,6 @@ GccAna_Circ2d3Tan::
 	   gp_Pnt2d Center(Intp.Point(j).Value());
 	   Standard_Real dist1 = L1.Distance(Center);
 	   Standard_Real dist2 = Center.Distance(Point2);
-#ifdef DEB
-	   Standard_Real dist3 = Center.Distance(Point3);
-#else
-           Center.Distance(Point3);
-#endif
 	   Standard_Real Radius=0;
 //	   Standard_Integer nbsol2 = 0;
 	   Standard_Integer nbsol3 = 0;
diff --git a/src/GccAna/GccAna_Circ2dTanOnRad_1.cxx b/src/GccAna/GccAna_Circ2dTanOnRad_1.cxx
index 203037f..dd03e6a 100644
--- a/src/GccAna/GccAna_Circ2dTanOnRad_1.cxx
+++ b/src/GccAna/GccAna_Circ2dTanOnRad_1.cxx
@@ -96,11 +96,6 @@ GccAna_Circ2dTanOnRad::
              cirsol(NbrSol)=gp_Circ2d(gp_Ax2d(Center,dirx),Radius);
 //           =====================================================
 	     gp_Dir2d dc1(origin1.XY()-Center.XY());
-#ifdef DEB
-	     Standard_Real sign = dc1.Dot(normL1);
-#else
-             dc1.Dot(normL1);
-#endif
 	     if (!Qualified1.IsUnqualified()) { 
 	       qualifier1(NbrSol) = Qualified1.Qualifier();
 	     }
diff --git a/src/Geom/Geom_CylindricalSurface.cxx b/src/Geom/Geom_CylindricalSurface.cxx
index fde3e48..f7d22d5 100644
--- a/src/Geom/Geom_CylindricalSurface.cxx
+++ b/src/Geom/Geom_CylindricalSurface.cxx
@@ -191,17 +191,6 @@ void Geom_CylindricalSurface::Coefficients (Standard_Real& A1, Standard_Real& A2
   Standard_Real T22 = T.Value (2, 2);
   Standard_Real T23 = T.Value (2, 3);
   Standard_Real T24 = T.Value (2, 4);
-#ifdef DEB
-  Standard_Real T31 = T.Value (3, 1);
-  Standard_Real T32 = T.Value (3, 2);
-  Standard_Real T33 = T.Value (3, 3);
-  Standard_Real T34 = T.Value (3, 4);
-#else
-  T.Value (3, 1);
-  T.Value (3, 2);
-  T.Value (3, 3);
-  T.Value (3, 4);
-#endif
   A1 = T11 * T11 + T21 * T21;
   A2 = T12 * T12 + T22 * T22;
   A3 = T13 * T13 + T23 * T23;
diff --git a/src/Geom/Geom_OffsetCurve.cxx b/src/Geom/Geom_OffsetCurve.cxx
index 01217fc..d10e784 100644
--- a/src/Geom/Geom_OffsetCurve.cxx
+++ b/src/Geom/Geom_OffsetCurve.cxx
@@ -529,12 +529,6 @@ void Geom_OffsetCurve::D1 ( const Standard_Real U,
 
    // P'(u) = p'(u) + (Offset / R**2) * (DNdir/DU * R -  Ndir * (DR/R))
 
-
-#ifdef DEB
-  GeomAbs_Shape Continuity = basisCurve->Continuity();
-#else
-  basisCurve->Continuity();
-#endif
   basisCurve->D2 (U, PBasis, V1basis, V2basis);
   V1 = V1basis;
   Vec V2 = V2basis;
@@ -590,12 +584,6 @@ void Geom_OffsetCurve::D2 (const Standard_Real U,
    // P"(u) = p"(u) + (Offset / R) * (D2Ndir/DU - DNdir * (2.0 * Dr/ R**2) +
    //         Ndir * ( (3.0 * Dr**2 / R**4) - (D2r / R**2)))
 
-#ifdef DEB
-  GeomAbs_Shape Continuity = basisCurve->Continuity();
-#else
-  basisCurve->Continuity();
-#endif
-
   basisCurve->D3 (U, PBasis, V1basis, V2basis, V3basis);
   Standard_Integer Index = 2;
   V1     = V1basis;
diff --git a/src/Geom2d/Geom2d_OffsetCurve.cxx b/src/Geom2d/Geom2d_OffsetCurve.cxx
index cbc7d89..806e122 100644
--- a/src/Geom2d/Geom2d_OffsetCurve.cxx
+++ b/src/Geom2d/Geom2d_OffsetCurve.cxx
@@ -191,12 +191,6 @@ void Geom2d_OffsetCurve::D1 (const Standard_Real U, Pnt2d& P, Vec2d& V1) const {
 
    // P'(u) = p'(u) + (Offset / R**2) * (DNdir/DU * R -  Ndir * (DR/R))
 
-
-#ifdef DEB
-  GeomAbs_Shape Continuity = basisCurve->Continuity();
-#else
-  basisCurve->Continuity();
-#endif
   Vec2d V2;
   basisCurve->D2 (U, P, V1, V2);
   Standard_Integer Index = 2;
@@ -248,11 +242,6 @@ void Geom2d_OffsetCurve::D2 (const Standard_Real U,
    // P"(u) = p"(u) + (Offset / R) * (D2Ndir/DU - DNdir * (2.0 * Dr/ R**2) +
    //         Ndir * ( (3.0 * Dr**2 / R**4) - (D2r / R**2)))
 
-#ifdef DEB
-  GeomAbs_Shape Continuity = basisCurve->Continuity();
-#else
-  basisCurve->Continuity();
-#endif
   Vec2d V3;
   basisCurve->D3 (U, P, V1, V2, V3);
   Standard_Integer Index = 2;
@@ -483,12 +472,6 @@ void Geom2d_OffsetCurve::D1 (const Standard_Real U,
 
    // P'(u) = p'(u) + (Offset / R**2) * (DNdir/DU * R -  Ndir * (DR/R))
 
-#ifdef DEB
-   GeomAbs_Shape Continuity = basisCurve->Continuity();
-#else
-   basisCurve->Continuity();
-#endif
-
    basisCurve->D2 (U, Pbasis, V1basis, V2basis);
    V1 = V1basis;
    Vec2d V2 = V2basis;
@@ -546,12 +529,6 @@ void Geom2d_OffsetCurve::D2 (const Standard_Real U,
    // P"(u) = p"(u) + (Offset / R) * (D2Ndir/DU - DNdir * (2.0 * Dr/ R**2) +
    //         Ndir * ( (3.0 * Dr**2 / R**4) - (D2r / R**2)))
 
-#ifdef DEB
-  GeomAbs_Shape Continuity = basisCurve->Continuity();
-#else
-  basisCurve->Continuity();
-#endif
-
   basisCurve->D3 (U, Pbasis, V1basis, V2basis, V3basis);
   Standard_Integer Index = 2;
   V1 = V1basis;
diff --git a/src/GeomFill/GeomFill_CorrectedFrenet.cxx b/src/GeomFill/GeomFill_CorrectedFrenet.cxx
index fef5585..c787c60 100644
--- a/src/GeomFill/GeomFill_CorrectedFrenet.cxx
+++ b/src/GeomFill/GeomFill_CorrectedFrenet.cxx
@@ -589,10 +589,6 @@ Standard_Real GeomFill_CorrectedFrenet::GetAngleAT(const Standard_Real Param) co
     };
     if(HArrPoles->Value(iC) == Param || Param == HArrPoles->Value(iC+1)) return TLaw->Value(Param);
   };
-#ifdef DEB
-  Standard_Real Po = 
-#endif
-    HArrPoles->Value(iC);
   //  Calculate differenciation between apporoximated and local values of AngleAT
   Standard_Real AngP = TLaw->Value(Param), AngPo = HArrAngle->Value(iC), dAng = AngP - AngPo;
   gp_Vec Tangent, Normal, BN;
diff --git a/src/GeomFill/GeomFill_Curved.cxx b/src/GeomFill/GeomFill_Curved.cxx
index 6a8690f..1db8178 100644
--- a/src/GeomFill/GeomFill_Curved.cxx
+++ b/src/GeomFill/GeomFill_Curved.cxx
@@ -268,10 +268,6 @@ void  GeomFill_Curved::Init(const TColgp_Array1OfPnt& P1,
   
   IsRational = Standard_False;
   
-#ifdef DEB
-  Standard_Real NU = NPolU - 1;
-  Standard_Real NV = NPolV - 1;
-#endif
   myPoles = new TColgp_HArray2OfPnt( 1, NPolU, 1, NPolV);
   
   Standard_Integer i,j;
diff --git a/src/GeomFill/GeomFill_DraftTrihedron.cxx b/src/GeomFill/GeomFill_DraftTrihedron.cxx
index 361e69e..ee3f823 100644
--- a/src/GeomFill/GeomFill_DraftTrihedron.cxx
+++ b/src/GeomFill/GeomFill_DraftTrihedron.cxx
@@ -17,11 +17,6 @@
 static gp_Vec DDeriv(const gp_Vec& F, const gp_Vec& DF, const gp_Vec& D2F)
 {
   Standard_Real Norma = F.Magnitude();
-#ifdef DEB
-  Standard_Real dot = F.Dot(DF);
-#else
-  F.Dot(DF);
-#endif
   gp_Vec Result = (D2F - 2*DF*(F*DF)/(Norma*Norma))/Norma - 
      F*((DF.SquareMagnitude() + F*D2F 
         - 3*(F*DF)*(F*DF)/(Norma*Norma))/(Norma*Norma*Norma));
diff --git a/src/GeomFill/GeomFill_GuideTrihedronAC.cxx b/src/GeomFill/GeomFill_GuideTrihedronAC.cxx
index 1d6005e..8384379 100644
--- a/src/GeomFill/GeomFill_GuideTrihedronAC.cxx
+++ b/src/GeomFill/GeomFill_GuideTrihedronAC.cxx
@@ -182,11 +182,6 @@
 
   gp_Vec n(P, PG); // vecteur definissant la normale
   Standard_Real Norm = n.Magnitude(), ndn;
-#ifdef DEB
-  Standard_Real Norm2 = n.SquareMagnitude();
-#else
-  n.SquareMagnitude();
-#endif
   //derivee de n par rapport a Param
   gp_Vec dn, d2n;
   dn.SetLinearForm(dtg_dt, TG, -1, To);
diff --git a/src/GeomFill/GeomFill_LocationGuide.cxx b/src/GeomFill/GeomFill_LocationGuide.cxx
index 84814f3..49b6e12 100644
--- a/src/GeomFill/GeomFill_LocationGuide.cxx
+++ b/src/GeomFill/GeomFill_LocationGuide.cxx
@@ -628,12 +628,6 @@ static void InGoodPeriod(const Standard_Real Prec,
   gp_Vec T, N, B;
   gp_Pnt P;
   Standard_Boolean Ok;
-#ifdef DEB
-  Standard_Real U = myFirstS + ratio*(Param-myCurve->FirstParameter());
-#else
-  myCurve->FirstParameter() ;
-#endif
-    
 
   myCurve->D0(Param, P);
   V.SetXYZ(P.XYZ());
@@ -738,12 +732,6 @@ static void InGoodPeriod(const Standard_Real Prec,
   if (rotation) {  
     return Standard_False;
     
-#ifdef DEB
-    Standard_Real U = myFirstS + ratio*(Param-myCurve->FirstParameter());
-#else
-    
-#endif
-      
 #if 0 // @todo Should be really dead code?
     // initialisation du germe 
     InitX(Param);      
diff --git a/src/GeomFill/GeomFill_PolynomialConvertor.cxx b/src/GeomFill/GeomFill_PolynomialConvertor.cxx
index e7cb081..b5d6161 100644
--- a/src/GeomFill/GeomFill_PolynomialConvertor.cxx
+++ b/src/GeomFill/GeomFill_PolynomialConvertor.cxx
@@ -110,11 +110,6 @@ void GeomFill_PolynomialConvertor::Section(const gp_Pnt& FirstPnt,
   gp_Mat M(V1.X(), V2.X(), 0, 
 	   V1.Y(), V2.Y(), 0,
 	   V1.Z(), V2.Z(), 0);
-#ifdef DEB
-  Standard_Real r = FirstPnt.Distance(Center); 	 
-#else
-  FirstPnt.Distance(Center);
-#endif
 
   // Calcul des contraintes  -----------
   Vx(1) = 1;                   Vy(1) = 0;
diff --git a/src/GeomFill/GeomFill_QuasiAngularConvertor.cxx b/src/GeomFill/GeomFill_QuasiAngularConvertor.cxx
index e50201f..375a7f0 100644
--- a/src/GeomFill/GeomFill_QuasiAngularConvertor.cxx
+++ b/src/GeomFill/GeomFill_QuasiAngularConvertor.cxx
@@ -131,11 +131,6 @@ void GeomFill_QuasiAngularConvertor::Section(const gp_Pnt& FirstPnt,
   gp_Mat M(V1.X(), V2.X(), 0, 
 	   V1.Y(), V2.Y(), 0,
 	   V1.Z(), V2.Z(), 0);
-#ifdef DEB
-  Standard_Real r = FirstPnt.Distance(Center);
-#else
-  FirstPnt.Distance(Center);
-#endif
 
   // Calcul des coeffs  -----------
   beta = Angle/4;
diff --git a/src/GeomFill/GeomFill_SweepSectionGenerator.cxx b/src/GeomFill/GeomFill_SweepSectionGenerator.cxx
index f745050..8f7c007 100644
--- a/src/GeomFill/GeomFill_SweepSectionGenerator.cxx
+++ b/src/GeomFill/GeomFill_SweepSectionGenerator.cxx
@@ -27,8 +27,7 @@
 
 #ifdef DRAW
 #include <DrawTrSurf.hxx>
-#endif
-#ifdef DEB
+
 static Standard_Boolean Affich     = Standard_False;
 static Standard_Integer NbSECTIONS = 0;
 #endif
@@ -256,11 +255,6 @@ void GeomFill_SweepSectionGenerator::Perform(const Standard_Boolean Polynomial)
   myPolynomial = Polynomial;
 
   // eval myNbSections.
-#ifdef DEB
-  Standard_Integer Deg = myPath->Degree();
-#else
-  myPath->Degree();
-#endif
   Standard_Integer NSpans = myPath->NbKnots()-1;
 
   myNbSections = 21 * NSpans;
diff --git a/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx b/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx
index 543db69..4b1d4ab 100644
--- a/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx
+++ b/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx
@@ -60,7 +60,9 @@
 // pour mes tests
 #ifdef DEB
 #include <OSD_Chronometer.hxx>
+#endif
 
+#ifdef DRAW
 static Standard_Integer Affich=0;
 // 0 : Pas de display
 // 1 : Display des Geometries et controle intermediaire
@@ -2353,11 +2355,6 @@ VerifSurface(const Standard_Integer NbBoucle)
 	new TColStd_HArray1OfReal(1,NbPts_i-1);
       Handle(TColStd_HArray1OfReal) tcourb = 
 	new TColStd_HArray1OfReal(1,NbPts_i-1);
-#ifdef DEB
-      Standard_Integer Cont_i=myLinCont->Value(i)->Order();
-#else
-      myLinCont->Value(i)->Order();
-#endif
 
       EcartContraintesMil (i,tdist,tang,tcourb);
 
diff --git a/src/GeomPlate/GeomPlate_PlateG0Criterion.cxx b/src/GeomPlate/GeomPlate_PlateG0Criterion.cxx
index 8f3ffcd..2fadabc 100644
--- a/src/GeomPlate/GeomPlate_PlateG0Criterion.cxx
+++ b/src/GeomPlate/GeomPlate_PlateG0Criterion.cxx
@@ -71,10 +71,6 @@ void GeomPlate_PlateG0Criterion::Value(AdvApp2Var_Patch& P,
   TColStd_Array1OfReal Curve(1, dimension);
   TColStd_Array1OfReal Point(1, 3); 
   Standard_Real * Coeffs =  (Standard_Real *) &Patch.ChangeValue(1);
-#ifdef DEB
-  Standard_Real * Result =  
-#endif
-    (Standard_Real *) &Curve.ChangeValue(1);
   Standard_Real * Digit  =  (Standard_Real *) &Point.ChangeValue(1);
   
   Standard_Integer k1, k2, pos, ll=1;
diff --git a/src/GeomPlate/GeomPlate_PlateG1Criterion.cxx b/src/GeomPlate/GeomPlate_PlateG1Criterion.cxx
index af880cf..1527945 100644
--- a/src/GeomPlate/GeomPlate_PlateG1Criterion.cxx
+++ b/src/GeomPlate/GeomPlate_PlateG1Criterion.cxx
@@ -68,11 +68,6 @@ void GeomPlate_PlateG1Criterion::Value(AdvApp2Var_Patch& P,
   TColStd_Array1OfReal Curve(1, 2*dimension);
   TColStd_Array1OfReal Point(1, 3); 
   Standard_Real * Coeffs =  (Standard_Real *) &Patch.ChangeValue(1);
-#ifdef DEB
-  Standard_Real * Result =  (Standard_Real *) &Curve.ChangeValue(1);
-#else
-  Curve.ChangeValue(1);
-#endif
   Standard_Real * Digit  =  (Standard_Real *) &Point.ChangeValue(1);
   
   Standard_Integer k1, k2, pos, ll=1;
diff --git a/src/GeomProjLib/GeomProjLib.cxx b/src/GeomProjLib/GeomProjLib.cxx
index fee78aa..2d0a5c1 100644
--- a/src/GeomProjLib/GeomProjLib.cxx
+++ b/src/GeomProjLib/GeomProjLib.cxx
@@ -48,8 +48,7 @@
 
 #ifdef DRAW
 #include <DrawTrSurf.hxx>
-#endif
-#ifdef DEB
+
 static Standard_Boolean Affich = Standard_False;
 static Standard_Integer NBPROJ = 1;
 #endif
@@ -326,12 +325,6 @@ Handle(Geom_Curve) GeomProjLib::Project( const Handle(Geom_Curve)& C,
     Standard_Real TolU = Pow(Tol, 2./3);
     Standard_Real TolV = Pow(Tol, 2./3);
     ProjLib_CompProjectedCurve Proj(HS,HC,TolU,TolV,-1.);
-    
-#ifdef DEB
-    Standard_Integer NbCurves = Proj.NbCurves();
-#else
-    Proj.NbCurves();
-#endif
     Standard_Real f,l;
     Proj.Bounds(1,f,l);
     Handle(Adaptor2d_HCurve2d) HC2d = Proj.Trim(f,l,TolU);
diff --git a/src/GeomToIGES/GeomToIGES_GeomSurface.cxx b/src/GeomToIGES/GeomToIGES_GeomSurface.cxx
index c0169fe..d4318b1 100644
--- a/src/GeomToIGES/GeomToIGES_GeomSurface.cxx
+++ b/src/GeomToIGES/GeomToIGES_GeomSurface.cxx
@@ -785,12 +785,6 @@ Handle(IGESData_IGESEntity) GeomToIGES_GeomSurface::TransferSurface
   Standard_Real V1 = Vdeb;
   Standard_Real V2 = Vfin;
 
-  // debug mjm du 28/03/96
-#ifdef DEB
-  Standard_Boolean IsDirect = 
-#endif
-    start->Torus().Direct();
-
   // creation de la generatrice : Generatrix (cercle)
   gp_Ax2 Axe = gp_Ax2(gp_Pnt((start->Torus().MajorRadius()), 0., 0.),
 		      -gp::DY(), gp::DX());
diff --git a/src/GeometryTest/GeometryTest_ConstraintCommands.cxx b/src/GeometryTest/GeometryTest_ConstraintCommands.cxx
index ee85215..e8d0cfb 100644
--- a/src/GeometryTest/GeometryTest_ConstraintCommands.cxx
+++ b/src/GeometryTest/GeometryTest_ConstraintCommands.cxx
@@ -759,10 +759,6 @@ static Standard_Integer gcarc (Draw_Interpretor& di,Standard_Integer n, const ch
 	  if (DrawTrSurf::GetPoint(a[5], P3)) {
 //	    if (DrawTrSurf::GetPoint(a[6], P4)) {
 	    if (n>6) {
-#ifdef DEB
-	      Standard_Boolean ip4 =
-#endif
-                                     DrawTrSurf::GetPoint(a[6], P4);
 	      gp_Vec V1 = gp_Vec(P2,P3);                                                    
 	      Handle(Geom_Curve)thearc = GC_MakeArcOfCircle(P1,V1,P4).Value();
 	      DrawTrSurf::Set(a[1], thearc);
diff --git a/src/GeometryTest/GeometryTest_SurfaceCommands.cxx b/src/GeometryTest/GeometryTest_SurfaceCommands.cxx
index 5084b71..5f43cb3 100644
--- a/src/GeometryTest/GeometryTest_SurfaceCommands.cxx
+++ b/src/GeometryTest/GeometryTest_SurfaceCommands.cxx
@@ -71,9 +71,6 @@ static Standard_Integer sweep (Draw_Interpretor&,
   GeomFill_Trihedron Option = GeomFill_IsCorrectedFrenet;
   Standard_Integer ipath =2, isection =4 , NbSeg=30, MaxDegree = 10;
   Standard_Real Tol = 1.e-4;
-#if DEB
-  static Standard_Boolean AdvApprox_Debug = 1; 
-#endif
 
   if (n < 4 ) return 1;
   
@@ -151,9 +148,6 @@ static Standard_Integer tuyau (Draw_Interpretor&,
                                Standard_Integer n, const char** a)
 {
   if ( n < 4) return 1;
-#if DEB
-  static Standard_Boolean AdvApprox_Debug = 1;
-#endif 
 
   GeomAbs_Shape Cont = GeomAbs_C2;
   GeomFill_Pipe Pipe;
diff --git a/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx b/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx
index 679cd12..81d285d 100644
--- a/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx
+++ b/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx
@@ -585,11 +585,6 @@ static Standard_Integer smoothingbybezier (Draw_Interpretor& di,
       Standard_Boolean mySquare = (methode == 2);
       Standard_Integer degmin = 4;
       Standard_Integer NbIteration = 5;
-#ifdef DEB
-      Standard_Integer NbConst =
-#endif
-                                 NbConstraint(TABofCC->Value(1).Constraint(),
-					      TABofCC->Value(NbPoints).Constraint());
       
       if (Degree < 4) degmin = Max(1, Degree -1);
       degmin = Max(degmin, NbConstraint(TABofCC->Value(1).Constraint(),  
diff --git a/src/Graphic2d/Graphic2d_Paragraph.cxx b/src/Graphic2d/Graphic2d_Paragraph.cxx
index 4018ca1..b48b167 100644
--- a/src/Graphic2d/Graphic2d_Paragraph.cxx
+++ b/src/Graphic2d/Graphic2d_Paragraph.cxx
@@ -298,10 +298,6 @@ void Graphic2d_Paragraph::ChangeText (const TCollection_ExtendedString &aText,
                                    const Standard_Integer aRow,
                                    const Standard_Integer aColumn) {
 Standard_Integer i,length = myTextDescriptorList.Length() ;
-#ifdef DEB
-Standard_Integer row = (aRow > 0) ? Min(aRow,MAXROW-1) : MAXROW-1 ;
-Standard_Integer column = (aColumn > 0) ? Min(aColumn,MAXCOLUMN-1) : MAXCOLUMN-1 ;
-#endif
 Standard_Integer descriptor = TEXT_DESCRIPTOR(aRow,aColumn,0,0,0,0) ;
 Standard_Integer the_position = TEXT_POSITION(descriptor) ;
 
@@ -533,10 +529,6 @@ Standard_Boolean Graphic2d_Paragraph::Pick (const Standard_ShortReal X,
                                        const Handle(Graphic2d_Drawer)& aDrawer) 
 {
 Standard_Boolean theStatus = Standard_False;
-#ifdef DEB
-Standard_ShortReal scale = 
-#endif
-  (myIsZoomable) ? myScale*aDrawer->Scale() : myScale;
 Standard_ShortReal TX = X, TY = Y;
 
   if (IsInMinMax (X, Y, aPrecision)) {
diff --git a/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cxx b/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cxx
index 351f62f..9fa9fe5 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cxx
@@ -796,7 +796,7 @@ Standard_Boolean Graphic3d_ArrayOfPrimitives::IsValid() {
   Standard_Integer nvertexs = myPrimitiveArray->num_vertexs;
   Standard_Integer nbounds = myPrimitiveArray->num_bounds;
   Standard_Integer nedges = myPrimitiveArray->num_edges;
-  Standard_Integer i,j,k,n;
+  Standard_Integer i,n;
 
 #if TRACE > 0
   Standard_CString name = StringType();
diff --git a/src/HLRBRep/HLRBRep_Data.cxx b/src/HLRBRep/HLRBRep_Data.cxx
index b906faf..0721fa5 100644
--- a/src/HLRBRep/HLRBRep_Data.cxx
+++ b/src/HLRBRep/HLRBRep_Data.cxx
@@ -534,10 +534,6 @@ void HLRBRep_Data::Write (const Handle(HLRBRep_Data)& DS,
 			  const Standard_Integer de,
 			  const Standard_Integer df)
 {
-#ifdef DEB
-  Standard_Integer n1vert = 
-#endif
-    DS->NbVertices();
   Standard_Integer n1edge = DS->NbEdges();
   Standard_Integer n1face = DS->NbFaces();
 
@@ -1575,10 +1571,7 @@ HLRBRep_Data::HidingStartLevel (const Standard_Integer E,
 #else
   Standard_Integer level;
 #endif
-#ifdef DEB
-  TopAbs_State st = 
-#endif
-    Classify(E,EData,Standard_True,level,param);
+  Classify(E,EData,Standard_True,level,param);
   Loop = Standard_True;
   It.Initialize(IL);
 
diff --git a/src/HLRBRep/HLRBRep_PolyAlgo.cxx b/src/HLRBRep/HLRBRep_PolyAlgo.cxx
index 28913d9..a7f2948 100644
--- a/src/HLRBRep/HLRBRep_PolyAlgo.cxx
+++ b/src/HLRBRep/HLRBRep_PolyAlgo.cxx
@@ -429,7 +429,6 @@
 #ifdef DEB
 static Standard_Integer DoTrace = Standard_False; 
 static Standard_Integer DoError = Standard_False; 
-static Standard_Integer IndexPlusOnePerCentThree [] = { 1 , 2 , 0 };
 #endif
 //=======================================================================
 //function : HLRBRep_PolyAlgo
diff --git a/src/HLRBRep/HLRBRep_ShapeToHLR.cxx b/src/HLRBRep/HLRBRep_ShapeToHLR.cxx
index 9a3fa44..47c1a69 100644
--- a/src/HLRBRep/HLRBRep_ShapeToHLR.cxx
+++ b/src/HLRBRep/HLRBRep_ShapeToHLR.cxx
@@ -86,10 +86,6 @@ HLRBRep_ShapeToHLR::Load(const Handle(HLRTopoBRep_OutLiner)& S,
 
   // Create the data structure
   Handle(HLRBRep_Data) DS = new HLRBRep_Data (nbVert, nbEdge, nbFace);
-#ifdef DEB
-  HLRBRep_Array1OfEData& ED = 
-#endif
-    DS->EDataArray ();
   HLRBRep_EdgeData* ed = NULL; 
   if(nbEdge != 0) ed = &(DS->EDataArray().ChangeValue(1));
 //  ed++;
diff --git a/src/IFGraph/IFGraph_Articulations.cxx b/src/IFGraph/IFGraph_Articulations.cxx
index d791728..c247472 100644
--- a/src/IFGraph/IFGraph_Articulations.cxx
+++ b/src/IFGraph/IFGraph_Articulations.cxx
@@ -30,7 +30,6 @@
 //  Utilisation de Visit
   Standard_Integer nb = thegraph.Size();
   for (Standard_Integer i = 1; i <= nb; i ++) {
-    Standard_Integer visited;
     thenow = 0;
     if (thegraph.IsPresent(i)) Visit(i);
   }
diff --git a/src/IFSelect/IFSelect_WorkSession.cxx b/src/IFSelect/IFSelect_WorkSession.cxx
index 27d8e1f..68111ae 100644
--- a/src/IFSelect/IFSelect_WorkSession.cxx
+++ b/src/IFSelect/IFSelect_WorkSession.cxx
@@ -963,10 +963,7 @@ Standard_Boolean IFSelect_WorkSession::RemoveName
 {
   Handle(Standard_Transient) item = NamedItem(name);
   if (item.IsNull()) return Standard_False;
-#ifdef DEB
-  Standard_Integer bid = 
-#endif
-    theitems.Add(item,item);    // reste mais sans nom
+  theitems.Add(item,item);    // reste mais sans nom
   return thenames->RemoveItem(name);
 }
 
diff --git a/src/IntPatch/IntPatch_ALine.cxx b/src/IntPatch/IntPatch_ALine.cxx
index 1a84e89..b03b638 100644
--- a/src/IntPatch/IntPatch_ALine.cxx
+++ b/src/IntPatch/IntPatch_ALine.cxx
@@ -488,11 +488,7 @@ void IntPatch_ALine::ComputeVertexParameters(const Standard_Real Tol) {
   nbvtx     = NbVertex();
   if(nbvtx>1) { 
     IntPatch_Point& VTX0   = svtx.ChangeValue(1);
-#ifdef DEB
-    //Standard_Real d;
-    IntPatch_Point& VTX1   = 
-#endif
-      svtx.ChangeValue(2);
+    svtx.ChangeValue(2);
     if(   (VTX0.IsOnDomS1() == Standard_False)
        && (VTX0.IsOnDomS2() == Standard_False)) { 
       svtx.Remove(1);
@@ -504,10 +500,7 @@ void IntPatch_ALine::ComputeVertexParameters(const Standard_Real Tol) {
   }
   if(nbvtx>1) { 
     IntPatch_Point& VTX0   = svtx.ChangeValue(nbvtx);
-#ifdef DEB
-    IntPatch_Point& VTX1   = 
-#endif
-      svtx.ChangeValue(nbvtx-1);
+    svtx.ChangeValue(nbvtx-1);
     if(   (VTX0.IsOnDomS1() == Standard_False)
        && (VTX0.IsOnDomS2() == Standard_False)) { 
       svtx.Remove(nbvtx);
diff --git a/src/IntPatch/IntPatch_LineConstructor.cxx b/src/IntPatch/IntPatch_LineConstructor.cxx
index ee5ca02..b9ee35e 100644
--- a/src/IntPatch/IntPatch_LineConstructor.cxx
+++ b/src/IntPatch/IntPatch_LineConstructor.cxx
@@ -1399,10 +1399,6 @@ void IntPatch_LineConstructor::Perform(const IntPatch_SequenceOfLine& slinref,
   }
   else if (typl != IntPatch_Restriction) { // JAG 01.07.96
     Standard_Real u1,v1,u2,v2;
-#ifdef DEB
-    Standard_Real paramminonvtx=RealLast();
-    Standard_Real parammaxonvtx=-paramminonvtx;
-#endif
     Handle(IntPatch_GLine)& GLine 
       =  *((Handle(IntPatch_GLine) *)&L);
     slin.Clear();
diff --git a/src/IntPatch/IntPatch_Polyhedron.cxx b/src/IntPatch/IntPatch_Polyhedron.cxx
index 9e820d8..ec862d0 100644
--- a/src/IntPatch/IntPatch_Polyhedron.cxx
+++ b/src/IntPatch/IntPatch_Polyhedron.cxx
@@ -194,9 +194,6 @@ Standard_Real IntPatch_Polyhedron::DeflectionOnTriangle
   gp_XYZ XYZ3=P1.XYZ()-P3.XYZ();
   gp_Vec NormalVector((XYZ1^XYZ2)+(XYZ2^XYZ3)+(XYZ3^XYZ1));
   NormalVector.Normalize();
-#ifdef DEB
-  Standard_Real PolarDistance = NormalVector * P1.XYZ();
-#endif
   //-- Calcul du point u,v  au centre du triangle
   Standard_Real u = (u1+u2+u3)/3.0;
   Standard_Real v = (v1+v2+v3)/3.0;
@@ -317,10 +314,6 @@ Standard_Integer IntPatch_Polyhedron::TriConnex (const Standard_Integer Triang,
 						 Standard_Integer&      TriCon,
 						 Standard_Integer&      OtherP)   const {
 
-#ifdef DEB
-  Standard_Integer nbdeltaUp1 = nbdeltaU + 1;
-  Standard_Integer nbdeltaUm2 = nbdeltaU + nbdeltaU;
-#endif
   Standard_Integer Pivotm1    = Pivot-1;
   Standard_Integer nbdeltaVp1 = nbdeltaV+1;
   Standard_Integer nbdeltaVm2 = nbdeltaV + nbdeltaV;
diff --git a/src/IntRes2d/IntRes2d_Intersection.cxx b/src/IntRes2d/IntRes2d_Intersection.cxx
index 0aa00cf..e31b48e 100644
--- a/src/IntRes2d/IntRes2d_Intersection.cxx
+++ b/src/IntRes2d/IntRes2d_Intersection.cxx
@@ -233,40 +233,16 @@ void IntRes2d_Intersection::Append( const IntRes2d_Intersection& Other
 	const IntRes2d_IntersectionPoint& AnP1=lseg(j).FirstPoint();
 	Standard_Real AnP1PParamOnFirst=AnP1.ParamOnFirst();
 	Standard_Real AnP1PParamOnSecond=AnP1.ParamOnSecond();
-#if DEB
-	const IntRes2d_Transition& AnP1T1=AnP1.TransitionOfFirst();
-#else
-        AnP1.TransitionOfFirst();
-#endif
-#if DEB
-	const IntRes2d_Transition& AnP1T2=AnP1.TransitionOfSecond();
-#else
-        AnP1.TransitionOfSecond();
-#endif
-#if DEB
-	const gp_Pnt2d& AnPt1=AnP1.Value();
-#else
-        AnP1.Value();
-#endif
+    AnP1.TransitionOfFirst();
+    AnP1.TransitionOfSecond();
+    AnP1.Value();
 	
 	const IntRes2d_IntersectionPoint& AnP2=lseg(j).LastPoint();
 	Standard_Real AnP2PParamOnFirst=AnP2.ParamOnFirst();
 	Standard_Real AnP2PParamOnSecond=AnP2.ParamOnSecond();
-#if DEB
-	const IntRes2d_Transition& AnP2T1=AnP2.TransitionOfFirst();
-#else
-        AnP2.TransitionOfFirst();
-#endif
-#if DEB
-	const IntRes2d_Transition& AnP2T2=AnP2.TransitionOfSecond();
-#else
-        AnP2.TransitionOfSecond();
-#endif
-#if DEB
-	const gp_Pnt2d& AnPt2=AnP2.Value();
-#else
-        AnP2.Value();
-#endif
+    AnP2.TransitionOfFirst();
+    AnP2.TransitionOfSecond();
+    AnP2.Value();
 
 
 	if(Opposite == lseg(j).IsOpposite()) {
diff --git a/src/IntTools/IntTools.cxx b/src/IntTools/IntTools.cxx
index 091af05..763f5aa 100644
--- a/src/IntTools/IntTools.cxx
+++ b/src/IntTools/IntTools.cxx
@@ -221,7 +221,7 @@
 				 const Standard_Real myEpsNull)
 {
   Standard_Integer aType, j, aNbRoots;
-  Standard_Real t, t1, t2, f1, f2, absf2;
+  Standard_Real t1, t2, f1, f2, absf2;
 
   aNbRoots=mySequenceOfRoots.Length();
 
diff --git a/src/Law/Law_Interpol.cxx b/src/Law/Law_Interpol.cxx
index 672dd6d..f66d283 100644
--- a/src/Law/Law_Interpol.cxx
+++ b/src/Law/Law_Interpol.cxx
@@ -91,10 +91,6 @@ void Law_Interpol::Set(const TColgp_Array1OfPnt2d& ParAndRad,
 		       const Standard_Boolean Periodic)
 {
   Standard_Integer l = ParAndRad.Lower();
-#ifdef DEB
-  Standard_Integer u = 
-#endif
-    ParAndRad.Upper();
   Standard_Integer nbp = ParAndRad.Length();
 
   Handle(TColStd_HArray1OfReal) par = new TColStd_HArray1OfReal(1,nbp);
@@ -169,10 +165,6 @@ void Law_Interpol::Set(const TColgp_Array1OfPnt2d& ParAndRad,
 		       const Standard_Boolean Periodic)
 {
   Standard_Integer l = ParAndRad.Lower();
-#ifdef DEB
-  Standard_Integer u = 
-#endif
-    ParAndRad.Upper();
   Standard_Integer nbp = ParAndRad.Length();
 
   Handle(TColStd_HArray1OfReal) par = new TColStd_HArray1OfReal(1,nbp);
diff --git a/src/LocOpe/LocOpe_CSIntersector.cxx b/src/LocOpe/LocOpe_CSIntersector.cxx
index 8737a31..dcbbce0 100644
--- a/src/LocOpe/LocOpe_CSIntersector.cxx
+++ b/src/LocOpe/LocOpe_CSIntersector.cxx
@@ -137,10 +137,6 @@ void LocOpe_CSIntersector::Perform(const LocOpe_SequenceOfCirc& Scir)
   for (; exp.More(); exp.Next()) {
     const TopoDS_Face& theface = TopoDS::Face(exp.Current());
     IntCurvesFace_Intersector theInt(theface,0.);
-#ifdef DEB
-    TopAbs_Orientation orface =
-#endif
-                                theface.Orientation();
     for (Standard_Integer i = 1; i<=myNbelem; i++) {
 
       HC->ChangeCurve().Load(new Geom_Circle(Scir(i)));
@@ -179,10 +175,6 @@ void LocOpe_CSIntersector::Perform(const TColGeom_SequenceOfCurve& Scur)
   for (; exp.More(); exp.Next()) {
     const TopoDS_Face& theface = TopoDS::Face(exp.Current());
     IntCurvesFace_Intersector theInt(theface,0.);
-#ifdef DEB
-    TopAbs_Orientation orface =
-#endif
-                                theface.Orientation();
     for (Standard_Integer i = 1; i<=myNbelem; i++) {
       if (Scur(i).IsNull()) {
 	continue;
@@ -599,10 +591,6 @@ static void AddPoints(IntCurvesFace_Intersector& theInt,
   Standard_Integer nbpoints = theSeq.Length();
   Standard_Integer newpnt = theInt.NbPnt();
   Standard_Real param,paramu,paramv;
-#ifdef DEB
-  TopAbs_Orientation orface =
-#endif
-                              theface.Orientation();
   for (Standard_Integer j = 1; j<=newpnt; j++) {
     const gp_Pnt& thept = theInt.Pnt(j);
     param = theInt.WParameter(j);
diff --git a/src/LocOpe/LocOpe_Generator.cxx b/src/LocOpe/LocOpe_Generator.cxx
index c32ff05..91a44a0 100644
--- a/src/LocOpe/LocOpe_Generator.cxx
+++ b/src/LocOpe/LocOpe_Generator.cxx
@@ -902,10 +902,7 @@ void LocOpe_Generator::Perform(const Handle(LocOpe_GeneratedShape)& G)
       L.AddConstEdges(listofedg);
       L.Perform();
       L.WiresToFaces();
-#ifdef DEB
-      const TopTools_ListOfShape& listofwires =
-#endif
-                                                L.NewWires();
+      L.NewWires();
       const TopTools_ListOfShape& listoffaces = L.NewFaces();
       toRemove.Add(fac);
       //      if (!HasWire) {
diff --git a/src/LocOpe/LocOpe_SplitDrafts.cxx b/src/LocOpe/LocOpe_SplitDrafts.cxx
index 20aba0d..aea5a48 100644
--- a/src/LocOpe/LocOpe_SplitDrafts.cxx
+++ b/src/LocOpe/LocOpe_SplitDrafts.cxx
@@ -1139,10 +1139,6 @@ void LocOpe_SplitDrafts::Perform(const TopoDS_Face& F,
 
 		  TopoDS_Vertex Vf2,Vl2;
 		  TopExp::Vertices(TopoDS::Edge(Gvf),Vf2,Vl2);
-#ifdef DEB
-		  TopAbs_Orientation ornw =
-#endif
-                                            NewEdg.Orientation();
 
 		  // ici bug orientation : voir tspdrft6
 
@@ -1170,10 +1166,6 @@ void LocOpe_SplitDrafts::Perform(const TopoDS_Face& F,
 
 		  TopoDS_Vertex Vf2,Vl2;
 		  TopExp::Vertices(TopoDS::Edge(Gvl),Vf2,Vl2);
-#ifdef DEB
-		  TopAbs_Orientation ornw =
-#endif
-                                            NewEdg.Orientation();
 
 		  // ici bug orientation : voir tspdrft6
 
diff --git a/src/LocOpe/LocOpe_SplitShape.cxx b/src/LocOpe/LocOpe_SplitShape.cxx
index d6c8a9e..cdd8a86 100644
--- a/src/LocOpe/LocOpe_SplitShape.cxx
+++ b/src/LocOpe/LocOpe_SplitShape.cxx
@@ -950,10 +950,6 @@ static Standard_Boolean IsInside(const TopoDS_Face& F,
   TopoDS_Shape aLocalShape = F.EmptyCopied();
   TopoDS_Face newFace = TopoDS::Face(aLocalShape);
   //  TopoDS_Face newFace = TopoDS::Face(F.EmptyCopied());
-#ifdef DEB
-  TopAbs_Orientation orWire =
-#endif
-    W2.Orientation();
   newFace.Orientation(TopAbs_FORWARD);
   B.Add(newFace,W2);
   //  GProp_GProps GP;
diff --git a/src/MAT2d/MAT2d_Tool2d.cxx b/src/MAT2d/MAT2d_Tool2d.cxx
index 325ac20..7d7167b 100644
--- a/src/MAT2d/MAT2d_Tool2d.cxx
+++ b/src/MAT2d/MAT2d_Tool2d.cxx
@@ -397,9 +397,6 @@ void MAT2d_Tool2d::TrimBisec (      Bisector_Bisec&  B1,
   //gp_Vec2d             Tan1,Tan2;
   gp_Pnt2d             Ori; //PEdge;
   Standard_Integer     INext;
-#ifdef DEB
-  Standard_Real        Tolerance = MAT2d_TOLCONF;
-#endif
   INext = (IndexEdge == theCircuit->NumberOfItems()) ? 1  : (IndexEdge + 1);
   
   Handle(Standard_Type) EdgeType = theCircuit->Value(IndexEdge)->DynamicType();
diff --git a/src/MXCAFDoc/MXCAFDoc_AreaRetrievalDriver.cxx b/src/MXCAFDoc/MXCAFDoc_AreaRetrievalDriver.cxx
index 2666a53..a2c8272 100644
--- a/src/MXCAFDoc/MXCAFDoc_AreaRetrievalDriver.cxx
+++ b/src/MXCAFDoc/MXCAFDoc_AreaRetrievalDriver.cxx
@@ -57,9 +57,5 @@ Standard_Integer MXCAFDoc_AreaRetrievalDriver::VersionNumber() const
   Handle(PXCAFDoc_Area) S = Handle(PXCAFDoc_Area)::DownCast (Source);
   Handle(XCAFDoc_Area) T = Handle(XCAFDoc_Area)::DownCast (Target);
   
-#ifdef DEB
-  PTColStd_PersistentTransientMap& PTMap = 
-#endif
-    RelocTable->OtherTable();
   T->Set(S->Get());
 }
diff --git a/src/MXCAFDoc/MXCAFDoc_AreaStorageDriver.cxx b/src/MXCAFDoc/MXCAFDoc_AreaStorageDriver.cxx
index af5361b..b666e19 100644
--- a/src/MXCAFDoc/MXCAFDoc_AreaStorageDriver.cxx
+++ b/src/MXCAFDoc/MXCAFDoc_AreaStorageDriver.cxx
@@ -57,9 +57,5 @@ Standard_Integer MXCAFDoc_AreaStorageDriver::VersionNumber() const
   Handle(XCAFDoc_Area) S = Handle(XCAFDoc_Area)::DownCast (Source);
   Handle(PXCAFDoc_Area) T = Handle(PXCAFDoc_Area)::DownCast (Target);
   
-#ifdef DEB
-  PTColStd_TransientPersistentMap& TPMap = 
-#endif
-    RelocTable->OtherTable();
   T->Set(S->Get());
 }
diff --git a/src/MXCAFDoc/MXCAFDoc_CentroidRetrievalDriver.cxx b/src/MXCAFDoc/MXCAFDoc_CentroidRetrievalDriver.cxx
index efc9e98..dd3bfc1 100644
--- a/src/MXCAFDoc/MXCAFDoc_CentroidRetrievalDriver.cxx
+++ b/src/MXCAFDoc/MXCAFDoc_CentroidRetrievalDriver.cxx
@@ -62,9 +62,5 @@ MXCAFDoc_CentroidRetrievalDriver::MXCAFDoc_CentroidRetrievalDriver(const Handle(
   Handle(PXCAFDoc_Centroid) S = Handle(PXCAFDoc_Centroid)::DownCast (Source);
   Handle(XCAFDoc_Centroid) T = Handle(XCAFDoc_Centroid)::DownCast (Target);
 
-#ifdef DEB  
-  PTColStd_PersistentTransientMap& PTMap = 
-#endif
-    RelocTable->OtherTable();
   T->Set(S->Get());
 }
diff --git a/src/MXCAFDoc/MXCAFDoc_CentroidStorageDriver.cxx b/src/MXCAFDoc/MXCAFDoc_CentroidStorageDriver.cxx
index a04b22b..cd925dd 100644
--- a/src/MXCAFDoc/MXCAFDoc_CentroidStorageDriver.cxx
+++ b/src/MXCAFDoc/MXCAFDoc_CentroidStorageDriver.cxx
@@ -60,9 +60,5 @@ MXCAFDoc_CentroidStorageDriver::MXCAFDoc_CentroidStorageDriver(const Handle(CDM_
   Handle(XCAFDoc_Centroid) S = Handle(XCAFDoc_Centroid)::DownCast (Source);
   Handle(PXCAFDoc_Centroid) T = Handle(PXCAFDoc_Centroid)::DownCast (Target);
   
-#ifdef DEB
-  PTColStd_TransientPersistentMap& TPMap = 
-#endif
-    RelocTable->OtherTable();
   T->Set(S->Get());
 }
diff --git a/src/MXCAFDoc/MXCAFDoc_DatumRetrievalDriver.cxx b/src/MXCAFDoc/MXCAFDoc_DatumRetrievalDriver.cxx
index 4195b84..98ceb58 100644
--- a/src/MXCAFDoc/MXCAFDoc_DatumRetrievalDriver.cxx
+++ b/src/MXCAFDoc/MXCAFDoc_DatumRetrievalDriver.cxx
@@ -61,10 +61,6 @@ void MXCAFDoc_DatumRetrievalDriver::Paste(const Handle(PDF_Attribute)& Source,
   Handle(PXCAFDoc_Datum) S = Handle(PXCAFDoc_Datum)::DownCast (Source);
   Handle(XCAFDoc_Datum) T = Handle(XCAFDoc_Datum)::DownCast (Target);
   
-#ifdef DEB
-  PTColStd_PersistentTransientMap& PTMap = 
-#endif
-    RelocTable->OtherTable();
   Handle(TCollection_HAsciiString) aName, aDescr, anId;
   if ( !S->GetName().IsNull() )
     aName = new TCollection_HAsciiString( (S->GetName())->Convert() );
diff --git a/src/MXCAFDoc/MXCAFDoc_DatumStorageDriver.cxx b/src/MXCAFDoc/MXCAFDoc_DatumStorageDriver.cxx
index 14fda2c..ecb2d5e 100644
--- a/src/MXCAFDoc/MXCAFDoc_DatumStorageDriver.cxx
+++ b/src/MXCAFDoc/MXCAFDoc_DatumStorageDriver.cxx
@@ -59,10 +59,6 @@ void MXCAFDoc_DatumStorageDriver::Paste(const Handle(TDF_Attribute)& Source,
 {
   Handle(XCAFDoc_Datum) S = Handle(XCAFDoc_Datum)::DownCast (Source);
   Handle(PXCAFDoc_Datum) T = Handle(PXCAFDoc_Datum)::DownCast (Target);
-#ifdef DEB
-  PTColStd_TransientPersistentMap& TPMap = 
-#endif
-    RelocTable->OtherTable();
   Handle(TCollection_HAsciiString) aNameStr = S->GetName();
   Handle(TCollection_HAsciiString) aDescrStr = S->GetDescription();
   Handle(TCollection_HAsciiString) anIdStr = S->GetIdentification();
diff --git a/src/MXCAFDoc/MXCAFDoc_DimTolRetrievalDriver.cxx b/src/MXCAFDoc/MXCAFDoc_DimTolRetrievalDriver.cxx
index 133a0b9..6838fc5 100644
--- a/src/MXCAFDoc/MXCAFDoc_DimTolRetrievalDriver.cxx
+++ b/src/MXCAFDoc/MXCAFDoc_DimTolRetrievalDriver.cxx
@@ -63,10 +63,6 @@ void MXCAFDoc_DimTolRetrievalDriver::Paste(const Handle(PDF_Attribute)& Source,
   Handle(PXCAFDoc_DimTol) S = Handle(PXCAFDoc_DimTol)::DownCast (Source);
   Handle(XCAFDoc_DimTol) T = Handle(XCAFDoc_DimTol)::DownCast (Target);
   
-#ifdef DEB
-  PTColStd_PersistentTransientMap& PTMap = 
-#endif
-    RelocTable->OtherTable();
   Handle(TColStd_HArray1OfReal) aVals;
   Handle(PColStd_HArray1OfReal) aPArr = S->GetVal();
   if ( !aPArr.IsNull() )
diff --git a/src/MXCAFDoc/MXCAFDoc_DimTolStorageDriver.cxx b/src/MXCAFDoc/MXCAFDoc_DimTolStorageDriver.cxx
index 14dac6e..bb9d3bf 100644
--- a/src/MXCAFDoc/MXCAFDoc_DimTolStorageDriver.cxx
+++ b/src/MXCAFDoc/MXCAFDoc_DimTolStorageDriver.cxx
@@ -61,10 +61,6 @@ void MXCAFDoc_DimTolStorageDriver::Paste(const Handle(TDF_Attribute)& Source,
 {
   Handle(XCAFDoc_DimTol) S = Handle(XCAFDoc_DimTol)::DownCast (Source);
   Handle(PXCAFDoc_DimTol) T = Handle(PXCAFDoc_DimTol)::DownCast (Target);
-#ifdef DEB
-  PTColStd_TransientPersistentMap& TPMap = 
-#endif
-    RelocTable->OtherTable();
   Handle(TColStd_HArray1OfReal) aHArr = S->GetVal();
   Handle(PColStd_HArray1OfReal) aVals;
   if ( !aHArr.IsNull() )
diff --git a/src/MXCAFDoc/MXCAFDoc_MaterialRetrievalDriver.cxx b/src/MXCAFDoc/MXCAFDoc_MaterialRetrievalDriver.cxx
index be95d94..ffcfb80 100644
--- a/src/MXCAFDoc/MXCAFDoc_MaterialRetrievalDriver.cxx
+++ b/src/MXCAFDoc/MXCAFDoc_MaterialRetrievalDriver.cxx
@@ -61,10 +61,6 @@ void MXCAFDoc_MaterialRetrievalDriver::Paste(const Handle(PDF_Attribute)& Source
   Handle(PXCAFDoc_Material) S = Handle(PXCAFDoc_Material)::DownCast (Source);
   Handle(XCAFDoc_Material) T = Handle(XCAFDoc_Material)::DownCast (Target);
   
-#ifdef DEB
-  PTColStd_PersistentTransientMap& PTMap = 
-#endif
-    RelocTable->OtherTable();
   Handle(TCollection_HAsciiString) aName, aDescr, aDensName, aDensValType;
   if ( !S->GetName().IsNull() )
     aName = new TCollection_HAsciiString( (S->GetName())->Convert() );
diff --git a/src/MXCAFDoc/MXCAFDoc_MaterialStorageDriver.cxx b/src/MXCAFDoc/MXCAFDoc_MaterialStorageDriver.cxx
index 7be8daf..7ea408b 100644
--- a/src/MXCAFDoc/MXCAFDoc_MaterialStorageDriver.cxx
+++ b/src/MXCAFDoc/MXCAFDoc_MaterialStorageDriver.cxx
@@ -61,10 +61,6 @@ void MXCAFDoc_MaterialStorageDriver::Paste(const Handle(TDF_Attribute)& Source,
 {
   Handle(XCAFDoc_Material) S = Handle(XCAFDoc_Material)::DownCast (Source);
   Handle(PXCAFDoc_Material) T = Handle(PXCAFDoc_Material)::DownCast (Target);
-#ifdef DEB
-  PTColStd_TransientPersistentMap& TPMap = 
-#endif
-    RelocTable->OtherTable();
   Handle(TCollection_HAsciiString) aNameStr = S->GetName();
   Handle(TCollection_HAsciiString) aDescrStr = S->GetDescription();
   Handle(TCollection_HAsciiString) aDensNameStr = S->GetDensName();
diff --git a/src/MXCAFDoc/MXCAFDoc_VolumeRetrievalDriver.cxx b/src/MXCAFDoc/MXCAFDoc_VolumeRetrievalDriver.cxx
index 6979a20..a2cdfbd 100644
--- a/src/MXCAFDoc/MXCAFDoc_VolumeRetrievalDriver.cxx
+++ b/src/MXCAFDoc/MXCAFDoc_VolumeRetrievalDriver.cxx
@@ -56,9 +56,5 @@ Standard_Integer MXCAFDoc_VolumeRetrievalDriver::VersionNumber() const
   Handle(PXCAFDoc_Volume) S = Handle(PXCAFDoc_Volume)::DownCast (Source);
   Handle(XCAFDoc_Volume) T = Handle(XCAFDoc_Volume)::DownCast (Target);
   
-#ifdef DEB
-  PTColStd_PersistentTransientMap& PTMap = 
-#endif
-    RelocTable->OtherTable();
   T->Set(S->Get());
 }
diff --git a/src/MXCAFDoc/MXCAFDoc_VolumeStorageDriver.cxx b/src/MXCAFDoc/MXCAFDoc_VolumeStorageDriver.cxx
index c33c300..ae4183c 100644
--- a/src/MXCAFDoc/MXCAFDoc_VolumeStorageDriver.cxx
+++ b/src/MXCAFDoc/MXCAFDoc_VolumeStorageDriver.cxx
@@ -57,9 +57,5 @@ Standard_Integer MXCAFDoc_VolumeStorageDriver::VersionNumber() const
   Handle(XCAFDoc_Volume) S = Handle(XCAFDoc_Volume)::DownCast (Source);
   Handle(PXCAFDoc_Volume) T = Handle(PXCAFDoc_Volume)::DownCast (Target);
   
-#ifdef DEB
-  PTColStd_TransientPersistentMap& TPMap = 
-#endif
-    RelocTable->OtherTable();
   T->Set(S->Get());
 }
diff --git a/src/NCollection/NCollection_IncAllocator.cxx b/src/NCollection/NCollection_IncAllocator.cxx
index 425414a..eb769e7 100644
--- a/src/NCollection/NCollection_IncAllocator.cxx
+++ b/src/NCollection/NCollection_IncAllocator.cxx
@@ -103,7 +103,6 @@ static void Debug_Create(Standard_Address theAlloc)
   if (CurrentID == CATCH_ID)
   {
     // Place for break point for creation of investigated allocator
-    int a = 1;
   }
 }
 
diff --git a/src/OpenGl/OpenGl_curve.cxx b/src/OpenGl/OpenGl_curve.cxx
index 5a52a8e..51de9ba 100644
--- a/src/OpenGl/OpenGl_curve.cxx
+++ b/src/OpenGl/OpenGl_curve.cxx
@@ -106,7 +106,6 @@ CurveDisplay( TSM_ELEM_DATA data, Tint n, cmn_key *k )
   tel_curve_data d;
   CMN_KEY        key;
   TEL_COLOUR     colour;
-  int            i, j;
 
   d = (tel_curve_data)data.pdata;
 
diff --git a/src/OpenGl/OpenGl_indexpolygons.cxx b/src/OpenGl/OpenGl_indexpolygons.cxx
index 83f1a6f..fbb9af7 100644
--- a/src/OpenGl/OpenGl_indexpolygons.cxx
+++ b/src/OpenGl/OpenGl_indexpolygons.cxx
@@ -1513,15 +1513,14 @@ doDraw:
 
 static void draw_degenerates_as_bboxs ( tel_indexpoly_data p ) {
 
-  Tint*     ind, *vis;
-  Tint      i, j, n, a, newList = 0;
+  Tint*     ind;
+  Tint      i, j, n, a;
   GLfloat   minp[ 3 ] = { FLT_MAX, FLT_MAX, FLT_MAX };
   GLfloat   maxp[ 3 ] = { FLT_MIN, FLT_MIN, FLT_MIN };
   tel_point pv;
 
   pv  = p -> vertices;
   ind = p -> indices;
-  vis = p -> edge_vis;
 
   LightOff ();
 
@@ -1536,7 +1535,6 @@ static void draw_degenerates_as_bboxs ( tel_indexpoly_data p ) {
     p -> d.degMode = 4;
 
     glNewList ( p -> d.dlist, GL_COMPILE_AND_EXECUTE );
-    newList = 1;
 doDraw:
     for ( i = 0, j = 0, a = 0; i < p -> num_bounds; ++i ) {
 
diff --git a/src/OpenGl/OpenGl_triedron.cxx b/src/OpenGl/OpenGl_triedron.cxx
index 5460387..657eed1 100644
--- a/src/OpenGl/OpenGl_triedron.cxx
+++ b/src/OpenGl/OpenGl_triedron.cxx
@@ -640,7 +640,6 @@ TStatus call_zbuffer_triedron_redraw (
 
   GLdouble TriedronAxeX[3] = { 1.0, 0.0, 0.0 };
   GLdouble TriedronAxeY[3] = { 0.0, 1.0, 0.0 };
-  GLdouble TriedronAxeZ[3] = { 0.0, 0.0, 1.0 };
   GLdouble TriedronOrigin[3] = { 0.0, 0.0, 0.0 };
   GLfloat TriedronColor[3] = { 1.0, 1.0, 1.0 }; /* def = blanc */
 
@@ -743,10 +742,6 @@ TStatus call_zbuffer_triedron_redraw (
   TriedronAxeY[1] = TriedronOrigin[1] + L ;
   TriedronAxeY[2] = TriedronOrigin[2] + 0.0;
 
-  TriedronAxeZ[0] = TriedronOrigin[0] + 0.0;
-  TriedronAxeZ[1] = TriedronOrigin[1] + 0.0;
-  TriedronAxeZ[2] = TriedronOrigin[2] + L ;
-
   /* Check position in the ViewPort */
   glGetDoublev( GL_MODELVIEW_MATRIX,  (GLdouble *) modelMatrix );
   glGetDoublev( GL_PROJECTION_MATRIX, (GLdouble *) projMatrix );
diff --git a/src/OpenGl/OpenGl_txgl.cxx b/src/OpenGl/OpenGl_txgl.cxx
index 1fe42cc..d62ace5 100644
--- a/src/OpenGl/OpenGl_txgl.cxx
+++ b/src/OpenGl/OpenGl_txgl.cxx
@@ -659,8 +659,6 @@ __declspec( dllexport ) int __fastcall __OpenGl_INIT__ (
 
     Bool  i;
     GLXContext ctx;
-    GLenum errorcode;
-    const GLubyte *errorstring;
 
     if ( !_Txgl_Map.IsBound( win ) )
       return TFailure;
diff --git a/src/ProjLib/ProjLib_PrjResolve.cxx b/src/ProjLib/ProjLib_PrjResolve.cxx
index 18bfb74..d51e99e 100644
--- a/src/ProjLib/ProjLib_PrjResolve.cxx
+++ b/src/ProjLib/ProjLib_PrjResolve.cxx
@@ -97,9 +97,6 @@
 
     
     F.Value(X, FVal);   
-#ifdef DEB
-    Standard_Real FuncVal= FVal(1)*FVal(1) + FVal(2)*FVal(2);
-#endif
 
     if ((FVal(1)*FVal(1) + FVal(2)*FVal(2)) > FuncTol) myDone = Standard_False;
   }
diff --git a/src/Prs2d/Prs2d_Angle.cxx b/src/Prs2d/Prs2d_Angle.cxx
index 3ed1daf..1e2c8ec 100644
--- a/src/Prs2d/Prs2d_Angle.cxx
+++ b/src/Prs2d/Prs2d_Angle.cxx
@@ -390,9 +390,6 @@ void Prs2d_Angle::DrawElement( const Handle(Graphic2d_Drawer)& aDrawer,
     
     /////////////////////////////////////////
     Standard_ShortReal txtAngle=Standard_ShortReal(myAbsAngle);
-    Standard_Real theSmbX,theSmbY;
-    theSmbX=myAbsX;
-    theSmbY=myAbsY;
     /////////////////////////////////////////
     Standard_ShortReal a = myCentX, b = myCentY, c = myRad, e = myFAngle, 
                        f = mySAngle,t1 = Standard_ShortReal( myAbsX ),
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedApprovalAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedApprovalAssignment.cxx
index 77a9e9c..9f69d6d 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedApprovalAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedApprovalAssignment.cxx
@@ -28,10 +28,7 @@ void RWStepAP214_RWAppliedApprovalAssignment::ReadStep
   // --- inherited field : assignedApproval ---
   
   Handle(StepBasic_Approval) aAssignedApproval;
-#ifdef DEB
-  Standard_Boolean stat1 = 
-#endif
-    data->ReadEntity(num, 1,"assigned_approval", ach, STANDARD_TYPE(StepBasic_Approval), aAssignedApproval);
+  data->ReadEntity(num, 1,"assigned_approval", ach, STANDARD_TYPE(StepBasic_Approval), aAssignedApproval);
 
   // --- own field : items ---
   
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.cxx
index 273e149..3a6f9f6 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.cxx
@@ -29,18 +29,12 @@ void RWStepAP214_RWAppliedDateAndTimeAssignment::ReadStep
   // --- inherited field : assignedDateAndTime ---
   
   Handle(StepBasic_DateAndTime) aAssignedDateAndTime;
-#ifdef DEB
-  Standard_Boolean stat1 = 
-#endif
-    data->ReadEntity(num, 1,"assigned_date_and_time", ach, STANDARD_TYPE(StepBasic_DateAndTime), aAssignedDateAndTime);
+  data->ReadEntity(num, 1,"assigned_date_and_time", ach, STANDARD_TYPE(StepBasic_DateAndTime), aAssignedDateAndTime);
   
   // --- inherited field : role ---
   
   Handle(StepBasic_DateTimeRole) aRole;
-#ifdef DEB
-  Standard_Boolean stat2 = 
-#endif
-    data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateTimeRole), aRole);
+  data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateTimeRole), aRole);
   
   // --- own field : items ---
   
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.cxx
index c53e88a..8781289 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.cxx
@@ -29,18 +29,12 @@ void RWStepAP214_RWAppliedDateAssignment::ReadStep
   // --- inherited field : assignedDate ---
   
   Handle(StepBasic_Date) aAssignedDate;
-#ifdef DEB
-  Standard_Boolean stat1 = 
-#endif
-    data->ReadEntity(num, 1,"assigned_date", ach, STANDARD_TYPE(StepBasic_Date), aAssignedDate);
+  data->ReadEntity(num, 1,"assigned_date", ach, STANDARD_TYPE(StepBasic_Date), aAssignedDate);
   
   // --- inherited field : role ---
   
   Handle(StepBasic_DateRole) aRole;
-#ifdef DEB
-  Standard_Boolean stat2 = 
-#endif
-    data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateRole), aRole);
+  data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateRole), aRole);
 
   // --- own field : items ---
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.cxx
index e60fcec..3966ff6 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.cxx
@@ -21,11 +21,7 @@ void  RWStepAP214_RWAppliedDocumentReference::ReadStep
   // --- inherited field : assigned_document
   
   Handle(StepBasic_Document) adoc;
-#ifdef DEB
-  Standard_Boolean stat1 = 
-#endif
-    data->ReadEntity
-      (num, 1,"assigned_document", ach, STANDARD_TYPE(StepBasic_Document), adoc);
+  data->ReadEntity(num, 1,"assigned_document", ach, STANDARD_TYPE(StepBasic_Document), adoc);
   
   // --- inherited field : source ---
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.cxx
index 57b7779..2938e6f 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.cxx
@@ -29,18 +29,12 @@ void RWStepAP214_RWAppliedOrganizationAssignment::ReadStep
   // --- inherited field : assignedOrganization ---
   
   Handle(StepBasic_Organization) aAssignedOrganization;
-#ifdef DEB
-  Standard_Boolean stat1 = 
-#endif
-    data->ReadEntity(num, 1,"assigned_organization", ach, STANDARD_TYPE(StepBasic_Organization), aAssignedOrganization);
+  data->ReadEntity(num, 1,"assigned_organization", ach, STANDARD_TYPE(StepBasic_Organization), aAssignedOrganization);
   
   // --- inherited field : role ---
 
   Handle(StepBasic_OrganizationRole) aRole;
-#ifdef DEB
-  Standard_Boolean stat2 = 
-#endif
-    data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_OrganizationRole), aRole);
+  data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_OrganizationRole), aRole);
   
   // --- own field : items ---
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.cxx
index 19619af..d783201 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.cxx
@@ -29,18 +29,12 @@ void RWStepAP214_RWAppliedPersonAndOrganizationAssignment::ReadStep
   // --- inherited field : assignedPersonAndOrganization ---
   
   Handle(StepBasic_PersonAndOrganization) aAssignedPersonAndOrganization;
-#ifdef DEB
-  Standard_Boolean stat1 = 
-#endif
-    data->ReadEntity(num, 1,"assigned_person_and_organization", ach, STANDARD_TYPE(StepBasic_PersonAndOrganization), aAssignedPersonAndOrganization);
+  data->ReadEntity(num, 1,"assigned_person_and_organization", ach, STANDARD_TYPE(StepBasic_PersonAndOrganization), aAssignedPersonAndOrganization);
   
   // --- inherited field : role ---
   
   Handle(StepBasic_PersonAndOrganizationRole) aRole;
-#ifdef DEB
-  Standard_Boolean stat2 = 
-#endif
-    data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_PersonAndOrganizationRole), aRole);
+  data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_PersonAndOrganizationRole), aRole);
   
   // --- own field : items ---
   
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.cxx
index 37a8188..93e86de 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.cxx
@@ -28,10 +28,7 @@ void RWStepAP214_RWAppliedSecurityClassificationAssignment::ReadStep
   // --- inherited field : assignedSecurityClassification ---
   
   Handle(StepBasic_SecurityClassification) aAssignedSecurityClassification;
-#ifdef DEB
-  Standard_Boolean stat1 = 
-#endif
-    data->ReadEntity(num, 1,"assigned_security_classification", ach, STANDARD_TYPE(StepBasic_SecurityClassification), aAssignedSecurityClassification);
+  data->ReadEntity(num, 1,"assigned_security_classification", ach, STANDARD_TYPE(StepBasic_SecurityClassification), aAssignedSecurityClassification);
   
   // --- own field : items ---
   
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.cxx
index 7e3acf7..5b640a7 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.cxx
@@ -29,18 +29,12 @@ void RWStepAP214_RWAutoDesignActualDateAndTimeAssignment::ReadStep
 	// --- inherited field : assignedDateAndTime ---
 
 	Handle(StepBasic_DateAndTime) aAssignedDateAndTime;
-#ifdef DEB
-	Standard_Boolean stat1 = 
-#endif
-	  data->ReadEntity(num, 1,"assigned_date_and_time", ach, STANDARD_TYPE(StepBasic_DateAndTime), aAssignedDateAndTime);
+	data->ReadEntity(num, 1,"assigned_date_and_time", ach, STANDARD_TYPE(StepBasic_DateAndTime), aAssignedDateAndTime);
 
 	// --- inherited field : role ---
 
 	Handle(StepBasic_DateTimeRole) aRole;
-#ifdef DEB
-	Standard_Boolean stat2 = 
-#endif
-	  data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateTimeRole), aRole);
+	data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateTimeRole), aRole);
 
 	// --- own field : items ---
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.cxx
index 55f155d..5e725c9 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.cxx
@@ -29,18 +29,12 @@ void RWStepAP214_RWAutoDesignActualDateAssignment::ReadStep
 	// --- inherited field : assignedDate ---
 
 	Handle(StepBasic_Date) aAssignedDate;
-#ifdef DEB
-	Standard_Boolean stat1 = 
-#endif
-	  data->ReadEntity(num, 1,"assigned_date", ach, STANDARD_TYPE(StepBasic_Date), aAssignedDate);
+	data->ReadEntity(num, 1,"assigned_date", ach, STANDARD_TYPE(StepBasic_Date), aAssignedDate);
 
 	// --- inherited field : role ---
 
 	Handle(StepBasic_DateRole) aRole;
-#ifdef DEB
-	Standard_Boolean stat2 = 
-#endif
-	  data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateRole), aRole);
+	data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateRole), aRole);
 
 	// --- own field : items ---
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.cxx
index 25b73a3..cd4bfdf 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.cxx
@@ -28,10 +28,7 @@ void RWStepAP214_RWAutoDesignApprovalAssignment::ReadStep
 	// --- inherited field : assignedApproval ---
 
 	Handle(StepBasic_Approval) aAssignedApproval;
-#ifdef DEB
-	Standard_Boolean stat1 = 
-#endif
-	  data->ReadEntity(num, 1,"assigned_approval", ach, STANDARD_TYPE(StepBasic_Approval), aAssignedApproval);
+	data->ReadEntity(num, 1,"assigned_approval", ach, STANDARD_TYPE(StepBasic_Approval), aAssignedApproval);
 
 	// --- own field : items ---
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.cxx
index 22e7bd0..bd83de9 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.cxx
@@ -29,18 +29,12 @@ void RWStepAP214_RWAutoDesignDateAndPersonAssignment::ReadStep
 	// --- inherited field : assignedPersonAndOrganization ---
 
 	Handle(StepBasic_PersonAndOrganization) aAssignedPersonAndOrganization;
-#ifdef DEB
-	Standard_Boolean stat1 = 
-#endif
-	  data->ReadEntity(num, 1,"assigned_person_and_organization", ach, STANDARD_TYPE(StepBasic_PersonAndOrganization), aAssignedPersonAndOrganization);
+	data->ReadEntity(num, 1,"assigned_person_and_organization", ach, STANDARD_TYPE(StepBasic_PersonAndOrganization), aAssignedPersonAndOrganization);
 
 	// --- inherited field : role ---
 
 	Handle(StepBasic_PersonAndOrganizationRole) aRole;
-#ifdef DEB
-	Standard_Boolean stat2 = 
-#endif
-	  data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_PersonAndOrganizationRole), aRole);
+	data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_PersonAndOrganizationRole), aRole);
 
 	// --- own field : items ---
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.cxx
index 2299376..f8f5d22 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.cxx
@@ -21,11 +21,7 @@ void  RWStepAP214_RWAutoDesignDocumentReference::ReadStep
 	// --- inherited field : assigned_document
 
 	Handle(StepBasic_Document) adoc;
-#ifdef DEB
-	Standard_Boolean stat1 = 
-#endif
-	  data->ReadEntity
-	    (num, 1,"assigned_document", ach, STANDARD_TYPE(StepBasic_Document), adoc);
+	data->ReadEntity(num, 1,"assigned_document", ach, STANDARD_TYPE(StepBasic_Document), adoc);
 
 	// --- inherited field : source ---
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.cxx
index 0158498..b13fa15 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.cxx
@@ -29,18 +29,12 @@ void RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment::ReadStep
 	// --- inherited field : assignedDateAndTime ---
 
 	Handle(StepBasic_DateAndTime) aAssignedDateAndTime;
-#ifdef DEB
-	Standard_Boolean stat1 = 
-#endif
-	  data->ReadEntity(num, 1,"assigned_date_and_time", ach, STANDARD_TYPE(StepBasic_DateAndTime), aAssignedDateAndTime);
+	data->ReadEntity(num, 1,"assigned_date_and_time", ach, STANDARD_TYPE(StepBasic_DateAndTime), aAssignedDateAndTime);
 
 	// --- inherited field : role ---
 
 	Handle(StepBasic_DateTimeRole) aRole;
-#ifdef DEB
-	Standard_Boolean stat2 = 
-#endif
-	  data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateTimeRole), aRole);
+	data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateTimeRole), aRole);
 
 	// --- own field : items ---
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.cxx
index bc44703..8492059 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.cxx
@@ -29,18 +29,12 @@ void RWStepAP214_RWAutoDesignOrganizationAssignment::ReadStep
 	// --- inherited field : assignedOrganization ---
 
 	Handle(StepBasic_Organization) aAssignedOrganization;
-#ifdef DEB
-	Standard_Boolean stat1 = 
-#endif
-	  data->ReadEntity(num, 1,"assigned_organization", ach, STANDARD_TYPE(StepBasic_Organization), aAssignedOrganization);
+	data->ReadEntity(num, 1,"assigned_organization", ach, STANDARD_TYPE(StepBasic_Organization), aAssignedOrganization);
 
 	// --- inherited field : role ---
 
 	Handle(StepBasic_OrganizationRole) aRole;
-#ifdef DEB
-	Standard_Boolean stat2 = 
-#endif
-	  data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_OrganizationRole), aRole);
+	data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_OrganizationRole), aRole);
 
 	// --- own field : items ---
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.cxx
index 3558c21..515f56c 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.cxx
@@ -29,18 +29,12 @@ void RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment::ReadStep
 	// --- inherited field : assignedPersonAndOrganization ---
 
 	Handle(StepBasic_PersonAndOrganization) aAssignedPersonAndOrganization;
-#ifdef DEB
-	Standard_Boolean stat1 = 
-#endif
-	  data->ReadEntity(num, 1,"assigned_person_and_organization", ach, STANDARD_TYPE(StepBasic_PersonAndOrganization), aAssignedPersonAndOrganization);
+	data->ReadEntity(num, 1,"assigned_person_and_organization", ach, STANDARD_TYPE(StepBasic_PersonAndOrganization), aAssignedPersonAndOrganization);
 
 	// --- inherited field : role ---
 
 	Handle(StepBasic_PersonAndOrganizationRole) aRole;
-#ifdef DEB
-	Standard_Boolean stat2 = 
-#endif
-	  data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_PersonAndOrganizationRole), aRole);
+	data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_PersonAndOrganizationRole), aRole);
 
 	// --- own field : items ---
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.cxx
index 72a910c..74ed103 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.cxx
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.cxx
@@ -28,10 +28,7 @@ void RWStepAP214_RWAutoDesignSecurityClassificationAssignment::ReadStep
 	// --- inherited field : assignedSecurityClassification ---
 
 	Handle(StepBasic_SecurityClassification) aAssignedSecurityClassification;
-#ifdef DEB
-	Standard_Boolean stat1 = 
-#endif
-	  data->ReadEntity(num, 1,"assigned_security_classification", ach, STANDARD_TYPE(StepBasic_SecurityClassification), aAssignedSecurityClassification);
+	data->ReadEntity(num, 1,"assigned_security_classification", ach, STANDARD_TYPE(StepBasic_SecurityClassification), aAssignedSecurityClassification);
 
 	// --- own field : items ---
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.cxx b/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.cxx
index 1f8f1f1..f29669e 100644
--- a/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.cxx
+++ b/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.cxx
@@ -32,10 +32,7 @@ void RWStepBasic_RWApplicationContextElement::ReadStep
 	// --- own field : frameOfReference ---
 
 	Handle(StepBasic_ApplicationContext) aFrameOfReference;
-#ifdef DEB
-	Standard_Boolean stat2 = 
-#endif
-	  data->ReadEntity(num, 2,"frame_of_reference", ach, STANDARD_TYPE(StepBasic_ApplicationContext), aFrameOfReference);
+	data->ReadEntity(num, 2,"frame_of_reference", ach, STANDARD_TYPE(StepBasic_ApplicationContext), aFrameOfReference);
 
 	//--- Initialisation of the read entity ---
 
diff --git a/src/RWStepShape/RWStepShape_RWFaceBound.cxx b/src/RWStepShape/RWStepShape_RWFaceBound.cxx
index 9d8475b..2b900f3 100644
--- a/src/RWStepShape/RWStepShape_RWFaceBound.cxx
+++ b/src/RWStepShape/RWStepShape_RWFaceBound.cxx
@@ -131,10 +131,6 @@ void RWStepShape_RWFaceBound::Check
 	  else {
 	    myShRef = aShto.Sharings(theEL2);
 	    myShRef.SelectType (STANDARD_TYPE(StepShape_FaceBound),Standard_True);
-#ifdef DEB
-	    Standard_Integer nbRef = 
-#endif
-	      myShRef.NbEntities();	
 	    myShRef.Start();
 	    Handle(StepShape_FaceBound) theFB2 =
 	      Handle(StepShape_FaceBound)::DownCast(myShRef.Value());
diff --git a/src/Select2D/Select2D_SensitivePoint.cxx b/src/Select2D/Select2D_SensitivePoint.cxx
index 115b6d2..36a98f2 100644
--- a/src/Select2D/Select2D_SensitivePoint.cxx
+++ b/src/Select2D/Select2D_SensitivePoint.cxx
@@ -62,9 +62,6 @@ Matches (const Standard_Real XMin,
 	 const Standard_Real YMax,
 	 const Standard_Real aTol)
 {//distance point-Line....
-#ifdef DEB
-  Standard_Real TheTol = HasOwnTolerance()? myOwnTolerance : aTol;
-#endif
   Standard_Real MinDist = gp_Lin2d(gp_Pnt2d(XMin,YMin),
 		     gp_Vec2d(gp_Pnt2d(XMin,YMin),
 			      gp_Pnt2d(XMax,YMax))
diff --git a/src/StlTransfer/StlTransfer.cxx b/src/StlTransfer/StlTransfer.cxx
index d73b2da..e0ca58b 100644
--- a/src/StlTransfer/StlTransfer.cxx
+++ b/src/StlTransfer/StlTransfer.cxx
@@ -115,11 +115,6 @@ void StlTransfer::BuildIncrementalMesh (const TopoDS_Shape&  Shape,
     theTriangles.Assign(theTriangulation->Triangles());
     Mesh->AddDomain (Deflection);
     
-#ifdef DEB
-    TopAbs_Orientation orientation = 
-#endif
-      face.Orientation();
-    
     TColgp_Array1OfPnt thePoints(1, theTriangulation->NbNodes());
     thePoints.Assign(theTriangulation->Nodes());
     //compute normal of face
diff --git a/src/TDF/TDF_ComparisonTool.cxx b/src/TDF/TDF_ComparisonTool.cxx
index 5976963..865730d 100644
--- a/src/TDF/TDF_ComparisonTool.cxx
+++ b/src/TDF/TDF_ComparisonTool.cxx
@@ -224,10 +224,6 @@ void TDF_ComparisonTool::Cut
 {
   if (aDataSet->IsEmpty()) return;
 
-#ifdef DEB
-  TDF_LabelMap&           refLabs =
-#endif
-                                    aDataSet->Labels();
   const TDF_AttributeMap& refAtts = aDataSet->Attributes();
 
   // Removes the attributes.
diff --git a/src/TPrsStd/TPrsStd_ConstraintTools.cxx b/src/TPrsStd/TPrsStd_ConstraintTools.cxx
index 22a30e9..912339a 100644
--- a/src/TPrsStd/TPrsStd_ConstraintTools.cxx
+++ b/src/TPrsStd/TPrsStd_ConstraintTools.cxx
@@ -753,11 +753,6 @@ void TPrsStd_ConstraintTools::ComputeAngleForOneFace (const Handle(TDataXtd_Cons
   TCollection_ExtendedString txt;
   TPrsStd_ConstraintTools::ComputeTextAndValue (aConst,val1,txt,Standard_True);  
   
-// Unused :
-#ifdef DEB
-  Standard_Boolean isface(shape.ShapeType()==TopAbs_FACE);
-#endif
-  
   Handle(AIS_AngleDimension) ais;
   TopoDS_Face face;
   if (!anAIS.IsNull()) {
@@ -777,11 +772,6 @@ void TPrsStd_ConstraintTools::ComputeAngleForOneFace (const Handle(TDataXtd_Cons
     ais =  new AIS_AngleDimension ( face, val1, txt);
   } 
 
-// Unused :
-#ifdef DEB
-  Standard_Integer ExtShape(0);
-#endif
-
   anAIS = ais;
 }
 
@@ -1150,9 +1140,6 @@ void TPrsStd_ConstraintTools::ComputeRadius (const Handle(TDataXtd_Constraint)&
 
   //  Update de l'AIS
 // Unused :
-#ifdef DEB
-  Standard_Boolean tocreate = Standard_True;
-#endif
   Standard_Boolean isplanar(aConst->IsPlanar());
   if (isplanar) GetGoodShape(shape1);
 
@@ -1233,10 +1220,6 @@ void TPrsStd_ConstraintTools::ComputeMinRadius (const Handle(TDataXtd_Constraint
   ComputeTextAndValue(aConst,val1,txt,Standard_False);
 
   //  Update de l'AIS
-// Unused :
-#ifdef DEB
-  Standard_Boolean tocreate = Standard_True;
-#endif
   Standard_Boolean isplanar(aConst->IsPlanar());
   if (isplanar) GetGoodShape(shape1);
 
@@ -1316,10 +1299,6 @@ void TPrsStd_ConstraintTools::ComputeMaxRadius (const Handle(TDataXtd_Constraint
   ComputeTextAndValue(aConst,val1,txt,Standard_False);
 
   //  Update de l'AIS
-// Unused :
-#ifdef DEB
-  Standard_Boolean tocreate = Standard_True;
-#endif
   Standard_Boolean isplanar(aConst->IsPlanar());
   if (isplanar) GetGoodShape(shape1);
 
diff --git a/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx b/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx
index 245de63..378cfb6 100644
--- a/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx
+++ b/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx
@@ -194,14 +194,6 @@ Standard_Integer TOPOC(Draw_Interpretor& interpretor,Standard_Integer na,const c
       DBRep::Set(namie.ToCString(),es);
       if (eca) {
 	TCollection_AsciiString s;
-#ifdef DEB
-	Standard_Integer i1 =
-#endif
-                              BDS.Shape(F1);
-#ifdef DEB
-        Standard_Integer i2 =
-#endif
-                              BDS.Shape(F2);
 	if (outdraw) {
 	  if (outclear) s = s + "clear; ";
 	  ::CATSHA(s,F1,BDS,"tsee f ","; ");
diff --git a/src/TestTopOpe/TestTopOpe_CORCommands.cxx b/src/TestTopOpe/TestTopOpe_CORCommands.cxx
index 5f891ff..60aaaf7 100644
--- a/src/TestTopOpe/TestTopOpe_CORCommands.cxx
+++ b/src/TestTopOpe/TestTopOpe_CORCommands.cxx
@@ -253,10 +253,6 @@ Standard_Integer reguso(Draw_Interpretor& di, Standard_Integer n, const char** a
     TopOpeBRepBuild_ShellToSolid SheToSo;      
     for (; itm.More(); itm.Next()) {
       const TopTools_ListOfShape& lns = itm.Value();
-#ifdef DEB
-      Standard_Integer nlns =
-#endif
-                              lns.Extent();
       TopTools_ListIteratorOfListOfShape itsh(lns);
       for (; itsh.More(); itsh.Next()) {
 	const TopoDS_Shell& she = TopoDS::Shell(itsh.Value());
@@ -599,9 +595,6 @@ static Standard_Integer classifBnd2d(Draw_Interpretor& di, Standard_Integer n, c
   TopoDS_Shape W1 = DBRep::Get(a[1]);
   TopoDS_Shape W2 = DBRep::Get(a[2]);
   TopoDS_Shape F = DBRep::Get(a[3]);
-#ifdef DEB
-  Standard_Integer i = atoi(a[4]);
-#endif
   
   TopoDS_Wire w1 = TopoDS::Wire(W1);
   TopoDS_Wire w2 = TopoDS::Wire(W2);
@@ -770,9 +763,6 @@ static Standard_Integer normal(Draw_Interpretor& di, Standard_Integer n, const c
 //  TopoDS_Face f = TopoDS::Face(DBRep::Get(a[1]));
   if (f.IsNull()) {di<<"null shape"<<"\n";return 1;}
   gp_Pnt p; DrawTrSurf::GetPoint(a[2], p);
-#ifdef DEB
-  Standard_Real length = atof(a[3]);
-#endif
   Standard_Real dist=0.; gp_Pnt2d uv; Standard_Boolean ok = FUN_tool_projPonF(p,f,uv,dist);
   if (!ok) {di<<"projection failed"<<"\n"; return 1;}
   FUN_tool_nggeomF(uv,f);
diff --git a/src/TestTopOpe/TestTopOpe_DSACommands.cxx b/src/TestTopOpe/TestTopOpe_DSACommands.cxx
index b28fb44..fb6bc2d 100644
--- a/src/TestTopOpe/TestTopOpe_DSACommands.cxx
+++ b/src/TestTopOpe/TestTopOpe_DSACommands.cxx
@@ -102,20 +102,9 @@ Standard_Integer DSACCESSCOMMANDS(Draw_Interpretor& interpretor,Standard_Integer
       Standard_Integer i,nbsh = DS.NbShapes();
       for(i = 1;i<=nbsh;i++) {
 	TopTools_ListOfShape& los = DS.ChangeShapeSameDomain(i);
-#ifdef DEB
-	Standard_Integer iref =
-#endif
-                                DS.SameDomainRef(i);
-#ifdef DEB
-	Standard_Integer iind =
-#endif
-                                DS.SameDomainInd(i);
 	TopTools_ListIteratorOfListOfShape li(los);
 	for(; li.More(); li.Next()) {
-#ifdef DEB
-	  const TopoDS_Shape& Shap =
-#endif
-                                     li.Value();
+      li.Value();
 	}
       }
     }
diff --git a/src/TestTopOpe/TestTopOpe_HDSCommands.cxx b/src/TestTopOpe/TestTopOpe_HDSCommands.cxx
index 8d03b33..4e88adf 100644
--- a/src/TestTopOpe/TestTopOpe_HDSCommands.cxx
+++ b/src/TestTopOpe/TestTopOpe_HDSCommands.cxx
@@ -236,13 +236,6 @@ static void SetCurve
   const Handle(Geom_Curve) GC = DSC.Curve();
   if ( GC.IsNull() ) { cout<<"Curve() nulle"<<endl; return; }
   
-#ifdef DEB
-  static Standard_Integer Cdiscret = 16;
-  static Standard_Real Cdeflect = 0.01;
-  static Standard_Integer Cdrawmod = 1;
-  static Standard_Boolean Cdisplayorigin = Standard_True;
-#endif
-  
   Standard_Real f = GC->FirstParameter();
   Standard_Real l = GC->LastParameter();
   
@@ -364,10 +357,7 @@ static Standard_Integer SeeSectionEdge(const Standard_Integer ISE)
   if ( ISE < 1 || ISE > nse ) return 0;
   const TopoDS_Shape& SE  = PHDSD->CurrentBDS().SectionEdge(ISE);
   if (SE.IsNull()) return 0;
-#ifdef DEB
-  Standard_Integer ids =
-#endif
-                         PHDSD->CurrentBDS().Shape(SE,SFindKeep);
+  PHDSD->CurrentBDS().Shape(SE,SFindKeep);
   
   TCollection_AsciiString namedbrep; PHDSD->SectionEdgeName(ISE,SE,namedbrep); 
   TCollection_AsciiString namedisp; PHDSD->SectionEdgeDisplayName(ISE,SE,namedisp);
@@ -534,9 +524,6 @@ static Standard_Integer SeeGeometry(const TopOpeBRepDS_Kind TK)
   
   const TopOpeBRepDS_DataStructure& BDS = PHDSD->CurrentBDS();
 
-#ifdef DEB  
-  Standard_Integer ig,ng = 0;
-#endif
   if      (TK == TopOpeBRepDS_POINT) {
     TopOpeBRepDS_PointExplorer pex(BDS,GFindKeep);
     for (; pex.More(); pex.Next()) {
@@ -1132,10 +1119,6 @@ Standard_Integer tds(Draw_Interpretor& di,Standard_Integer na,const char** a)
   if (PHDSD == NULL) return 0;
   const Handle(TopOpeBRepDS_HDataStructure)& HDS = PHDSD->CurrentHDS();
   if (HDS.IsNull()) {COUTNOHDS(di);return 0;}
-#ifdef DEB
-  const TopOpeBRepDS_DataStructure& BDS =
-#endif
-                                          PHDSD->CurrentBDS();
   
   TopOpeBRepDS_Dumper Dumper(HDS);
   if ( na == 1 ) { Dumper.Dump(cout,TDSkeep,TDScompact); return 0; }
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx
index 51f2b30..0417bbb 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx
@@ -467,10 +467,7 @@ void TestTopOpeDraw_SurfaceDisplayer::InitSurfaceDisplayer()
 void TestTopOpeDraw_SurfaceDisplayer::DisplaySurface(const Handle(Geom_Surface& S))
 {
   if (S.IsNull()) return;
-#ifdef DEB
-  Draw_ColorKind isocol =
-#endif
-                          TestTopOpeDraw_TTOT::GeometryColor(TopOpeBRepDS_SURFACE);
+  TestTopOpeDraw_TTOT::GeometryColor(TopOpeBRepDS_SURFACE);
   Handle(TestTopOpeDraw_DrawableSUR) D;
   D = new TestTopOpeDraw_DrawableSUR
     (S,mySDIsoColor,mySDBoundColor,mySDNormalColor,
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cxx
index e412deb..594f393 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cxx
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cxx
@@ -109,10 +109,6 @@ static Standard_CString makename2(const gp_Pnt& P)
 
   C = "";C = C + P.Coord(2);
   TCollection_AsciiString S1 = C.Token(".",1);
-#ifdef DEB
-  Standard_Integer l =
-#endif
-                       S1.Length();
   S1.RightJustify(15, ' ');
   TCollection_AsciiString S2 = C.Token(".",2);
   S2.Trunc(2);
diff --git a/src/TopOpeBRep/TopOpeBRep_DSFiller.cxx b/src/TopOpeBRep/TopOpeBRep_DSFiller.cxx
index 65a2d8e..5e860fb 100644
--- a/src/TopOpeBRep/TopOpeBRep_DSFiller.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_DSFiller.cxx
@@ -159,10 +159,7 @@ void BREP_correctgbound(const Handle(TopOpeBRepDS_HDataStructure)& HDS)
       if ( GK != TopOpeBRepDS_VERTEX ) continue;
       
       const TopoDS_Shape& v = BDS.Shape(GI);
-#ifdef DEB
-      Standard_Boolean isb =
-#endif
-                SSI->GBound();      
+      SSI->GBound();      
       Standard_Boolean vofe = imev.Contains(v);
       SSI->SetGBound(vofe);
     } // it.More()   
@@ -274,10 +271,7 @@ static
       const TopoDS_Edge& e2 = TopoDS::Edge(BDS.Shape(S1));
       if (!map2.Contains(e2)) continue;
 
-#ifdef DEB
-      Standard_Integer G1 =
-#endif
-               I1->Geometry(); TopOpeBRepDS_Kind GT1 = I1->GeometryType();
+      TopOpeBRepDS_Kind GT1 = I1->GeometryType();
       if (GT1 == TopOpeBRepDS_POINT) {
 	Handle(TopOpeBRepDS_CurvePointInterference) CPI1 = Handle(TopOpeBRepDS_CurvePointInterference)::DownCast(I1); 
 	Standard_Real par1 = CPI1->Parameter();
@@ -450,14 +444,6 @@ void TopOpeBRep_DSFiller::InsertIntersection(const TopoDS_Shape& aS1,
     const TopoDS_Shape& gs2 = myShapeIntersector.CurrentGeomShape(2);
     TopAbs_ShapeEnum t1 = gs1.ShapeType();
     TopAbs_ShapeEnum t2 = gs2.ShapeType();
-#ifdef DEB
-    TopAbs_Orientation o1 =
-#endif
-              gs1.Orientation();
-#ifdef DEB
-    TopAbs_Orientation o2 = 
-#endif
-              gs2.Orientation();
     
     // si le couple courant apres un couple facefacesamedomain n'est
     // pas un couple edgeedge ==> facefacesamedomain est deconnecte 
@@ -689,10 +675,6 @@ void TopOpeBRep_DSFiller::RemoveUnsharedGeometry(const Handle(TopOpeBRepDS_HData
     TopTools_ListIteratorOfListOfShape itsd(lSsd);
     for (; itsd.More(); itsd.Next()){
       TopoDS_Shape Ssd = itsd.Value(); //xpuxpu
-#ifdef DEB
-      Standard_Integer iSsd =
-#endif
-                 BDS.Shape(Ssd);
       Standard_Integer rkSsd = BDS.AncestorRank(Ssd);
       if (rkSsd == 1) continue;
       
@@ -768,14 +750,6 @@ void TopOpeBRep_DSFiller::InsertIntersection2d
     const TopoDS_Shape& gs2 = myShapeIntersector2d.CurrentGeomShape(2);
     TopAbs_ShapeEnum t1 = gs1.ShapeType();
     TopAbs_ShapeEnum t2 = gs2.ShapeType();
-#ifdef DEB
-    TopAbs_Orientation o1 =
-#endif
-              gs1.Orientation();
-#ifdef DEB
-    TopAbs_Orientation o2 =
-#endif
-              gs2.Orientation();
     
     // si le couple courant apres un couple facefacesamedomain n'est
     // pas un couple edgeedge ==> facefacesamedomain est deconnecte 
@@ -814,10 +788,6 @@ void TopOpeBRep_DSFiller::InsertIntersection2d
     else if ((t1 == TopAbs_EDGE) && (t2 == TopAbs_EDGE)) {
       TopOpeBRep_EdgesIntersector& EE = myShapeIntersector2d.ChangeEdgesIntersector();
       EE.Dimension(2);
-#ifdef DEB
-      Standard_Boolean EEsamedomain =
-#endif
-                         EE.SameDomain();
       myEdgesFiller.Face(1,lFF1);
       myEdgesFiller.Face(2,lFF2);
       myEdgesFiller.Insert(gs1,gs2,EE,HDS);
diff --git a/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx b/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx
index d64483c..c2ce537 100644
--- a/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx
@@ -69,39 +69,18 @@ void TopOpeBRep_EdgesFiller::Insert(const TopoDS_Shape& E1,const TopoDS_Shape& E
   }
 #endif
   
-#ifdef DEB
-  Standard_Boolean hs =
-#endif
-           myPEI->HasSegment();
   Standard_Boolean esd = myPEI->SameDomain();
   if (esd) myPDS->FillShapesSameDomain(E1,E2);
   
   // exit if no point.
   myPEI->InitPoint(); if ( !myPEI->MorePoint() ) return;
   
-#ifdef DEB
-  Standard_Boolean reducesegment = (hs && !esd);
-#endif
-
-#ifdef DEB
-  TopAbs_Orientation E1ori =
-#endif
-               E1.Orientation();
-#ifdef DEB
-  TopAbs_Orientation E2ori =
-#endif
-               E2.Orientation();
-  
   // --- Add <E1,E2> in BDS
   Standard_Integer E1index = myPDS->AddShape(E1,1);
   Standard_Integer E2index = myPDS->AddShape(E2,2);
   
   // --- get list of interferences connected to edges <E1>,<E2>
   TopOpeBRepDS_ListOfInterference& EIL1 = myPDS->ChangeShapeInterferences(E1);
-#ifdef DEB
-  TopOpeBRepDS_ListOfInterference& EIL2 =
-#endif
-                 myPDS->ChangeShapeInterferences(E2);
   
   Handle(TopOpeBRepDS_Interference) EPI;  //edge/point interference
   Handle(TopOpeBRepDS_Interference) EVI;  //edge/vertex interference
@@ -115,13 +94,7 @@ void TopOpeBRep_EdgesFiller::Insert(const TopoDS_Shape& E1,const TopoDS_Shape& E
 
 #ifdef DEB
     Standard_Boolean pointofsegment =
-#endif
                          P2D.IsPointOfSegment();
-#ifdef DEB
-    Standard_Boolean reducesegmentpoint = (reducesegment && pointofsegment);
-#endif
-
-#ifdef DEB
     if (trc) {
       if      (pointofsegment &&  esd) debposesd();
       else if (pointofsegment && !esd) debposnesd();
@@ -375,10 +348,7 @@ Standard_Boolean TopOpeBRep_EdgesFiller::MakeGeometry(const TopOpeBRep_Point2d&
   Standard_Boolean isvertex2 = P2D.IsVertex(2);
   if (isvertex1 && isvertex2) {
     Standard_Integer G1 = myPDS->AddShape(P2D.Vertex(1),1);
-#ifdef DEB
-    Standard_Integer G2 =
-#endif
-              myPDS->AddShape(P2D.Vertex(2),2);
+    myPDS->AddShape(P2D.Vertex(2),2);
     G = G1;
     K = TopOpeBRepDS_VERTEX;
   }
@@ -465,14 +435,8 @@ Standard_Boolean TopOpeBRep_EdgesFiller::ToRecompute(const TopOpeBRep_Point2d& P
 {
   Standard_Boolean b = Standard_True;
   const TopOpeBRepDS_Transition& T = I->Transition();
-#ifdef DEB
-  TopAbs_State sb =
-#endif
-            T.Before();
-#ifdef DEB
-  TopAbs_State sa =
-#endif
-            T.After();
+  T.Before();
+  T.After();
   Standard_Boolean pointofsegment = P2D.IsPointOfSegment();
   Standard_Boolean esd = myPEI->SameDomain();
   b = b && (pointofsegment && !esd);
@@ -521,10 +485,6 @@ void TopOpeBRep_EdgesFiller::RecomputeInterferences(const TopoDS_Edge& E,TopOpeB
     Standard_Integer ifb = TU.IndexBefore();
     Standard_Integer ifa = TU.IndexAfter();
     const TopoDS_Face& fb = TopoDS::Face(myPDS->Shape(ifb));
-#ifdef DEB
-    const TopoDS_Face& fa =
-#endif
-                    TopoDS::Face(myPDS->Shape(ifa));
 
 #ifdef DEB
     if (ifb != ifa) {cout<<"TopOpeBRep_EdgesFiller : ifb != ifa on E"<<EIX<<" NYI"<<endl;}
diff --git a/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx b/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx
index 4951ebd..4912c68 100644
--- a/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx
@@ -108,9 +108,6 @@ void TopOpeBRep_EdgesIntersector::SetFaces(const TopoDS_Shape& F1,const TopoDS_S
 //=======================================================================
 void TopOpeBRep_EdgesIntersector::SetFaces(const TopoDS_Shape& F1,const TopoDS_Shape& F2,const Bnd_Box& B1,const Bnd_Box& B2)
 {
-#ifdef DEB
-  Standard_Boolean memesfaces = F1.IsSame(F2);
-#endif
   Standard_Boolean computerestriction = Standard_False;
   
   Standard_Boolean so11 = Standard_True;
@@ -282,14 +279,6 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
 {
   mysp2d.Clear();
   myip2d = 1; mynp2d = 0;
-#ifdef DEB
-  TopAbs_Orientation E1ori =
-#endif
-               E1.Orientation();
-#ifdef DEB
-  TopAbs_Orientation E2ori =
-#endif
-               E2.Orientation();
   myEdge1 = TopoDS::Edge(E1);
   myEdge2 = TopoDS::Edge(E2);
   
@@ -364,23 +353,8 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
       if (apex) {
 	TopoDS_Vertex vf,vl; TopExp::Vertices(myEdge1,vf,vl);
 	gp_Pnt ptf = BRep_Tool::Pnt(vf); Standard_Real df = pt2.Distance(ptf); 
-	gp_Pnt ptl = BRep_Tool::Pnt(vl);
-#ifdef DEB
-        Standard_Real dl =
-#endif
-                 pt2.Distance(ptl); 
 	Standard_Real tolf = BRep_Tool::Tolerance(vf);
-#ifdef DEB
-        Standard_Real toll =
-#endif
-                   BRep_Tool::Tolerance(vl);
-#ifdef DEB
-	Standard_Real tol = Max (tolf,toll);
-#endif
 	Standard_Boolean onf = (df < tolf);
-#ifdef DEB
-        Standard_Boolean onl = (dl < toll);
-#endif
 	TopoDS_Vertex v1 = onf ? vf : vl;
 	TopTools_IndexedDataMapOfShapeListOfShape mapVE; TopExp::MapShapesAndAncestors(myFace1,TopAbs_VERTEX,TopAbs_EDGE,mapVE);
 	const TopTools_ListOfShape& Edsanc = mapVE.FindFromKey(v1);
@@ -557,10 +531,6 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
       Standard_Boolean isvertex11 = isvertex1 && !isvertex12;
 
       Standard_Boolean T1INT = (T1.Orientation(TopAbs_IN) == TopAbs_INTERNAL);
-#ifdef DEB
-      Standard_Boolean T1EXT = (T1.Orientation(TopAbs_IN) == TopAbs_EXTERNAL);
-      Standard_Boolean INTEXT1 = T1INT || T1EXT;
-#endif
       if (T1INT && isvertex2 && !isvertex1) {
 	const TopoDS_Vertex& V2 = P2D.Vertex(2);	
 	TopOpeBRepDS_Transition newT; Standard_Boolean computed = ::EdgesIntersector_checkT1D(myEdge1,myEdge2,V2,newT);
@@ -656,15 +626,6 @@ Standard_Boolean TopOpeBRep_EdgesIntersector::ComputeSameDomain()
   Standard_Boolean rr = (Abs(r1-r2) < Precision::Confusion()); //xpu281098 (cto019D2) tolerance a revoir
   if (!rr) return SetSameDomain(Standard_False);
 
-#ifdef DEB
-  const gp_Ax22d& pos1 =
-#endif
-                         c1.Position();
-#ifdef DEB
-  const gp_Ax22d& pos2 =
-#endif
-                         c2.Position();
-
   const gp_Pnt2d& p1 = c1.Location();
   const gp_Pnt2d& p2 = c2.Location();
 
@@ -739,10 +700,6 @@ Standard_Boolean TopOpeBRep_EdgesIntersector::ReduceSegment(TopOpeBRep_Point2d&
   
   Standard_Boolean pospsa = psa.IsPointOfSegment();
   TopOpeBRep_P2Dstatus stspsa = psa.Status();
-#ifdef DEB
-  const gp_Pnt& Ppsa =
-#endif
-                       psa.Value();
   Standard_Real tpsa1 = psa.Parameter(1);
   Standard_Real tpsa2 = psa.Parameter(2);
   const TopOpeBRepDS_Transition& Tpsa1 = psa.Transition(1);
@@ -750,10 +707,6 @@ Standard_Boolean TopOpeBRep_EdgesIntersector::ReduceSegment(TopOpeBRep_Point2d&
   
   Standard_Boolean pospsb = psb.IsPointOfSegment();
   TopOpeBRep_P2Dstatus stspsb = psb.Status();
-#ifdef DEB
-  const gp_Pnt& Ppsb =
-#endif
-                       psb.Value();
   Standard_Real tpsb1 = psb.Parameter(1);
   Standard_Real tpsb2 = psb.Parameter(2);
   const TopOpeBRepDS_Transition& Tpsb1 = psb.Transition(1);
@@ -801,10 +754,6 @@ Standard_Boolean TopOpeBRep_EdgesIntersector::ReduceSegment(TopOpeBRep_Point2d&
     psb.SetKeep(Standard_False);
     
     TopOpeBRepDS_Config cpsa = psa.EdgesConfig();
-#ifdef DEB
-    TopOpeBRepDS_Config cpsb =
-#endif
-                               psb.EdgesConfig();
     Pn.SetEdgesConfig(cpsa);
     
     Standard_Boolean isvpsa1 = psa.IsVertex(1);if (isvpsa1) Pn.SetVertex(1,psa.Vertex(1));
diff --git a/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx b/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx
index c7bdcf0..45f1203 100644
--- a/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx
@@ -63,10 +63,7 @@ void TopOpeBRep_FaceEdgeFiller::Insert
 
   // --- Add <FF,EE> in BDS
   Standard_Integer FFindex = BDS.AddShape(FF,1);
-#ifdef DEB
-  Standard_Integer EEindex =
-#endif
-                             BDS.AddShape(EE,2);
+  BDS.AddShape(EE,2);
 
   // --- get list of interferences connected to edges <FF>,<EE>
   TopOpeBRepDS_ListOfInterference& EIL1 = BDS.ChangeShapeInterferences(FF);
@@ -77,10 +74,6 @@ void TopOpeBRep_FaceEdgeFiller::Insert
 
   for (; FEINT.MorePoint(); FEINT.NextPoint() ) {
     gp_Pnt2d      pUV; FEINT.UVPoint(pUV);
-#ifdef DEB
-    TopAbs_State  sta =
-#endif
-                        FEINT.State();
     Standard_Real parE = FEINT.Parameter();
 
                                   FEINT.Transition(1,EEori); //  EEori bidon = EXTERNAL
diff --git a/src/TopOpeBRep/TopOpeBRep_FacesFiller.cxx b/src/TopOpeBRep/TopOpeBRep_FacesFiller.cxx
index a817568..fe2dec0 100644
--- a/src/TopOpeBRep/TopOpeBRep_FacesFiller.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_FacesFiller.cxx
@@ -467,9 +467,6 @@ void TopOpeBRep_FacesFiller::VP_PositionOnR(TopOpeBRep_LineInter& L)
   
   for (; VPI.More(); VPI.Next()) {
     TopOpeBRep_VPointInter& VP = VPI.ChangeCurrentVP();
-#ifdef DEB
-    Standard_Integer VPsi = VP.ShapeIndex();
-#endif
     
     Standard_Boolean isvertex = VP.IsVertex(Esi);
     if ( isvertex ) {
diff --git a/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx b/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx
index 078c51b..f5fc832 100644
--- a/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx
@@ -231,10 +231,6 @@ static Standard_Boolean FUN_findTF(const TopOpeBRepDS_PDataStructure pDS,
     if (!OOdone) return Standard_False;
 
     const TopoDS_Edge& E   = TopoDS::Edge(pDS->Shape(iE));
-#ifdef DEB
-    const TopoDS_Face& F   =
-#endif
-                     TopoDS::Face(pDS->Shape(iF));
     const TopoDS_Face& OOF = TopoDS::Face(pDS->Shape(iOOF));
 
     Standard_Real f,l; FUN_tool_bounds(E,f,l);
@@ -734,10 +730,7 @@ void TopOpeBRep_FacesFiller::ProcessRLine()
     Standard_Integer iOO = myDS->AddShape(OOE,OOrank);
 
     Standard_Real OOpar; 
-#ifdef DEB
-    Standard_Boolean okOO =
-#endif
-               VP.ParonE(OOE,OOpar);
+    VP.ParonE(OOE,OOpar);
  
     // xpu091198 : 1d interf done in EdgesFiller processing (cto cylcong *)     
     Standard_Boolean sdmeds = FUN_ds_sdm((*myDS),Erest,OOE);
@@ -975,8 +968,8 @@ void TopOpeBRep_FacesFiller::FillLineVPonR()
   //----------------------------------------------------------------------
   
 #ifdef DEB
-  Standard_Boolean trcd = Standard_False;
 #ifdef DRAW
+  Standard_Boolean trcd = Standard_False;
   if (trcd) FUN_DrawMap(myDataforDegenEd);
 #endif
 #endif
@@ -1187,10 +1180,6 @@ void TopOpeBRep_FacesFiller::StoreCurveInterference(const Handle(TopOpeBRepDS_In
     myDSCIndex = myDS->AddCurve(DSC);
     
 #ifdef DEB
-    const TopOpeBRepDS_Curve& CCC = myDS->Curve(myDSCIndex);
-#endif
-    
-#ifdef DEB
     if (TopOpeBRepDS_GettraceDSF() || TopOpeBRepDS_GettraceDSNC()) 
       cout<<"new DSC "<<myDSCIndex<<endl;
     if (TopOpeBRepDS_GettraceDSLT()) myLine->DumpLineTransitions(cout);
diff --git a/src/TopOpeBRep/TopOpeBRep_FacesIntersector.cxx b/src/TopOpeBRep/TopOpeBRep_FacesIntersector.cxx
index dcd00d1..b693304 100644
--- a/src/TopOpeBRep/TopOpeBRep_FacesIntersector.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_FacesIntersector.cxx
@@ -219,10 +219,6 @@ void TopOpeBRep_FacesIntersector::Perform(const TopoDS_Shape& F1,const TopoDS_Sh
   for (InitLine(); MoreLine(); NextLine()) {
     TopOpeBRep_LineInter& L = CurrentLine();
     if (L.TypeLineCurve() == TopOpeBRep_RESTRICTION) {
-#ifdef DEB
-      Standard_Boolean isedge1 = L.ArcIsEdge(1); //DEB
-      Standard_Boolean isedge2 = L.ArcIsEdge(2); //DEB
-#endif
       const TopoDS_Shape& E = L.Arc();
       myEdgeRestrictionMap.Add(E);
     }
@@ -289,9 +285,6 @@ Standard_Boolean TopOpeBRep_FacesIntersector::SameDomain () const
     Standard_ProgramError::Raise("FacesIntersector : bad SameDomain");
 
   Standard_Boolean sd = myIntersector.TangentFaces();
-#ifdef DEB
-  Standard_Boolean plpl = (mySurfaceType1 == GeomAbs_Plane) && (mySurfaceType2 == GeomAbs_Plane);
-#endif
 //  if (!plpl) return Standard_False;
   return sd;
 }
@@ -730,14 +723,6 @@ Handle(IntPatch_RLine) BuildRLineBasedOnWLine(const Handle(IntPatch_WLine)& theW
     return anRLine;
 
   Standard_Boolean IsOnFirst = (theRank == 1);
-#ifdef DEB
-  Standard_Integer ParamMinOnLine = (Standard_Integer) 
-#endif
-    Vtx1.ParameterOnLine();
-#ifdef DEB
-  Standard_Integer ParamMaxOnLine = (Standard_Integer) 
-#endif
-    Vtx2.ParameterOnLine();
 
   Handle(IntSurf_LineOn2S) aLineOn2S = new IntSurf_LineOn2S();
   const Handle(IntSurf_LineOn2S)& Lori = theWLine->Curve();
diff --git a/src/TopOpeBRep/TopOpeBRep_Hctxee2d.cxx b/src/TopOpeBRep/TopOpeBRep_Hctxee2d.cxx
index 7f47ed3..6a5e706 100644
--- a/src/TopOpeBRep/TopOpeBRep_Hctxee2d.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_Hctxee2d.cxx
@@ -103,23 +103,8 @@ void TopOpeBRep_Hctxee2d::SetEdges(const TopoDS_Edge& E1,const TopoDS_Edge& E2,
       if (apex) {
 	TopoDS_Vertex vf,vl; TopExp::Vertices(myEdge1,vf,vl);
 	gp_Pnt ptf = BRep_Tool::Pnt(vf); Standard_Real df = pt2.Distance(ptf); 
-	gp_Pnt ptl = BRep_Tool::Pnt(vl);
-#ifdef DEB
-        Standard_Real dl =
-#endif
-                 pt2.Distance(ptl); 
 	Standard_Real tolf = BRep_Tool::Tolerance(vf);
-#ifdef DEB
-        Standard_Real toll =
-#endif
-                   BRep_Tool::Tolerance(vl);
-#ifdef DEB
-	Standard_Real tol = Max (tolf,toll);
-#endif
 	Standard_Boolean onf = (df < tolf);
-#ifdef DEB
-        Standard_Boolean onl = (dl < toll);
-#endif
 	TopoDS_Vertex v1 = onf ? vf : vl;
 	TopTools_IndexedDataMapOfShapeListOfShape mapVE; TopExp::MapShapesAndAncestors(F1,TopAbs_VERTEX,TopAbs_EDGE,mapVE);
 	const TopTools_ListOfShape& Edsanc = mapVE.FindFromKey(v1);
@@ -161,11 +146,6 @@ void TopOpeBRep_Hctxee2d::SetEdges(const TopoDS_Edge& E1,const TopoDS_Edge& E2,
     }
   }
   
-#ifdef DEB
-  GeomAbs_CurveType myCurveType1 = myCurve1.GetType();
-  GeomAbs_CurveType myCurveType2 = myCurve2.GetType();
-#endif
-
 } // SetEdges
 
 //=======================================================================
diff --git a/src/TopOpeBRep/TopOpeBRep_Point2d.cxx b/src/TopOpeBRep/TopOpeBRep_Point2d.cxx
index 96fcfb7..c5c60ae 100644
--- a/src/TopOpeBRep/TopOpeBRep_Point2d.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_Point2d.cxx
@@ -83,14 +83,15 @@ void TopOpeBRep_Point2d::Dump(const Standard_Integer E1index,const Standard_Inte
   Standard_Boolean keep = Keep();
   Standard_Integer sts = Status();
   Standard_Boolean pos = IsPointOfSegment();
+#ifdef DRAW
   Standard_Real tol = Tolerance();
+#endif
   
   const TopOpeBRepDS_Transition& T1 = Transition(1);
   const TopOpeBRepDS_Transition& T2 = Transition(2);
   
   Standard_Boolean isvertex1 = IsVertex(1); TopoDS_Vertex V1; if (isvertex1) V1 = Vertex(1);
   Standard_Boolean isvertex2 = IsVertex(2); TopoDS_Vertex V2; if (isvertex2) V2 = Vertex(2);
-  Standard_Boolean isvertex = isvertex1 || isvertex2;
 
   Standard_Integer ia1,ia2; SegmentAncestors(ia1,ia2);
   cout<<endl<<"p2d "<<index<<"  k="<<keep<<" pos="<<pos;
diff --git a/src/TopOpeBRep/TopOpeBRep_ProcessGR.cxx b/src/TopOpeBRep/TopOpeBRep_ProcessGR.cxx
index 426d286..58b110e 100644
--- a/src/TopOpeBRep/TopOpeBRep_ProcessGR.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_ProcessGR.cxx
@@ -150,8 +150,8 @@ TopAbs_State TopOpeBRep_FacesFiller::StBipVPonF
   gp_Pnt pmil = BC.Value(parmil);
   
 #ifdef DEB
-  Standard_Boolean trc = TopOpeBRep_GettraceBIPS();
 #ifdef DRAW
+  Standard_Boolean trc = TopOpeBRep_GettraceBIPS();
   if (trc) {TCollection_AsciiString aa("pmil"); FUN_brep_draw(aa,pmil);}
 #endif
 #endif
@@ -202,10 +202,6 @@ void TopOpeBRep_FacesFiller::Lminmax(const TopOpeBRep_LineInter& L,
   VPI.Init(L,Standard_False);
   for (; VPI.More(); VPI.Next()) {
     const TopOpeBRep_VPointInter& VP = VPI.CurrentVP();
-#ifdef DEB
-    Standard_Integer iVP =
-#endif
-              VPI.CurrentVPIndex();
     Standard_Real p = VP.ParameterOnLine();
     pmin = Min(pmin,p);
     pmax = Max(pmax,p);
@@ -315,10 +311,6 @@ Standard_Real TopOpeBRep_FacesFiller::VPParamOnER(const TopOpeBRep_VPointInter&
   // If vp(index) is an edge boundary returns the point's parameter.
 
   const TopoDS_Edge& E = TopoDS::Edge(Lrest.Arc());
-#ifdef DEB
-  Standard_Boolean isdg =
-#endif
-             BRep_Tool::Degenerated(E);
   Standard_Boolean isedge1 =  Lrest.ArcIsEdge(1);
   Standard_Boolean isedge2 =  Lrest.ArcIsEdge(2);
   if (isedge1 && vp.IsVertexOnS1()) {
diff --git a/src/TopOpeBRep/TopOpeBRep_ProcessSectionEdges.cxx b/src/TopOpeBRep/TopOpeBRep_ProcessSectionEdges.cxx
index 8a425c6..9f487ed 100644
--- a/src/TopOpeBRep/TopOpeBRep_ProcessSectionEdges.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_ProcessSectionEdges.cxx
@@ -58,10 +58,6 @@ void TopOpeBRep_FacesFiller::GetESL(TopTools_ListOfShape& LES)
     
     if (isrest) {
       const TopoDS_Edge& E = TopoDS::Edge(L.Arc());
-#ifdef DEB
-      Standard_Boolean FIisrest =
-#endif
-                     myFacesIntersector->IsRestriction(E);
       
 #ifdef DEB
       if (trRL) {
@@ -100,10 +96,6 @@ void TopOpeBRep_FacesFiller::GetESL(TopTools_ListOfShape& LES)
 Standard_Boolean TopOpeBRep_FacesFiller::KeepRLine
 (const TopOpeBRep_LineInter& L,const Standard_Boolean checkkeep) const
 { 
-#ifdef DEB
-  Standard_Boolean trc = (TopOpeBRepDS_GettraceDSF() || TopOpeBRepDS_GettraceDSNC());
-#endif
-
   TopOpeBRep_TypeLineCurve t = L.TypeLineCurve();
   Standard_Boolean isrest = (t == TopOpeBRep_RESTRICTION);
   if (!isrest) return Standard_False;
@@ -340,10 +332,7 @@ void TopOpeBRep_FacesFiller::ProcessSectionEdges()
        itLES.Next(),itLOI.Next()) {
     const TopoDS_Shape& E1 = itLES.Value();
     Standard_Integer rE1 = itLOI.Value();
-#ifdef DEB
-    Standard_Integer iE1 =
-#endif
-              myDS->AddShape(E1,rE1);
+    myDS->AddShape(E1,rE1);
   }
   
   // determination des aretes SameDomain en 3d pur
diff --git a/src/TopOpeBRep/TopOpeBRep_ShapeIntersector.cxx b/src/TopOpeBRep/TopOpeBRep_ShapeIntersector.cxx
index 031bcac..f12ac49 100644
--- a/src/TopOpeBRep/TopOpeBRep_ShapeIntersector.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_ShapeIntersector.cxx
@@ -377,8 +377,6 @@ Standard_Boolean TopOpeBRep_ShapeIntersector::MoreIntersection() const
   Standard_Boolean res = myIntersectionDone;
 
 #ifdef DEB
-  Standard_Integer i1 = Index(1);
-  Standard_Integer i2 = Index(2);
   if (TopOpeBRep_GettraceSI() && res) {
     if      ( myFFDone )   cout<<"FF : ";
     else if ( myEEFFDone ) cout<<"    EE : ";
@@ -581,8 +579,6 @@ void TopOpeBRep_ShapeIntersector::FindFFIntersection()
 #ifdef DEB
     SAVFFi1 = myFaceScanner.Index(); SAVFFi2 = myFaceExplorer.Index(); 
     if (TopOpeBRep_GettraceSI()) {
-      Standard_Integer i1 = myFaceScanner.Index();
-      Standard_Integer i2 = myFaceExplorer.Index();
       cout<<"?? FF : ";
       myFaceScanner.DumpCurrent(cout); myFaceExplorer.DumpCurrent(cout);
       cout<<endl;
@@ -716,8 +712,6 @@ void TopOpeBRep_ShapeIntersector::FindEEFFIntersection()
     myEEIntersector.Perform(GS1,GS2);
 
 #ifdef DEB
-    Standard_Integer i1 = Index(1);
-    Standard_Integer i2 = Index(2);
     if (TopOpeBRep_GettraceSI() && myEEIntersector.IsEmpty()) {
       cout<<"    EE : ";
       myEdgeScanner.DumpCurrent(cout);
diff --git a/src/TopOpeBRep/TopOpeBRep_ShapeIntersector2d.cxx b/src/TopOpeBRep/TopOpeBRep_ShapeIntersector2d.cxx
index db4cbd4..22962f7 100644
--- a/src/TopOpeBRep/TopOpeBRep_ShapeIntersector2d.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_ShapeIntersector2d.cxx
@@ -119,8 +119,6 @@ Standard_Boolean TopOpeBRep_ShapeIntersector2d::MoreIntersection() const
   Standard_Boolean res = myIntersectionDone;
   
 #ifdef DEB
-  Standard_Integer i1 = Index(1);
-  Standard_Integer i2 = Index(2);
   if (TopOpeBRep_GettraceSI() && res) {
     if      ( myFFDone )   cout<<"FF : ";
     else if ( myEEFFDone ) cout<<"    EE : ";
@@ -252,8 +250,6 @@ void TopOpeBRep_ShapeIntersector2d::FindFFIntersection()
     
 #ifdef DEB
     if (TopOpeBRep_GettraceSI()) {
-      Standard_Integer i1 = myFaceScanner.Index();
-      Standard_Integer i2 = myFaceExplorer.Index();
       cout<<"?? FF : ";
       myFaceScanner.DumpCurrent(cout); 
       myFaceExplorer.DumpCurrent(cout);
@@ -262,14 +258,8 @@ void TopOpeBRep_ShapeIntersector2d::FindFFIntersection()
 #endif
 
     const TopOpeBRepTool_BoxSort& BS = myFaceScanner.BoxSort();
-#ifdef DEB
-    const Bnd_Box& B1 =
-#endif
-                        BS.Box(GS1);
-#ifdef DEB
-    const Bnd_Box& B2 =
-#endif
-                        BS.Box(GS2);
+    BS.Box(GS1);
+    BS.Box(GS2);
     myFFDone = Standard_True;
     break;
     NextFFCouple();  // @todo Should be really after the break?
@@ -365,8 +355,6 @@ void TopOpeBRep_ShapeIntersector2d::FindEEFFIntersection()
     myEEIntersector.Perform(GS1,GS2);
     
 #ifdef DEB
-    Standard_Integer i1 = Index(1);
-    Standard_Integer i2 = Index(2);
     if (TopOpeBRep_GettraceSI() && myEEIntersector.IsEmpty()) {
       cout<<"    EE : ";
       myEdgeScanner.DumpCurrent(cout);
diff --git a/src/TopOpeBRep/TopOpeBRep_VPointInterClassifier.cxx b/src/TopOpeBRep/TopOpeBRep_VPointInterClassifier.cxx
index a9e24cd..f101a47 100644
--- a/src/TopOpeBRep/TopOpeBRep_VPointInterClassifier.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_VPointInterClassifier.cxx
@@ -85,10 +85,6 @@ TopAbs_State TopOpeBRep_VPointInterClassifier::VPointPosition
     return myState;
   }
 
-#ifdef DEB
-  const gp_Pnt& P3D = VP.Value();
-#endif
- 
   TopoDS_Face FF = TopoDS::Face(F);
   TopOpeBRepTool_ShapeTool::AdjustOnPeriodic(FF,u,v);
   gp_Pnt2d p2d(u,v);
diff --git a/src/TopOpeBRep/TopOpeBRep_VPointInterIterator.cxx b/src/TopOpeBRep/TopOpeBRep_VPointInterIterator.cxx
index f6212d3..66b99e4 100644
--- a/src/TopOpeBRep/TopOpeBRep_VPointInterIterator.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_VPointInterIterator.cxx
@@ -52,10 +52,6 @@ void TopOpeBRep_VPointInterIterator::Init()
   if ( mycheckkeep ) {
     while ( More() ) { 
       const TopOpeBRep_VPointInter& VP = CurrentVP();
-#ifdef DEB
-      Standard_Integer iVP = 
-#endif
-	CurrentVPIndex();
       if (VP.Keep()) break;
       else myVPointIndex++;
     }
@@ -83,10 +79,6 @@ void  TopOpeBRep_VPointInterIterator::Next()
   if ( mycheckkeep ) {
     while ( More() ) { 
       const TopOpeBRep_VPointInter& VP = CurrentVP();
-#ifdef DEB
-      Standard_Integer iVP = 
-#endif
-	CurrentVPIndex();
       if (VP.Keep()) break;
       else myVPointIndex++;
     }
diff --git a/src/TopOpeBRep/TopOpeBRep_kpart.cxx b/src/TopOpeBRep/TopOpeBRep_kpart.cxx
index 3f3112d..8c39249 100644
--- a/src/TopOpeBRep/TopOpeBRep_kpart.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_kpart.cxx
@@ -465,9 +465,6 @@ Standard_Boolean FUNBREP_topogline_new
     Standard_ProgramError::Raise("FUNBREP_topogline_new : line is not a GLine");
     return Standard_False;
   }
-#ifdef DEB
-  Standard_Boolean trc = TopOpeBRepDS_GettraceDSF();
-#endif	    
 
   Standard_Integer iVP = VP.Index();
   Standard_Integer iINON1,iINONn,nINON; L.VPBounds(iINON1,iINONn,nINON);
@@ -581,9 +578,6 @@ Standard_Boolean FUNBREP_topogline
  Standard_Real& parline,TopOpeBRepDS_Transition& transLine)
 //----------------------------------------------------------------------
 {
-#ifdef DEB
-  Standard_Boolean trc = TopOpeBRepDS_GettraceDSF();
-#endif	    
 
   if (L.TypeLineCurve() == TopOpeBRep_WALKING) {
     Standard_ProgramError::Raise("FUNBREP_topogline : line is not a GLine");
@@ -609,7 +603,6 @@ Standard_Boolean FUNBREP_topogline
     if (iVP == iINONn) transLine = TopOpeBRepDS_Transition(TopAbs_IN,TopAbs_OUT);    
   }
   Standard_Boolean onsort = (transLine.Orientation(TopAbs_OUT) == TopAbs_FORWARD);
-  Standard_Boolean lastdefinie = ! lasttransLine.IsUnknown();
 
   Standard_Boolean LITdefinie = Standard_False;
   Standard_Boolean LITonsort = Standard_False;
diff --git a/src/TopOpeBRep/TopOpeBRep_vpr.cxx b/src/TopOpeBRep/TopOpeBRep_vpr.cxx
index 5403ee5..cf61920 100644
--- a/src/TopOpeBRep/TopOpeBRep_vpr.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_vpr.cxx
@@ -184,10 +184,6 @@ static void FUN_VPgeometryfound
   
   const TopOpeBRepDS_DataStructure& BDS = HDS->DS();
   if (BDS.HasShape(edge)) {
-#ifdef DEB
-    Standard_Integer iedge =
-#endif
-                BDS.Shape(edge);
     const TopOpeBRepDS_ListOfInterference& EPIL = BDS.ShapeInterferences(edge);
     TopOpeBRepDS_ListIteratorOfListOfInterference itEPIL(EPIL);
     EPIfound = FF.GetGeometry(itEPIL,VP,PVIndex,PVKind);
@@ -233,10 +229,6 @@ static void FUN_VPgeometryfound
     Standard_Real tolOOe = FUN_tool_maxtol(OOedge);
     Standard_Real OOtolp = Precision::Parametric(tolOOe);
     if (BDS.HasShape(OOedge)) {
-#ifdef DEB
-      Standard_Integer iooedge =
-#endif
-                    BDS.Shape(OOedge);
       const TopOpeBRepDS_ListOfInterference& OOEPIL = BDS.ShapeInterferences(OOedge);
       TopOpeBRepDS_ListIteratorOfListOfInterference OOitEPIL(OOEPIL);
       OOEPIfound = FF.GetGeometry(OOitEPIL,VP,PVIndex,PVKind);
@@ -546,9 +538,6 @@ static void FUN_processCPI
  Standard_Integer& keptVPnbr)
 //-----------------------------------------------------------------------
 {    
-#ifdef DEB
-  Standard_Boolean CPIfound = !Ifound.IsNull();
-#endif
   Standard_Integer OOShapeIndex = (ShapeIndex == 1) ? 2 : 1;
 
   TopOpeBRepDS_Transition ttransLine = transLine;
diff --git a/src/TopOpeBRep/TopOpeBRep_vprclo.cxx b/src/TopOpeBRep/TopOpeBRep_vprclo.cxx
index 43071b5..491ef1b 100644
--- a/src/TopOpeBRep/TopOpeBRep_vprclo.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_vprclo.cxx
@@ -151,20 +151,12 @@ void TopOpeBRep_FacesFiller::ProcessVPonclosingR(const TopOpeBRep_VPointInter& V
 //  Standard_Boolean isvertex = VP.IsVertex(ShapeIndex);
   Standard_Boolean isvertex = (PVKind == TopOpeBRepDS_VERTEX);
   Standard_Integer absindex = VP.ShapeIndex(); // 0,1,2,3
-#ifdef DEB
-  Standard_Integer iVP =
-#endif
-            VP.Index();
   Standard_Boolean OOShapeIndex = (ShapeIndex == 1) ? 2 : 1;
   Standard_Boolean on2edges = (absindex == 3);
   Standard_Boolean hasONedge = (VP.State(OOShapeIndex) == TopAbs_ON);
   Standard_Boolean hasOOedge = (on2edges) ? Standard_True : hasONedge;
 
   TopoDS_Face Face = (*this).Face(ShapeIndex);
-#ifdef DEB
-  Standard_Integer iSIFace =
-#endif
-                myDS->Shape(Face);
   TopoDS_Face OOFace = (*this).Face(OOShapeIndex);
   Standard_Integer iOOFace = myDS->Shape(OOFace);
   if (iOOFace == 0) iOOFace = myDS->AddShape(OOFace,OOShapeIndex);
@@ -174,14 +166,8 @@ void TopOpeBRep_FacesFiller::ProcessVPonclosingR(const TopOpeBRep_VPointInter& V
   const TopoDS_Edge& edge = TopoDS::Edge(VP.Edge(ShapeIndex));
   if (myDS->HasShape(edge)) SIedgeIndex = myDS->Shape(edge);
   else                      myDS->AddShape(edge,ShapeIndex);
-#ifdef DEB
-  Standard_Boolean isrest =
-#endif
-               myDS->IsSectionEdge(edge);
-#ifdef DEB
-  Standard_Boolean closing =
-#endif
-                TopOpeBRepTool_ShapeTool::Closed(edge,Face);
+  myDS->IsSectionEdge(edge);
+  TopOpeBRepTool_ShapeTool::Closed(edge,Face);
   Standard_Real paredge = VP.EdgeParameter(ShapeIndex);
   
   // dummy if !<hasOOedge>
diff --git a/src/TopOpeBRep/TopOpeBRep_vprdeg.cxx b/src/TopOpeBRep/TopOpeBRep_vprdeg.cxx
index a86f855..07558be 100644
--- a/src/TopOpeBRep/TopOpeBRep_vprdeg.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_vprdeg.cxx
@@ -947,11 +947,6 @@ static Standard_Integer FUN_putInterfonDegenEd
  TopoDS_Edge& OOEi, Standard_Real& paronOOEi, Standard_Boolean hasOOEi,
  Standard_Boolean& isT2d)
 {  
-#ifdef DEB
-  Standard_Boolean traceDSF = TopOpeBRepDS_GettraceDSF();
-  Standard_Boolean traceDEGEN = TopOpeBRepDS_GettraceDEGEN();
-  Standard_Boolean trace = traceDSF || traceDEGEN;
-#endif
   OOEi.Nullify();
 
   Standard_Boolean on3 = (VP.ShapeIndex() == 3);// <VP> is shared by edge of 1 and edge of 2.
diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_Tools2d.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_Tools2d.cxx
index a5c816d..0c2d45c 100644
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Tools2d.cxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Tools2d.cxx
@@ -184,8 +184,6 @@ static
   aNb=M.Extent();
   for (i=1; i<=aNb; i++) {
     const TopOpeBRepBuild_VertexInfo& aVInfo=M(i);
-    const TopTools_IndexedMapOfOrientedShape& EdgesIn   =aVInfo.EdgesIn();
-    const TopTools_IndexedMapOfOrientedShape& EdgesOut  =aVInfo.EdgesOut();
     
     printf(" Vert.#%d, ", i);
     const TopTools_ListOfShape& aList=aVInfo.ListPassed();
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_ProcessFaceInterferences.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_ProcessFaceInterferences.cxx
index bb8bb61..b3c8492 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_ProcessFaceInterferences.cxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_ProcessFaceInterferences.cxx
@@ -285,8 +285,6 @@ Standard_EXPORT void FUN_resolveFUNKNOWN
 
     const TopoDS_Face& FS = TopoDS::Face(BDS.Shape(S1));
 
-    Standard_Boolean isclosedFF = BRep_Tool::IsClosed(EE,FF);
-    Standard_Boolean isclosedFS = BRep_Tool::IsClosed(EE,FS);
 //    if (!go) continue;
 
     // la face FF transitionne par la transition T1.IsUnknown()
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_2d.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_2d.cxx
index dd0199a..4d3d2dd 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_2d.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_2d.cxx
@@ -282,9 +282,6 @@ static void FC2D_translate(Handle(Geom2d_Curve) C2D,
   
   if (isperio && uviso && !EFnull) {
     // C2D prend comme origine dans F l'origine de la pcurve de EF dans F
-#ifdef DEB
-    Standard_Real period = S1->IsUPeriodic() ? S1->UPeriod() : S1->IsVPeriodic() ? S1->VPeriod() : 0.;
-#endif
     TopoDS_Face FFOR = F;
     FFOR.Orientation(TopAbs_FORWARD);
     gp_Pnt2d p1,p2; BRep_Tool::UVPoints(EF,FFOR,p1,p2);
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_BoxSort.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_BoxSort.cxx
index f277d3d..3be6de7 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_BoxSort.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_BoxSort.cxx
@@ -290,10 +290,6 @@ const Bnd_Box& TopOpeBRepTool_BoxSort::Box(const TopoDS_Shape& S) const
   }
 
   if ( myHBT->HasBox(S) ) {
-#ifdef DEB
-    Standard_Integer i =
-#endif
-            myHBT->Index(S);
     const Bnd_Box& B = myHBT->Box(S);
     return B;
   }
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_CORRISO.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_CORRISO.cxx
index a4e4367..ac6db99 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_CORRISO.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_CORRISO.cxx
@@ -34,7 +34,7 @@ Standard_EXPORT TopTools_IndexedMapOfOrientedShape STATIC_PURGE_mapeds;
 static void FUN_RaiseError()
 {
 #ifdef DEB
-  Standard_Boolean trc = TopOpeBRepTool_GettraceCORRISO();
+//  Standard_Boolean trc = TopOpeBRepTool_GettraceCORRISO();
   FUN_REINIT(); 
 //  if (trc) cout <<"*********failure in CORRISO***********\n";
 #endif
@@ -72,10 +72,7 @@ TopOpeBRepTool_CORRISO::TopOpeBRepTool_CORRISO()
 TopOpeBRepTool_CORRISO::TopOpeBRepTool_CORRISO(const TopoDS_Face& Fref)
 {
   myFref = Fref;
-#ifdef DEB
-  Standard_Boolean closed =
-#endif
-               FUN_tool_closedS(myFref,myUclosed,myUper,myVclosed,myVper);
+  FUN_tool_closedS(myFref,myUclosed,myUper,myVclosed,myVper);
 
   const Handle(Geom_Surface)& SU = BRep_Tool::Surface(myFref);
   myGAS = GeomAdaptor_Surface(SU);
@@ -153,10 +150,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::Init(const TopoDS_Shape& S)
 //    Standard_Real f,l,tol; Handle(Geom2d_Curve) PC = FC2D_CurveOnSurface(E,myFref,f,l,tol);
     Handle(Geom2d_Curve) PC; Standard_Real f,l,tol;
     Standard_Boolean hasold = FC2D_HasOldCurveOnSurface(E,myFref,PC);
-#ifdef DEB
-    Standard_Boolean hasnew =
-#endif
-                 FC2D_HasNewCurveOnSurface(E,myFref,PC);
+    FC2D_HasNewCurveOnSurface(E,myFref,PC);
     PC = FC2D_EditableCurveOnSurface(E,myFref,f,l,tol);
     if (!hasold) FC2D_AddNewCurveOnSurface(PC,E,myFref,f,l,tol);
     if (PC.IsNull()) return Standard_False;
@@ -168,7 +162,10 @@ Standard_Boolean TopOpeBRepTool_CORRISO::Init(const TopoDS_Shape& S)
     for (; exv.More(); exv.Next()){
       const TopoDS_Vertex& v = TopoDS::Vertex(exv.Current());   
 #ifdef DEB
-      Standard_Integer iv = STATIC_PURGE_mapv.Add(v);
+#ifdef DRAW
+      Standard_Integer iv =
+#endif
+        STATIC_PURGE_mapv.Add(v);
 #ifdef DRAW
       if (trc) {TCollection_AsciiString bb = TCollection_AsciiString("v"); FUN_tool_draw(bb,v,iv);}
 #endif      
@@ -334,15 +331,7 @@ static Standard_Boolean FUN_isonOcE(const TopOpeBRepTool_CORRISO CO, const TopoD
     TopOpeBRepTool_C2DF OcE2d; Standard_Boolean isOb = CO.UVRep(OcE,OcE2d);
     if (!isOb) return Standard_False; // NYIRAISE
     
-#ifdef DEB
-    const TopoDS_Vertex& vce1 =
-#endif
-                      TopoDS::Vertex(vcE(1)); 
     Standard_Real parvce1 = TopOpeBRepTool_TOOL::ParE(1,cE);   gp_Pnt2d UVvce1 = TopOpeBRepTool_TOOL::UVF(parvce1,cE2d);
-#ifdef DEB
-    const TopoDS_Vertex& vOce2 =
-#endif
-                       TopoDS::Vertex(vOcE(2)); 
     Standard_Real parvOcE2 = TopOpeBRepTool_TOOL::ParE(2,OcE); gp_Pnt2d UVvOcE2 = TopOpeBRepTool_TOOL::UVF(parvOcE2,OcE2d);
     Standard_Real tol = Max(tttuvcE,tttuvOcE);
     isonOcE2d = (UVvce1.Distance(UVvOcE2) < tol);
@@ -380,10 +369,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::PurgeFyClosingE(const TopTools_ListOfSh
 
   if      (fyceds.Extent() == 1) {// ivf == 3 : cto016G*
     TopTools_DataMapOfOrientedShapeInteger fyeds;
-#ifdef DEB
-    Standard_Boolean found =
-#endif
-                EdgesWithFaultyUV(myEds,3,fyeds);
+    EdgesWithFaultyUV(myEds,3,fyeds);
     Standard_Integer nfy = fyeds.Extent();
 
     TopTools_DataMapIteratorOfDataMapOfOrientedShapeInteger itm(fyceds);
@@ -411,15 +397,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::PurgeFyClosingE(const TopTools_ListOfSh
       TopOpeBRepTool_C2DF OcE2d; Standard_Boolean isOb = UVRep(OcE,OcE2d);
       if (!isOb) return Standard_False; // NYIRAISE
       
-#ifdef DEB
-      const TopoDS_Vertex& vce1 =
-#endif
-                         TopoDS::Vertex(vcE(1)); 
       Standard_Real parvce1 = TopOpeBRepTool_TOOL::ParE(1,cE);   gp_Pnt2d UVvce1 = TopOpeBRepTool_TOOL::UVF(parvce1,cE2d);
-#ifdef DEB
-      const TopoDS_Vertex& vOce2 =
-#endif
-                         TopoDS::Vertex(vOcE(2)); 
       Standard_Real parvOcE2 = TopOpeBRepTool_TOOL::ParE(2,OcE); gp_Pnt2d UVvOcE2 = TopOpeBRepTool_TOOL::UVF(parvOcE2,OcE2d);
       Standard_Real tol = Max(tttuvcE,tttuvOcE);
       isoncE = (UVvce1.Distance(UVvOcE2) < tol);
@@ -523,14 +501,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::PurgeFyClosingE(const TopTools_ListOfSh
       Standard_Real tttuvOcE = Max(Tol(1,tttolOcE),Tol(2,tttolOcE));
       TopOpeBRepTool_C2DF OcE2d; Standard_Boolean isOb = UVRep(OcE,OcE2d);
       if (!isOb) return Standard_False; // NYIRAISE
-#ifdef DEB 
-      const TopoDS_Vertex& vce1 = TopoDS::Vertex(vcE(1));
-#endif 
       Standard_Real parvce1 = TopOpeBRepTool_TOOL::ParE(1,cE);   gp_Pnt2d UVvce1 = TopOpeBRepTool_TOOL::UVF(parvce1,cE2d);
-#ifdef DEB
-      const TopoDS_Vertex& vOce2 =
-#endif
-                         TopoDS::Vertex(vOcE(2)); 
       Standard_Real parvOcE2 = TopOpeBRepTool_TOOL::ParE(2,OcE); gp_Pnt2d UVvOcE2 = TopOpeBRepTool_TOOL::UVF(parvOcE2,OcE2d);
       Standard_Real tol = Max(tttuvcE,tttuvOcE);
       isonOcE2d = (UVvce1.Distance(UVvOcE2) < tol);
@@ -547,10 +518,6 @@ Standard_Boolean TopOpeBRepTool_CORRISO::PurgeFyClosingE(const TopTools_ListOfSh
       // <vce> (boundary of <cE>):   
       const TopoDS_Vertex& vce = TopoDS::Vertex(vcE(ivce)); 
       TopTools_ListOfShape loe; isb = Connexity(vce,loe);
-#ifdef DEB
-      Standard_Integer nloe =
-#endif
-                 loe.Extent(); // DEB
       if (!isb) return Standard_False; // NYIRAISE
 
       Standard_Real parvce = TopOpeBRepTool_TOOL::ParE(ivce,cE); gp_Pnt2d UVvce = TopOpeBRepTool_TOOL::UVF(parvce,cE2d);
@@ -684,9 +651,6 @@ Standard_Integer TopOpeBRepTool_CORRISO::EdgeOUTofBoundsUV(const TopoDS_Edge& E,
   Standard_Real xlast   = onU ? myGAS.LastUParameter() : myGAS.LastVParameter(); // xlast=xfirst+xperiod
   Standard_Real xperiod = onU ? myUper : myVper;
 
-#ifdef DEB
-  Standard_Boolean inbounds=Standard_False;  
-#endif
   Standard_Boolean isou,isov; gp_Pnt2d o2d; gp_Dir2d d2d; 
   Standard_Boolean iso = TopOpeBRepTool_TOOL::UVISO(PC,isou,isov,d2d,o2d);
 
@@ -834,10 +798,6 @@ Standard_Boolean TopOpeBRepTool_CORRISO::EdgeWithFaultyUV(const TopoDS_Edge& E,
     // <vEok> :
     Standard_Boolean vEok = Standard_False;
     const TopTools_ListOfShape& loe = myVEds.Find(vE);
-#ifdef DEB
-    Standard_Integer nloe =
-#endif
-               loe.Extent(); //DEB
     for (TopTools_ListIteratorOfListOfShape ite(loe); ite.More(); ite.Next()) {
       const TopoDS_Edge& e = TopoDS::Edge(ite.Value());
       TopAbs_Orientation oe = e.Orientation();
@@ -848,14 +808,6 @@ Standard_Boolean TopOpeBRepTool_CORRISO::EdgeWithFaultyUV(const TopoDS_Edge& E,
       if (e.IsSame(E)) continue;      
       if (M_INTERNAL(oe) || M_EXTERNAL(oe)) continue;
 
-#ifdef DEB
-      Standard_Real tttole =
-#endif
-                   BRep_Tool::Tolerance(e);
-#ifdef DEB
-      Standard_Real tttuve = Max(Tol(1,tttole),Tol(2,tttole));
-#endif
-      
       Standard_Boolean isb = myERep2d.IsBound(e);
       if (!isb) {FUN_RaiseError(); return Standard_False;}
       const TopOpeBRepTool_C2DF& C2DF = myERep2d.Find(e);
@@ -979,17 +931,11 @@ Standard_Boolean TopOpeBRepTool_CORRISO::TrslUV(const Standard_Boolean onU, cons
 {
   gp_Vec2d tt2d; 
   if (onU) {Standard_Real uper;
-#ifdef DEB
-            Standard_Boolean ok =
-#endif
-                     Refclosed(1,uper);
+            Refclosed(1,uper);
             if (!uper) return Standard_False;
 	    tt2d = gp_Vec2d(uper,0.);}
   else     {Standard_Real vper;
-#ifdef DEB
-            Standard_Boolean ok =
-#endif
-                     Refclosed(2,vper);
+            Refclosed(2,vper);
             if (!vper) return Standard_False;
 	    tt2d = gp_Vec2d(0.,vper);}
   TopTools_DataMapIteratorOfDataMapOfOrientedShapeInteger itm(FyEds);
@@ -1079,10 +1025,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::AddNewConnexity(const TopoDS_Vertex& ,
   if (!isb) {
     Handle(Geom2d_Curve) PC; Standard_Real f,l,tol;
     Standard_Boolean hasold = FC2D_HasOldCurveOnSurface(E,myFref,PC);
-#ifdef DEB
-    Standard_Boolean hasnew =
-#endif
-                 FC2D_HasNewCurveOnSurface(E,myFref,PC);
+    FC2D_HasNewCurveOnSurface(E,myFref,PC);
     PC = FC2D_EditableCurveOnSurface(E,myFref,f,l,tol);
     if (!hasold) FC2D_AddNewCurveOnSurface(PC,E,myFref,f,l,tol);
     if (PC.IsNull()) return Standard_False;
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_GEOMETRY.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_GEOMETRY.cxx
index 02298d6..cb05e62 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_GEOMETRY.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_GEOMETRY.cxx
@@ -79,10 +79,6 @@ Standard_EXPORT Standard_Boolean FUN_tool_onapex(const gp_Pnt2d& p2d,const Handl
   }
   if (ST == GeomAbs_Sphere) {
     Standard_Real pisur2 = PI*.5;
-#ifdef DEB
-    Standard_Real u =
-#endif
-            p2d.X();
     Standard_Real v = p2d.Y();
     Standard_Boolean vpisur2 = (Abs(v-pisur2) < toluv);
     Standard_Boolean vmoinspisur2 = (Abs(v+pisur2) < toluv);
@@ -118,10 +114,6 @@ Standard_EXPORT gp_Dir FUN_tool_ngS(const gp_Pnt2d& p2d,const Handle(Geom_Surfac
       }
       else if (du < tol) {
 	Standard_Real vf = GS.FirstVParameter();
-#ifdef DEB
-        Standard_Real vl =
-#endif
-                 GS.LastVParameter();
 	Standard_Boolean onvf = Abs(p2d.Y()-vf)<toluv;
 
 	Standard_Real x = p2d.X(); Standard_Real y = p2d.Y();
@@ -217,9 +209,6 @@ Standard_EXPORT Standard_Boolean FUN_tool_line(const Handle(Geom2d_Curve)& pc)
   if (pcb.IsNull()) return Standard_False;
   Geom2dAdaptor_Curve GC2d(pcb);
   GeomAbs_CurveType typ = GC2d.GetType();
-#ifdef DEB
-  Standard_Boolean isquad = Standard_False;
-#endif
   if (typ == GeomAbs_Line) return Standard_True;
 
   return Standard_False ;
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_HBoxTool.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_HBoxTool.cxx
index 9987c9e..ea3a2f2 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_HBoxTool.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_HBoxTool.cxx
@@ -126,10 +126,6 @@ const Bnd_Box& TopOpeBRepTool_HBoxTool::Box(const TopoDS_Shape& S)
     Standard_ProgramError::Raise("HBT::Box1");
   }
 
-#ifdef DEB
-  Standard_Integer im =
-#endif
-           Index(S);
   const Bnd_Box& B = myIMS.FindFromKey(S);
   return B;
 }
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_PURGE.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_PURGE.cxx
index 13fa508..87c5864 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_PURGE.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_PURGE.cxx
@@ -138,10 +138,6 @@ Standard_EXPORT Standard_Boolean FUN_tool_ClosedW(const TopoDS_Wire& W)
   TopTools_DataMapIteratorOfDataMapOfShapeListOfShape itvFine(mapvFine);
   for (; itvFine.More(); itvFine.Next()){
     const TopoDS_Shape& vFine = itvFine.Key();
-#ifdef DEB
-    const TopTools_ListOfShape& edsvFine =
-#endif
-                             itvFine.Value();
     Standard_Boolean vIine = mapvIine.IsBound(vFine);
     if (vIine) {mapvok.Add(vFine); continue;}
     Standard_Boolean vRine = mapvRine.IsBound(vFine);
@@ -153,10 +149,6 @@ Standard_EXPORT Standard_Boolean FUN_tool_ClosedW(const TopoDS_Wire& W)
   TopTools_DataMapIteratorOfDataMapOfShapeListOfShape itvRine(mapvRine);
   for (; itvRine.More(); itvRine.Next()){
     const TopoDS_Shape& vRine = itvRine.Key();
-#ifdef DEB
-    const TopTools_ListOfShape& edsvRine =
-#endif
-                             itvRine.Value();
     Standard_Boolean vok = mapvok.Contains(vRine);
     if (vok) continue;
     Standard_Boolean vIine = mapvIine.IsBound(vRine);
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_REGUS.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_REGUS.cxx
index 15ed348..87c42c7 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_REGUS.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_REGUS.cxx
@@ -340,10 +340,6 @@ Standard_Boolean TopOpeBRepTool_REGUS::SplitFaces()
     // splitting face :
     const TopoDS_Face& f = TopoDS::Face(exf.Current()); 
     TopTools_ListOfShape lfsp; Standard_Boolean issp = TopOpeBRepTool_REGUS::SplitF(f,lfsp);
-#ifdef DEB
-    Standard_Integer nf =
-#endif
-             lfsp.Extent();
     if (!issp) continue;
 
     myFsplits.Bind(f,lfsp);
@@ -599,10 +595,6 @@ Standard_Boolean TopOpeBRepTool_REGUS::NextinBlock()
 	// lofc : the list of faces connexed to e in <myS>
 	// lof  : the list of untouched faces connexed to e in <myS>	
 	const TopTools_ListOfShape& lofc = mymapeFsstatic.Find(e);
-#ifdef DEB
-        Standard_Integer nfc =
-#endif
-                  lofc.Extent();
 	itff.Initialize(lofc);
 	TopoDS_Face fref;
 	for (; itff.More(); itff.Next()) {
@@ -689,10 +681,6 @@ Standard_Boolean TopOpeBRepTool_REGUS::NearestF(const TopoDS_Edge& e, const TopT
 #endif
   ffound.Nullify();
   TopoDS_Face fref = TopoDS::Face(myf);
-#ifdef DEB
-  Standard_Integer nf =
-#endif
-           lof.Extent();//deb
 
   // Give us egde <e>, and a reference face <fref> (= <myf>)
   // - parameter on <e> = <pare>.
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_REGUW.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_REGUW.cxx
index 9502935..beb1f5c 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_REGUW.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_REGUW.cxx
@@ -298,10 +298,6 @@ Standard_Boolean TopOpeBRepTool_REGUW::MapS()
   TopExp_Explorer exe(CS, TopAbs_EDGE);
   for (; exe.More(); exe.Next()){
     const TopoDS_Edge& ed = TopoDS::Edge(exe.Current());
-#ifdef DEB
-    TopAbs_Orientation oed =
-#endif
-               ed.Orientation();
 
     Standard_Boolean isdgE = BRep_Tool::Degenerated(ed); 
     Standard_Boolean iscE = TopOpeBRepTool_TOOL::IsClosingE(ed,myCORRISO.S(),Fref()); 
@@ -482,11 +478,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::InitBlock()
   for (; exv.More(); exv.Next()){
     const TopoDS_Shape& vcur = exv.Current();
     TopOpeBRepTool_connexity& cco = mymapvEds.ChangeFromKey(vcur);
-#ifdef DEB
-    Standard_Boolean ok =
-#endif
-             cco.RemoveItem(myed);
-//    if (!ok) return Standard_False; see for closing vertices
+    cco.RemoveItem(myed);
   }
 
   // myp2d0 :
@@ -525,9 +517,6 @@ Standard_Boolean TopOpeBRepTool_REGUW::NearestE(const TopTools_ListOfShape& loe,
   Standard_Real fac = 0.45678;
   Standard_Real tola = Precision::Angular();
   Standard_Integer iv0e1 = (iStep == 1) ? REVERSED : FORWARD;
-#ifdef DEB
-  Standard_Integer iv1e1 = (iStep == 1) ? FORWARD : REVERSED;
-#endif
 
   // initializing 
   TopTools_ListIteratorOfListOfShape ite(loe);
@@ -570,9 +559,6 @@ Standard_Boolean TopOpeBRepTool_REGUW::NearestE(const TopTools_ListOfShape& loe,
     if (trc) cout<<"ang(e"<<FUN_adds(myed)<<",e"<<FUN_adds(ei)<<")="<<angi<<endl;
 #endif
     if (eq) {
-#ifdef DEB
-      Standard_Boolean dummy=Standard_True;//DEB
-#endif
       FUN_Raise(); 
       return Standard_False;
     }
@@ -645,18 +631,11 @@ Standard_Boolean TopOpeBRepTool_REGUW::NextinBlock()
     myed = efound;
   }
 
-#ifdef DEB
-  TopOpeBRepTool_connexity& newco =
-#endif
-                mymapvEds.ChangeFromKey(myv);
+  mymapvEds.ChangeFromKey(myv);
   TopExp_Explorer exv(myed, TopAbs_VERTEX);
   for (; exv.More(); exv.Next()){
     TopOpeBRepTool_connexity& cco = mymapvEds.ChangeFromKey(exv.Current());
-#ifdef DEB
-    Standard_Boolean ok =
-#endif
-             cco.RemoveItem(myed);
-//    if (!ok) {FUN_Raise(); return Standard_False;} closed edges
+    cco.RemoveItem(myed);
   }
 
   TopOpeBRepTool_C2DF c2df; myCORRISO.UVRep(myed,c2df);
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_RegularizeW.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_RegularizeW.cxx
index 1db72f7..6ae6baf 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_RegularizeW.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_RegularizeW.cxx
@@ -626,10 +626,6 @@ Standard_EXPORT Standard_Boolean FUN_tool_ClassifW(const TopoDS_Face& F,
   // noldW = 1
   // ---------
   if (noldW == 1) {
-#ifdef DEB
-    const TopoDS_Shape& owi =
-#endif  
-                     itm.Key(); // DEB
     const TopTools_ListOfShape& low = itm.Value();
     Standard_Boolean ok = CLASSI.Classilist(low,mapWlow);
     if (!ok) return Standard_False;
@@ -662,10 +658,6 @@ Standard_EXPORT Standard_Boolean FUN_tool_ClassifW(const TopoDS_Face& F,
     if (!isb1) continue; 
 
     const TopTools_ListOfShape& lw1 = mapOwNw.Find(Ow1);
-#ifdef DEB
-    Standard_Integer nw1 =
-#endif
-              lw1.Extent();
     if (nOw == 1) { 
       // all wires of <mapWs> have been treated, except the last one
       // if (nw1 == 0) mapWlow binds already (Ow1,null); 
@@ -706,10 +698,6 @@ Standard_EXPORT Standard_Boolean FUN_tool_ClassifW(const TopoDS_Face& F,
 		cout<<endl;}
 #endif
       const TopTools_ListOfShape& lw2 = mapOwNw.Find(Ow2);
-#ifdef DEB
-      Standard_Integer nw2 =
-#endif
-                lw2.Extent();
      
       TopTools_ListOfShape lw1r; FUN_addOwlw(Ow1,lw1,lw1r);
       TopTools_ListOfShape lw2r; FUN_addOwlw(Ow2,lw2,lw2r);
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_ShapeClassifier.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_ShapeClassifier.cxx
index 52e8aaf..e3e44d9 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_ShapeClassifier.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_ShapeClassifier.cxx
@@ -556,10 +556,6 @@ void TopOpeBRepTool_ShapeClassifier::StateP2DReference
       myP2Ddef = Standard_True;
       TopoDS_Face F = TopoDS::Face(myRef);
       F.Orientation(TopAbs_FORWARD);
-#ifdef DEB
-      Standard_Real tol2d =
-#endif
-                  Precision::PConfusion();
       Standard_Real  TolClass  = 1e-8;
       BRepTopAdaptor_FClass2d FClass2d(F,TolClass);
       myState = FClass2d.Perform(P2D);
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_ShapeTool.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_ShapeTool.cxx
index 78ab303..ae1aa8e 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_ShapeTool.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_ShapeTool.cxx
@@ -192,19 +192,11 @@ void TopOpeBRepTool_ShapeTool::AdjustOnPeriodic(const TopoDS_Shape& F,
 
   if (isUperio) {
     Standard_Real Uperiod = Surf->UPeriod();
-#ifdef DEB
-    Standard_Real ubid = UFfirst;
-#endif
-//    ElCLib::AdjustPeriodic(UFfirst,UFfirst + Uperiod,tol,ubid,u);
     if (Abs(u - UFfirst-Uperiod) > tol)
       u = ElCLib::InPeriod(u,UFfirst,UFfirst + Uperiod);
   }
   if (isVperio) {
     Standard_Real Vperiod = Surf->VPeriod();
-#ifdef DEB
-    Standard_Real vbid = VFfirst;
-#endif
-//    ElCLib::AdjustPeriodic(VFfirst,VFfirst + Vperiod,tol,vbid,v);
     if (Abs(v - VFfirst-Vperiod) > tol)
       v = ElCLib::InPeriod(v,VFfirst,VFfirst + Vperiod);
   }
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_TOOL.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_TOOL.cxx
index 4d484c5..fa8be37 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_TOOL.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_TOOL.cxx
@@ -494,14 +494,6 @@ Standard_Boolean TopOpeBRepTool_TOOL::TgINSIDE(const TopoDS_Vertex& v, const Top
 Standard_Boolean TopOpeBRepTool_TOOL::TggeomE(const Standard_Real par, const BRepAdaptor_Curve& BC, 
 				 gp_Vec& Tg)
 {
-#ifdef DEB
-  GeomAbs_CurveType ct =
-#endif
-                         BC.GetType();
-#ifdef DEB
-  Standard_Boolean apoles = (ct == GeomAbs_BezierCurve)||(ct == GeomAbs_BSplineCurve);
-#endif
-  
   Standard_Real f = BC.FirstParameter(), l = BC.LastParameter();
   Standard_Real tolE = BC.Tolerance(); Standard_Real tolp = BC.Resolution(tolE);
   
@@ -510,7 +502,6 @@ Standard_Boolean TopOpeBRepTool_TOOL::TggeomE(const Standard_Real par, const BRe
 
   if ((!inbounds) && (!onf) && (!onl)) return Standard_False;
   Standard_Real thepar = par;
-//  if (apoles && (onf || onl)) thepar = onf ? (thepar+tolp) : (thepar-tolp);
 
   gp_Pnt thepnt; BC.D1(thepar, thepnt, Tg);
   Tg.Normalize(); 
@@ -948,10 +939,7 @@ Standard_Boolean TopOpeBRepTool_TOOL::UVISO(const TopoDS_Edge& E, const TopoDS_F
   //  Standard_Real f,l,tol; Handle(Geom2d_Curve) PC = FC2D_CurveOnSurface(E,F,f,l,tol);
   Handle(Geom2d_Curve) PC; Standard_Real f,l,tol;
   Standard_Boolean hasold = FC2D_HasOldCurveOnSurface(E,F,PC);
-#ifdef DEB
-  Standard_Boolean hasnew =
-#endif
-               FC2D_HasNewCurveOnSurface(E,F,PC);
+  FC2D_HasNewCurveOnSurface(E,F,PC);
   PC = FC2D_EditableCurveOnSurface(E,F,f,l,tol);
   if (!hasold) FC2D_AddNewCurveOnSurface(PC,E,F,f,l,tol);
   
@@ -1117,17 +1105,10 @@ Standard_Boolean TopOpeBRepTool_TOOL::Getduv(const TopoDS_Face& f,const gp_Pnt2d
   Bnd_Box bndf; BRepBndLib::AddClose(f,bndf);
   Standard_Real f1,f2,f3,l1,l2,l3; bndf.Get(f1,f2,f3,l1,l2,l3);
   gp_Vec d123(f1-l1, f2-l2, f3-l3);
-#ifdef DEB
-  Standard_Real dmax =
-#endif
-             d123.Dot(dir);
 
   gp_Pnt p; FUN_tool_value(uv,f,p); p.Translate(dir.Multiplied(factor));
   Standard_Real d; gp_Pnt2d uvtr;
-#ifdef DEB
-  Standard_Boolean ok =
-#endif
-           FUN_tool_projPonF(p,f, uvtr,d);
+  FUN_tool_projPonF(p,f, uvtr,d);
   Standard_Real tolf = BRep_Tool::Tolerance(f); tolf *= 1.e2; //NYIXPUTOL
   if (d > tolf) return Standard_False;
 
@@ -1340,9 +1321,6 @@ Standard_Boolean TopOpeBRepTool_TOOL::MatterKPtg(const TopoDS_Face& f1,const Top
   Standard_Real x = 0.45678; Standard_Real pare = (1-x)*f+x*l;
 
   Standard_Real eps = 0.123; //NYIXPU190199
-#ifdef DEB
-  Standard_Real tola = Precision::Angular()*1.e3;
-#endif
 
   gp_Pnt2d uv1; FUN_tool_paronEF(e,pare,f1,uv1);
   gp_Dir nt1; Standard_Boolean ok1 = TopOpeBRepTool_TOOL::Nt(uv1,f1,nt1);
@@ -1359,20 +1337,6 @@ Standard_Boolean TopOpeBRepTool_TOOL::MatterKPtg(const TopoDS_Face& f1,const Top
   Standard_Real dot = v12.Dot(nt1);
   ang = (dot < 0.) ? 0. : 2.*PI;
 
-//  gp_Dir nt1; ok1 = TopOpeBRepTool_TOOL::Nt(uv1,f1,nt1);
-//  if (!ok1) return Standard_False;
-//  gp_Dir xx1; ok1 = TopOpeBRepTool_TOOL::XX(uv1,f1,pare,e,xx1);
-//  if (!ok1) return Standard_False;    
-//  gp_Pnt2d uv2; Standard_Boolean ok2 = TopOpeBRepTool_TOOL::uvApp(f2,e,pare,eps,uv2);
-//  if (!ok2) return Standard_False;
-//  gp_Dir nt2; ok2 = TopOpeBRepTool_TOOL::Nt(uv2,f2,nt2);
-//  if (!ok2) return Standard_False;
-//  gp_Dir xx2; ok2 = TopOpeBRepTool_TOOL::XX(uv2,f2,pare,e,xx2);
-//  if (!ok2) return Standard_False;  
-//  Standard_Real angapp; Standard_Boolean ok = TopOpeBRepTool_TOOL::Matter(xx1,nt1, xx2,nt2,tola,angapp);
-//  if (!ok) return Standard_False;
-//  Standard_Boolean is0 = (Abs(angapp) < Abs(2.*PI-angapp));
-//  ang = is0 ? 0. : 2.*PI;
   return Standard_True;
 }
 
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_TOPOLOGY.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_TOPOLOGY.cxx
index 01830c3..626650a 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_TOPOLOGY.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_TOPOLOGY.cxx
@@ -129,10 +129,7 @@ Standard_EXPORT Standard_Boolean FUN_tool_isobounds(const TopoDS_Shape& Sh,
   if (S.IsNull()) return Standard_False;
 
   Standard_Boolean uclosed,vclosed; Standard_Real uperiod,vperiod; 
-#ifdef DEB
-  Standard_Boolean uvclosed =
-#endif
-                 FUN_tool_closedS(F,uclosed,uperiod,vclosed,vperiod);
+  FUN_tool_closedS(F,uclosed,uperiod,vclosed,vperiod);
 
 //  Standard_Real uf,ul,vf,vl; S->Bounds(uf,ul,vf,vl);
 
@@ -174,10 +171,7 @@ Standard_EXPORT Standard_Boolean FUN_tool_outbounds(const TopoDS_Shape& Sh,
 
   const TopoDS_Face& F = TopoDS::Face(Sh);
   Standard_Boolean uclosed,vclosed; Standard_Real uperiod,vperiod; 
-#ifdef DEB
-  Standard_Boolean uvclosed =
-#endif
-                 FUN_tool_closedS(F,uclosed,uperiod,vclosed,vperiod);
+  FUN_tool_closedS(F,uclosed,uperiod,vclosed,vperiod);
   Standard_Real tolp = 1.e-6;
   
   if (uclosed) {
@@ -302,9 +296,6 @@ Standard_EXPORT Standard_Boolean FUN_tool_orientEinF(const TopoDS_Edge& E,const
   TopExp_Explorer e(F,TopAbs_EDGE);
   for (;e.More();e.Next()) {
     const TopoDS_Shape& EF = e.Current(); 
-#ifdef DEB
-    Standard_Boolean b = EF.IsSame(E);
-#endif
     if (EF.IsSame(E)) { 
       oriEinF=EF.Orientation();
       break;
@@ -884,10 +875,7 @@ Standard_EXPORT Standard_Real FUN_tool_maxtol(const TopoDS_Shape& S)
 	TopExp_Explorer exe(S,TopAbs_FACE);
 	for (; exe.More(); exe.Next()){
 	  const TopoDS_Shape& ee = exe.Current();
-#ifdef DEB
-	  Standard_Boolean hasvertex =
-#endif
-                          FUN_tool_maxtol(ee,TopAbs_VERTEX,maxtol);
+      FUN_tool_maxtol(ee,TopAbs_VERTEX,maxtol);
 	}
       }
     }
@@ -898,17 +886,11 @@ Standard_EXPORT Standard_Real FUN_tool_maxtol(const TopoDS_Shape& S)
       TopExp_Explorer exe(S,TopAbs_FACE);
       for (; exe.More(); exe.Next()){
 	const TopoDS_Shape& ee = exe.Current();
-#ifdef DEB
-	Standard_Boolean hasvertex =
-#endif
-                        FUN_tool_maxtol(ee,TopAbs_VERTEX,maxtol);
+    FUN_tool_maxtol(ee,TopAbs_VERTEX,maxtol);
       }
     }
     if (!hasedge) {
-#ifdef DEB
-      Standard_Boolean hasvertex =
-#endif
-                      FUN_tool_maxtol(S,TopAbs_VERTEX,maxtol);
+      FUN_tool_maxtol(S,TopAbs_VERTEX,maxtol);
     }
   }
   return maxtol;
@@ -1044,18 +1026,7 @@ Standard_EXPORT Standard_Boolean FUN_tool_pcurveonF(const TopoDS_Face& fF,TopoDS
       
       Standard_Real tole = BRep_Tool::Tolerance(e);
       TopoDS_Vertex vf,vl; TopExp::Vertices(e,vf,vl);
-#ifdef DEB
-      Standard_Real parf  =
-#endif
-                  BRep_Tool::Parameter(vf,e);
-#ifdef DEB
-      Standard_Real parl  =
-#endif
-                  BRep_Tool::Parameter(vl,e);
       TopoDS_Edge newe = faultyE;
-//      TopoDS_Edge newe; FUN_ds_CopyEdge(e,newe); newe.Orientation(TopAbs_FORWARD);
-//      vf.Orientation(TopAbs_FORWARD);  BB.Add(newe,vf); FUN_ds_Parameter(newe,vf,parf); 
-//      vl.Orientation(TopAbs_REVERSED); BB.Add(newe,vl); FUN_ds_Parameter(newe,vl,parl);
       BB.UpdateEdge(newe,C2d,fF,tole);
       newe.Orientation(e.Orientation());
       loe.Append(newe);  
@@ -1232,10 +1203,7 @@ Standard_EXPORT Standard_Boolean FUN_tool_getEclo(const TopoDS_Face& F, const St
     if (clo) {
       Standard_Boolean isou,isov; gp_Pnt2d o2d; gp_Dir2d d2d; 
       Standard_Real f,l,tol; Handle(Geom2d_Curve) PC = FC2D_CurveOnSurface(E,F,f,l,tol);
-#ifdef DEB
-      Standard_Boolean isouv =
-#endif
-                  TopOpeBRepTool_TOOL::UVISO(PC,isou,isov,d2d,o2d); 
+      TopOpeBRepTool_TOOL::UVISO(PC,isou,isov,d2d,o2d); 
       if (UISO && isou) {
 	Eclo=E; 
 	return Standard_True;
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_closing.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_closing.cxx
index 4672ca3..4861f75 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_closing.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_closing.cxx
@@ -76,28 +76,16 @@ Standard_EXPORT Standard_Boolean FUN_tool_correctCLO(TopoDS_Edge& E, const TopoD
 //  Standard_Real f,l,tolpc; Standard_Boolean trim3d = Standard_True; 
 //  Handle(Geom2d_Curve) PC = FC2D_CurveOnSurface(E,F,f,l,tolpc,trim3d);  
   Standard_Real f,l,tol; Handle(Geom2d_Curve) PC;
-#ifdef DEB
-  Standard_Boolean hasold =
-#endif
-               FC2D_HasOldCurveOnSurface(E,FFOR,PC);
-#ifdef DEB
-  Standard_Boolean hasnew =
-#endif
-               FC2D_HasNewCurveOnSurface(E,FFOR,PC);
+  FC2D_HasOldCurveOnSurface(E,FFOR,PC);
+  FC2D_HasNewCurveOnSurface(E,FFOR,PC);
   PC = FC2D_EditableCurveOnSurface(E,FFOR,f,l,tol);  
 
   Standard_Boolean isoU,isoV; gp_Pnt2d o2d; gp_Dir2d d2d; 
-#ifdef DEB
-  Standard_Boolean ISO =
-#endif
-            TopOpeBRepTool_TOOL::UVISO(PC,isoU,isoV,d2d,o2d);
+  TopOpeBRepTool_TOOL::UVISO(PC,isoU,isoV,d2d,o2d);
   Standard_Boolean xiso = (inU && isoU)||((!inU) && isoV);
   if (!xiso) return Standard_False;      
   Standard_Real par = dx*f + (1-dx)*l; gp_Vec2d dxx;
-#ifdef DEB
-  Standard_Boolean ok =
-#endif
-           FUN_tool_getdxx(FFOR,E,par,dxx);
+  FUN_tool_getdxx(FFOR,E,par,dxx);
 
   TopExp_Explorer ex(FFOR, TopAbs_EDGE);
   for (; ex.More(); ex.Next()){    
@@ -107,28 +95,16 @@ Standard_EXPORT Standard_Boolean FUN_tool_correctCLO(TopoDS_Edge& E, const TopoD
 
 //    Standard_Real f1,l1; Handle(Geom2d_Curve) PC1 = BRep_Tool::CurveOnSurface(e1,F,f1,l1);  
     Standard_Real f1,l1,tol1; Handle(Geom2d_Curve) PC1;
-#ifdef DEB
-    Standard_Boolean hasold1 =
-#endif
-                  FC2D_HasOldCurveOnSurface(e1,FFOR,PC1);
-#ifdef DEB
-    Standard_Boolean hasnew1 =
-#endif
-                  FC2D_HasNewCurveOnSurface(e1,FFOR,PC1);
+    FC2D_HasOldCurveOnSurface(e1,FFOR,PC1);
+    FC2D_HasNewCurveOnSurface(e1,FFOR,PC1);
     PC1 = FC2D_EditableCurveOnSurface(e1,FFOR,f1,l1,tol1);
 
     Standard_Boolean isoU1,isoV1; gp_Pnt2d o2d1; gp_Dir2d d2d1; 
-#ifdef DEB
-    Standard_Boolean ISO1 =
-#endif
-               TopOpeBRepTool_TOOL::UVISO(PC1,isoU1,isoV1,d2d1,o2d1);
+    TopOpeBRepTool_TOOL::UVISO(PC1,isoU1,isoV1,d2d1,o2d1);
 
     // 2d(e1,FFOR) and 2d(E,FFOR) describe the same side of matter 
     Standard_Real par1 = dx*f1 + (1-dx)*l1; gp_Vec2d dxx1;
-#ifdef DEB
-    Standard_Boolean ok1 =
-#endif
-              FUN_tool_getdxx(FFOR,e1,par1,dxx1);
+    FUN_tool_getdxx(FFOR,e1,par1,dxx1);
     Standard_Real dot = dxx.Dot(dxx1);
     if (dot < 0.) continue;
 
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_connexity.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_connexity.cxx
index 5311543..c402adf 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_connexity.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_connexity.cxx
@@ -198,10 +198,6 @@ Standard_Integer TopOpeBRepTool_connexity::IsInternal(TopTools_ListOfShape& Item
 
   // all subshapes of INTERNAL(EXTERNAL) are oriented INTERNAL(EXTERNAL)
   TopTools_ListOfShape lINT; lINT.Assign(theItems.Value(INTERNAL));
-#ifdef DEB
-  Standard_Integer n1 =
-#endif
-           lINT.Extent();
   TopTools_ListIteratorOfListOfShape it1(lINT);
   while (it1.More()) {
     const TopoDS_Shape& item1 = it1.Value();
@@ -213,10 +209,6 @@ Standard_Integer TopOpeBRepTool_connexity::IsInternal(TopTools_ListOfShape& Item
   }
 
   TopTools_ListOfShape lEXT; lEXT.Assign(theItems.Value(EXTERNAL));
-#ifdef DEB
-  Standard_Integer n2 =
-#endif
-           lEXT.Extent();
   TopTools_ListIteratorOfListOfShape it2(lEXT);
   while (it2.More()) {
     const TopoDS_Shape& item2 = it2.Value();
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_mkTondgE.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_mkTondgE.cxx
index e2cb37d..d9852f4 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_mkTondgE.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_mkTondgE.cxx
@@ -149,10 +149,7 @@ Standard_Integer TopOpeBRepTool_mkTondgE::GetAllRest(TopTools_ListOfShape& lEi)
     if (!ok) continue;
 
     Standard_Real parei;
-#ifdef DEB
-    Standard_Boolean oki =
-#endif
-              TopOpeBRepTool_TOOL::ParISO(myuvi,ei,myFi, parei);
+    TopOpeBRepTool_TOOL::ParISO(myuvi,ei,myFi, parei);
     myEpari.Bind(ei,parei);
     lEi.Append(ei);
   }
diff --git a/src/V3d/V3d_View.cxx b/src/V3d/V3d_View.cxx
index 986f096..77a3333 100644
--- a/src/V3d/V3d_View.cxx
+++ b/src/V3d/V3d_View.cxx
@@ -1247,10 +1247,6 @@ void V3d_View::SetDepth(const Standard_Real Depth) {
   Viewer_BadValue_Raise_if( Depth <= 0. ,"V3d_View::SetDepth, bad depth");
 #endif
 
-#ifdef DEB
-  Standard_Real twist =
-#endif
-    Twist();
   MyViewReferencePoint = MyViewOrientation.ViewReferencePoint() ;
   MyViewReferencePlane = MyViewOrientation.ViewReferencePlane() ;
   MyProjReferencePoint = MyViewMapping.ProjectionReferencePoint() ;
diff --git a/src/V3d/V3d_View_3.cxx b/src/V3d/V3d_View_3.cxx
index fda388d..8b48ee7 100644
--- a/src/V3d/V3d_View_3.cxx
+++ b/src/V3d/V3d_View_3.cxx
@@ -55,10 +55,6 @@ void V3d_View::Move(const Standard_Real Dx, const Standard_Real Dy, const Standa
   Zeye = Zrp*Zpn + Dx*XZ + Dy*YZ + Dz*ZZ ;
   Zrp = sqrt( Xeye*Xeye + Yeye*Yeye + Zeye*Zeye ) ;
   Viewer_BadValue_Raise_if( Zrp <= 0. ,"V3d_View::Move:: Eye,At are Confused");
-#ifdef DEB
-  Standard_Real focale = 
-#endif
-    Focale();
   Prp.SetCoord(Xrp,Yrp,Zrp) ;
   MyViewMapping.SetProjectionReferencePoint(Prp) ;
   Xpn = Xeye / Zrp ; Ypn = Yeye / Zrp ; Zpn = Zeye / Zrp ;
@@ -107,10 +103,6 @@ void V3d_View::Move(const Standard_Real Length, const Standard_Boolean Start) {
   Zrp = sqrt( Xeye*Xeye + Yeye*Yeye + Zeye*Zeye ) ;
   Viewer_BadValue_Raise_if( Zrp <= 0. ,"V3d_View::Move:: Eye,At are Confused");
   
-#ifdef DEB
-  Standard_Real focale = 
-#endif
-    Focale();
   Prp.SetCoord(Xrp,Yrp,Zrp) ;
   MyViewMapping.SetProjectionReferencePoint(Prp) ;
   Xpn = Xeye / Zrp ; Ypn = Yeye / Zrp ; Zpn = Zeye / Zrp ;
diff --git a/src/ViewerTest/ViewerTest.cxx b/src/ViewerTest/ViewerTest.cxx
index 4d2a7a5..8abc127 100644
--- a/src/ViewerTest/ViewerTest.cxx
+++ b/src/ViewerTest/ViewerTest.cxx
@@ -671,12 +671,6 @@ Handle(AIS_InteractiveObject) DetectedFromContext(
       Handle(AIS_InteractiveObject) aisPickedShape =
 	Handle(AIS_InteractiveObject)::DownCast(aContext->DetectedInteractive());
       ret = aisPickedShape;
-#ifdef DEB
-      const char *name =
-#endif
-                   (  GetMapOfAIS().IsBound1(aisPickedShape) )?
-	GetMapOfAIS().Find1(aisPickedShape).ToCString() :
-	 (char *)  "????";
     }
   }
   return ret;
diff --git a/src/ViewerTest/ViewerTest_FilletCommands.cxx b/src/ViewerTest/ViewerTest_FilletCommands.cxx
index 718a6c0..6141604 100644
--- a/src/ViewerTest/ViewerTest_FilletCommands.cxx
+++ b/src/ViewerTest/ViewerTest_FilletCommands.cxx
@@ -63,10 +63,6 @@ static Standard_Real tapp_angle = 1.e-2;
 static GeomAbs_Shape blend_cont = GeomAbs_C1;
 
 static BRepFilletAPI_MakeFillet* Rakk = 0;
-#ifdef DEB
-static BRepFilletAPI_MakeFillet* Rake = 0;
-static char name[100];
-#endif
 
 
 static void printtolblend(Draw_Interpretor& di)
@@ -105,9 +101,6 @@ static Standard_Integer VBLEND(Draw_Interpretor& di, Standard_Integer narg, cons
   if (narg<5) return 1;
   
   Standard_Integer NbToPick = (narg -4)/2;
-#ifdef DEB
-  Standard_Boolean autonaming = !strcasecmp(a[3],".");
-#endif
   Handle(TopTools_HArray1OfShape) arr = new TopTools_HArray1OfShape(1,NbToPick);
   if(ViewerTest::PickShapes(TopAbs_EDGE,arr)){
     for(Standard_Integer i=1;i<=NbToPick;i++){
diff --git a/src/Visual3d/Visual3d_View.cxx b/src/Visual3d/Visual3d_View.cxx
index da2cce1..aad6e2b 100644
--- a/src/Visual3d/Visual3d_View.cxx
+++ b/src/Visual3d/Visual3d_View.cxx
@@ -2191,8 +2191,6 @@ Standard_Integer Index = IsComputed (AStructure);
                   cout << flush;
                 }
 #endif
-Standard_Integer OldStructId =
-        MyCOMPUTEDSequence.Value (Index)->Identification ();
 
                 // Case COMPUTED valide
                 if (MyCOMPUTEDSequence.Value (Index)->HLRValidation ()) {
@@ -2224,8 +2222,6 @@ Standard_Integer OldStructId =
                         if (! IsDisplayed (AStructure)) {
                             MyCOMPUTEDSequence.SetValue
                                 (Index, MyCOMPUTEDSequence.Value (NewIndex));
-                            OldStructId = MyCOMPUTEDSequence.Value (NewIndex)->
-                                                        Identification ();
                             MyDisplayedStructure.Add (AStructure);
                             MyGraphicDriver->DisplayStructure (
                                 MyCView,
@@ -2375,8 +2371,6 @@ void Visual3d_View::Erase (const Handle(Graphic3d_Structure)& AStructure) {
 
 void Visual3d_View::Erase (const Handle(Graphic3d_Structure)& AStructure, const Aspect_TypeOfUpdate AnUpdateMode) {
 
-Standard_Integer StructId;
-
         if (IsDeleted ()) return;
 
         // No test on window as the structure is displayed only if 
@@ -2414,9 +2408,9 @@ Standard_Integer Index = IsComputed (AStructure);
                     if ((Index != 0) && (! DegenerateModeIsOn ()))
 #endif  // G003
                     {
-                        StructId =
-                        MyCOMPUTEDSequence.Value (Index)->Identification ();
 #ifdef TRACE_COMP
+                        Standard_Integer StructId =
+                        MyCOMPUTEDSequence.Value (Index)->Identification ();
         cout << "Structure " << AStructure->Identification ()
              << " calculated, in the view "
              << Identification () << ", by the structure "
@@ -3143,10 +3137,10 @@ Standard_Integer Index = IsComputed (AStructure);
 #endif
                 }
                 else {
-		  Standard_Integer OldStructId, NewStructId;
+#ifdef TRACE_COMP
+		  Standard_Integer OldStructId;
                         OldStructId =
                         MyCOMPUTEDSequence.Value (Index)->Identification ();
-#ifdef TRACE_COMP
 	Standard_Integer StructId = AStructure->Identification ();
         cout << "Structure " << StructId
              << " calculated, in the view "
@@ -3212,7 +3206,6 @@ Standard_Boolean ComputeShading = ((ViewType == Visual3d_TOV_SHADING) &&
                         // Ot is ranged
                         // Find structure <AStructure>
                         // in the sequence of structures to be calculated.
-                        NewStructId = TheStructure->Identification ();
 
                         // The previous calculation is removed and the new one is dislayed
                         MyGraphicDriver->EraseStructure (
diff --git a/src/Visual3d/Visual3d_ViewManager.cxx b/src/Visual3d/Visual3d_ViewManager.cxx
index dacd11e..dc9d337 100644
--- a/src/Visual3d/Visual3d_ViewManager.cxx
+++ b/src/Visual3d/Visual3d_ViewManager.cxx
@@ -110,11 +110,6 @@ void Visual3d_ViewManager::Remove () {
 	//
 	// Destroy all defined views
 	//
-#ifdef DEB
-	Standard_Integer Length = MyDefinedView.Extent ();
-#else
-        MyDefinedView.Extent ();
-#endif
 
 #ifdef DESTROY
 	cout << "The Manager " << MyId << " have " << Length << " defined views\n";
@@ -137,11 +132,6 @@ void Visual3d_ViewManager::ChangeDisplayPriority (const Handle(Graphic3d_Structu
 	//
 	// Change structure priority in all defined views
 	//
-#ifdef DEB
-	Standard_Integer Length = MyDefinedView.Extent ();
-#else
-        MyDefinedView.Extent ();
-#endif
 	Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView);
  
 	while (MyIterator.More ()) {
@@ -216,11 +206,6 @@ void Visual3d_ViewManager::ReCompute (const Handle(Graphic3d_Structure)& AStruct
 
 void Visual3d_ViewManager::Clear (const Handle(Graphic3d_Structure)& AStructure, const Standard_Boolean WithDestruction) {
 
-#ifdef DEB
-	Standard_Integer Length = MyDefinedView.Extent ();
-#else
-        MyDefinedView.Extent ();
-#endif
 	Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView);
  
 	while (MyIterator.More ()) {
@@ -234,11 +219,6 @@ void Visual3d_ViewManager::Clear (const Handle(Graphic3d_Structure)& AStructure,
 
 void Visual3d_ViewManager::Connect (const Handle(Graphic3d_Structure)& AMother, const Handle(Graphic3d_Structure)& ADaughter) {
 
-#ifdef DEB
-	Standard_Integer Length = MyDefinedView.Extent ();
-#else
-        MyDefinedView.Extent ();
-#endif
 	Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView);
  
 	while (MyIterator.More ()) {
@@ -252,11 +232,6 @@ void Visual3d_ViewManager::Connect (const Handle(Graphic3d_Structure)& AMother,
 
 void Visual3d_ViewManager::Disconnect (const Handle(Graphic3d_Structure)& AMother, const Handle(Graphic3d_Structure)& ADaughter) {
 
-#ifdef DEB
-	Standard_Integer Length = MyDefinedView.Extent ();
-#else
-        MyDefinedView.Extent ();
-#endif
 	Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView);
  
 	while (MyIterator.More ()) {
@@ -305,11 +280,6 @@ void Visual3d_ViewManager::Erase (const Handle(Graphic3d_Structure)& AStructure)
 	//
 	// Erase structure in all defined views
 	//
-#ifdef DEB
-	Standard_Integer Length = MyDefinedView.Extent ();
-#else
-        MyDefinedView.Extent ();
-#endif
 	Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView);
  
 	while (MyIterator.More ()) {
@@ -343,11 +313,6 @@ void Visual3d_ViewManager::Highlight (const Handle(Graphic3d_Structure)& AStruct
 	//
 	// Highlight in all activated views
 	//
-#ifdef DEB
-	Standard_Integer Length = MyDefinedView.Extent ();
-#else
-        MyDefinedView.Extent ();
-#endif
 	Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView);
  
 	while (MyIterator.More ()) {
@@ -361,11 +326,6 @@ void Visual3d_ViewManager::Highlight (const Handle(Graphic3d_Structure)& AStruct
 
 void Visual3d_ViewManager::SetTransform (const Handle(Graphic3d_Structure)& AStructure, const TColStd_Array2OfReal& ATrsf) {
 
-#ifdef DEB
-	Standard_Integer Length = MyDefinedView.Extent ();
-#else
-        MyDefinedView.Extent ();
-#endif
 	Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView);
  
 	while (MyIterator.More ()) {
@@ -397,11 +357,6 @@ void Visual3d_ViewManager::UnHighlight (const Handle(Graphic3d_Structure)& AStru
 	//
 	// UnHighlight in all activated views
 	//
-#ifdef DEB
-	Standard_Integer Length = MyDefinedView.Extent ();
-#else
-        MyDefinedView.Extent ();
-#endif
 	Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView);
  
 	while (MyIterator.More ()) {
@@ -474,11 +429,6 @@ Handle(Visual3d_HSetOfView) Visual3d_ViewManager::ActivatedView () const {
 
 Handle (Visual3d_HSetOfView) SG = new Visual3d_HSetOfView ();
 
-#ifdef DEB
-	Standard_Integer Length = MyDefinedView.Extent ();
-#else
-        MyDefinedView.Extent ();
-#endif
 Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView);
 
 	while (MyIterator.More ()) {
@@ -572,11 +522,6 @@ Standard_Real Dx, Dy, Ratio;
       Standard_Real APT;
 
       Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView);
-#ifdef DEB
-      Standard_Integer Length = MyDefinedView.Extent ();
-#else
-      MyDefinedView.Extent ();
-#endif
 
       Standard_Integer stop = 0;
 
@@ -1166,12 +1111,6 @@ void Visual3d_ViewManager::Activate () {
 	//
 	Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView);
  
-#ifdef DEB
-	Standard_Integer Length = MyDefinedView.Extent ();
-#else
-        MyDefinedView.Extent ();
-#endif
-
 	while (MyIterator.More ()) {
 		if (! (MyIterator.Value ())->IsActive ())
 			(MyIterator.Value ())->Activate ();
@@ -1187,11 +1126,6 @@ void Visual3d_ViewManager::Deactivate () {
 	//
 	// Deactivates all activated views
 	//
-#ifdef DEB
-	Standard_Integer Length = MyDefinedView.Extent ();
-#else
-        MyDefinedView.Extent ();
-#endif
 	Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView);
  
 	while (MyIterator.More ()) {
diff --git a/src/XSDRAW/XSDRAW.cxx b/src/XSDRAW/XSDRAW.cxx
index c7e5708..1befeb4 100644
--- a/src/XSDRAW/XSDRAW.cxx
+++ b/src/XSDRAW/XSDRAW.cxx
@@ -118,10 +118,7 @@ void XSDRAW::LoadDraw (Draw_Interpretor& theCommands)
 {
   char mess[100];
   sprintf (mess,command,varname);
-#ifdef DEB
-  IFSelect_ReturnStatus stat = 
-#endif
-    thepilot->Execute (mess);
+  thepilot->Execute (mess);
   return 1;  // stat ?
 }
 
diff --git a/src/Xw/Xw_Driver.cxx b/src/Xw/Xw_Driver.cxx
index 4cfc6f4..6c468e1 100644
--- a/src/Xw/Xw_Driver.cxx
+++ b/src/Xw/Xw_Driver.cxx
@@ -110,12 +110,17 @@ union {
 }
 
 void Xw_Driver::PrintError() {
+#ifndef PRO12934
 Standard_CString ErrorMessag ;
+#endif
 Standard_Integer ErrorNumber ;
 Standard_Integer ErrorGravity ;
  
         status = XW_SUCCESS ;
-        ErrorMessag = Xw_get_error(&ErrorNumber,&ErrorGravity) ;
+#ifndef PRO12934
+        ErrorMessag = 
+#endif
+          Xw_get_error(&ErrorNumber,&ErrorGravity) ;
 #ifdef PRO12934
         Xw_print_error() ;
 #else
diff --git a/src/Xw/Xw_load_icons.cxx b/src/Xw/Xw_load_icons.cxx
index ee1c1cd..bc5ba29 100644
--- a/src/Xw/Xw_load_icons.cxx
+++ b/src/Xw/Xw_load_icons.cxx
@@ -863,7 +863,6 @@ char *dirname;
 {
 XW_EXT_WINDOW *pwindow = (XW_EXT_WINDOW*)awindow ;
 XW_EXT_ICON *piconinfo,*qiconinfo ;
-int status ;
 FILE *ficon = NULL;
 char *pname,filename[256],iconname[80],lf ;
 //int n,f,skip,nicons = 0 ;
@@ -893,13 +892,13 @@ int skip,nicons = 0 ;
 					/* READ Icon File Directory */
 	while( !feof(ficon) ) {
 	    skip = False ;
-	    status = fscanf(ficon,"%s%c",filename,&lf) ;
+	    fscanf(ficon,"%s%c",filename,&lf) ;
 	    if( filename[0] == '#' ) {
-		while( lf != '\n' ) status = fscanf(ficon,"%c",&lf) ;
+		while( lf != '\n' ) fscanf(ficon,"%c",&lf) ;
 		skip = True ;
 	    } else if( lf != '\n' ) {
-	        status = fscanf(ficon,"%s%c",iconname,&lf) ;
-	        while( lf != '\n' ) status = fscanf(ficon,"%c",&lf) ;
+	        fscanf(ficon,"%s%c",iconname,&lf) ;
+	        while( lf != '\n' ) fscanf(ficon,"%c",&lf) ;
 	        if( iconname[0] == '#' ) {
 		  fprintf(stderr,"*Xw_load_icons*Unimplemented Default Icon Name %s\n",
 								filename);
@@ -961,7 +960,6 @@ int iwidth = pximage->width ;
 int iheight = pximage->height ;
 int wx,wy,ix,iy ;
 int error,gravity ;
-char *serror;
 
  	if( width == 0 ) width = iwidth ;
 	wx = (width - iwidth)/2 ; ix = 0 ;
@@ -980,7 +978,7 @@ char *serror;
 	pixmap = XCreatePixmap(_DISPLAY,_WINDOW,width,height,_DEPTH) ;
 	if( !Xw_get_trace() ) Xw_set_synchronize(_DISPLAY,False) ;
 
-        serror = Xw_get_error(&error,&gravity);
+        Xw_get_error(&error,&gravity);
         if( !pixmap || (error > 1000) ) {
           Xw_set_error(104,"Xw_create_icon_pixmap",0) ;
           return (0) ;
diff --git a/src/math/math_BFGS.cxx b/src/math/math_BFGS.cxx
index f6b03d8..c289809 100644
--- a/src/math/math_BFGS.cxx
+++ b/src/math/math_BFGS.cxx
@@ -123,10 +123,6 @@ static Standard_Boolean MinimizeDirection(math_Vector&   P,
      F.Initialize(P, Dir);
 
      Standard_Real dy1, Hnr1, lambda, alfa=0;
-#ifdef DEB
-     Standard_Integer n = 
-#endif
-       Dir.Length();
      dy1 = Gr*Dir;
      if (dy1 != 0) {
        Hnr1 = Dir.Norm2();
diff --git a/src/math/math_FunctionRoot.cxx b/src/math/math_FunctionRoot.cxx
index fda28e0..6b64970 100644
--- a/src/math/math_FunctionRoot.cxx
+++ b/src/math/math_FunctionRoot.cxx
@@ -67,11 +67,7 @@ class math_MyFunctionSetWithDerivatives : public math_FunctionSetWithDerivatives
      math_FunctionSetRoot Sol(Ff,V,Tol,NbIterations);
      Done = Sol.IsDone(); 
      if (Done) {
-#ifdef DEB
-       Standard_Integer Ier=F.GetStateNumber();
-#else
        F.GetStateNumber();
-#endif
        TheRoot = Sol.Root()(1);
        TheDerivative = Sol.Derivative()(1,1);
        F.Value(TheRoot,TheError);
@@ -93,11 +89,7 @@ class math_MyFunctionSetWithDerivatives : public math_FunctionSetWithDerivatives
      math_FunctionSetRoot Sol(Ff,V,Tol,Aa,Bb,NbIterations);
      Done = Sol.IsDone();
      if (Done) {
-#ifdef DEB
-       Standard_Integer Ier =F.GetStateNumber();
-#else
        F.GetStateNumber();
-#endif
        TheRoot = Sol.Root()(1);
        TheDerivative = Sol.Derivative()(1,1);
        F.Value(TheRoot,TheError);
diff --git a/src/math/math_FunctionRoots.cxx b/src/math/math_FunctionRoots.cxx
index 99d3b9e..374201a 100644
--- a/src/math/math_FunctionRoots.cxx
+++ b/src/math/math_FunctionRoots.cxx
@@ -983,16 +983,6 @@ math_FunctionRoots::math_FunctionRoots(math_FunctionWithDerivative& F,
     if(n1>n2) n=n2;
     for(Standard_Integer i=1;i<=n;i++) { 
       Standard_Real t = Sol(i)-StaticSol(i);
-#ifdef NEWSEQ
-# ifdef DEB
-      Standard_Real t1=
-# endif
-                       Sol(i);
-# ifdef DEB
-      Standard_Real t2=
-# endif
-                       StaticSol(i);
-#endif
       if(Abs(t)>NEpsX) { 
 	printf("\n mathFunctionRoots : i:%d/%d  delta: %g",i,n,t);
       }
diff --git a/src/math/math_IntegerVector.cxx b/src/math/math_IntegerVector.cxx
index 7de6cc8..4b1ed34 100644
--- a/src/math/math_IntegerVector.cxx
+++ b/src/math/math_IntegerVector.cxx
@@ -330,9 +330,6 @@ math_IntegerVector& math_IntegerVector::Initialized (const math_IntegerVector& O
 
   Standard_DimensionError_Raise_if(Length() != Other.Length(), " ");
 
-#ifdef DEB
-  Standard_Integer I = Other.FirstIndex;
-#endif
   (Other.Array).Copy(Array);
   return *this;
 }
diff --git a/src/math/math_TrigonometricFunctionRoots.cxx b/src/math/math_TrigonometricFunctionRoots.cxx
index cac63eb..0280f9b 100644
--- a/src/math/math_TrigonometricFunctionRoots.cxx
+++ b/src/math/math_TrigonometricFunctionRoots.cxx
@@ -64,9 +64,6 @@ class MyTrigoFunction: public math_FunctionWithDerivative {
    //-- F= AA*CN*CN+2*BB*CN*SN+CC*CN+DD*SN+EE;
    //-- D = -2*AA*CN*SN+2*BB*(CN*CN-SN*SN)-CC*SN+DD*CN;
    Standard_Real AACN = AA*CN;
-#ifdef DEB
-   Standard_Real BBCN = BB*CN;
-#endif
    Standard_Real BBSN = BB*SN;
 
    F = AACN*CN + BBSN*(CN+CN) + CC*CN + DD*SN + EE;
diff --git a/src/math/math_Vector.cxx b/src/math/math_Vector.cxx
index 193f976..5a2fe9f 100644
--- a/src/math/math_Vector.cxx
+++ b/src/math/math_Vector.cxx
@@ -429,9 +429,6 @@ math_Vector math_Vector::Multiplied(const math_Matrix& Right)const {
   Standard_DimensionError_Raise_if(Length() != Right.RowNumber(), "");
 
   math_Vector Result(Right.LowerColIndex, Right.UpperColIndex);
-#ifdef DEB
-  Standard_Integer Index = LowerIndex;
-#endif
   for(Standard_Integer J2 = Right.LowerColIndex; 
       J2 <= Right.UpperColIndex; J2++) {
     Array(J2) = 0.0;

-- 
OCE packaging



More information about the debian-science-commits mailing list