0024635: Eliminate trivial compiler warnings by GCC in Debug mode

diff --git a/src/BRepFill/BRepFill_Evolved.cxx b/src/BRepFill/BRepFill_Evolved.cxx
index 9956308944122877679ddf9f3f7aa19c177509dd..d23cd97bd61dc7d4f2b11f7b0839792626cef1d8 100644 (file)
--- a/src/BRepFill/BRepFill_Evolved.cxx
+++ b/src/BRepFill/BRepFill_Evolved.cxx
@@ -126,9 +126,6 @@
 #include <DBRep.hxx>
 #include <DrawTrSurf.hxx>
 #include <stdio.h>
-#endif
-
-#ifdef DEB
 static Standard_Boolean AffichGeom = Standard_False;
 static Standard_Boolean AffichEdge = Standard_False;
 static Standard_Integer NbFACES       = 0;
@@ -136,10 +133,6 @@ static Standard_Integer NbTRIMFACES   = 0;
 static Standard_Integer NbVEVOS       = 0;
 static Standard_Integer NbPROFILS     = 0;
 static Standard_Integer NbEDGES       = 0;
-// POP for NT
-#ifndef WNT
-static char name[100];
-#endif
 #endif
 
 static const Standard_Real BRepFill_Confusion() 
@@ -687,6 +680,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face&              Sp,
 
 #ifdef DRAW
   if (AffichEdge) {      
+    char name[100];
     sprintf(name,"PROFIL_%d",++NbPROFILS);     
     DBRep::Set(name,Pr);
   }
@@ -984,6 +978,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face&              Sp,
        
 #ifdef DRAW
        if (AffichEdge) {
+          char name[100];
          sprintf(name,"ARCEDGE_%d_%d_%d",i,vv,Ti);     
          DBRep::Set(name,CurrentEdge);
        }
@@ -1069,7 +1064,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face&              Sp,
     }
   }
 
-#ifdef DEB
+#ifdef DRAW
  if (AffichEdge) {
    cout << " End of Construction of edges and vertices on bissectrices"<<endl;
  }
@@ -1134,6 +1129,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face&              Sp,
            
 #ifdef DRAW        
            if (AffichEdge) {
+              char name[100];
              sprintf(name,"PAREDGE_%d_%d",++NbEDGES,k);        
              DBRep::Set(name,S.Value(k));
            }
@@ -1171,6 +1167,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face&              Sp,
          
 #ifdef DRAW        
          if (AffichEdge) {       
+            char name[100];
            sprintf(name,"PAREDGE_%d_%d",++NbEDGES,k);  
            DBRep::Set(name,S.Value(k));
          }
@@ -1254,6 +1251,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face&              Sp,
 #ifdef DRAW  
   if (AffichEdge) {      
     cout <<" End of construction of an elementary volevo."<<endl;          
+    char name[100];
     sprintf(name,"VEVO_%d",++NbVEVOS); 
     DBRep::Set(name,myShape);
   }
@@ -1360,6 +1358,7 @@ void BRepFill_Evolved::PlanarPerform (const TopoDS_Face&              Sp,
       TopTools_DataMapIteratorOfDataMapOfShapeShape it(MapVP);
       Standard_Integer k = 0;
       for (; it.More(); it.Next()) {
+        char name[100];
        sprintf(name,"PARALI_%d",++k);  
        DBRep::Set(name,it.Value());
       }
@@ -1463,6 +1462,7 @@ void BRepFill_Evolved::VerticalPerform (const TopoDS_Face&              Sp,
     
 #ifdef DRAW  
     if (AffichEdge) {    
+      char name[100];
       sprintf(name,"PARALI_%d",++NbVEVOS);     
       DBRep::Set(name,Base);
     }
@@ -1471,6 +1471,7 @@ void BRepFill_Evolved::VerticalPerform (const TopoDS_Face&              Sp,
     BRepSweep_Prism PS(Base,gp_Vec(0,0,Alt2 - Alt1),Standard_False);
 #ifdef DRAW  
     if (AffichEdge) {    
+      char name[100];
       sprintf(name,"PRISM_%d",NbVEVOS);        
       DBRep::Set(name,PS.Shape());
     }
@@ -1732,6 +1733,7 @@ const
 
 #ifdef DRAW
   if (AffichEdge) {
+    char name[100];
     sprintf(name,"workspine"); 
     DBRep::Set(name,WorkSpine);
   }
@@ -2214,6 +2216,7 @@ void BRepFill_Evolved::MakePipe(const TopoDS_Edge& SE,
 
 #ifdef DRAW
   if (AffichGeom) {
+    char name[100];
     sprintf(name,"EVOLBASE_%d",++NbFACES);
     DBRep::Set(name,SE);
     sprintf(name,"EVOLPROF_%d",NbFACES);
@@ -2226,6 +2229,7 @@ void BRepFill_Evolved::MakePipe(const TopoDS_Edge& SE,
   
 #ifdef DRAW
   if (AffichGeom) {
+    char name[100];
     sprintf(name,"EVOL_%d",++NbFACES);
     DBRep::Set(name,Pipe.Shape());
   }
@@ -2303,9 +2307,9 @@ void BRepFill_Evolved::MakeRevol(const TopoDS_Edge&   SE,
   
 #ifdef DRAW  
   if (AffichGeom) {
+    char name[100];
     sprintf(name,"EVOLBASE_%d",++NbFACES);
-    char* Temp = name ;
-    DrawTrSurf::Set(Temp,new Geom_Line(AxeRev));
+    DrawTrSurf::Set(name,new Geom_Line(AxeRev));
 //    DrawTrSurf::Set(name,new Geom_Line(AxeRev));
     sprintf(name,"EVOLPROF_%d",NbFACES);
     DBRep::Set(name,GenProf);
@@ -2407,6 +2411,7 @@ void BRepFill_Evolved::TransformInitWork(const TopLoc_Location& LS,
 
 #ifdef DRAW
   if (AffichEdge) {
+    char name[100];
     sprintf(name,"movedspine");
     TopoDS_Face SL = mySpine;
     DBRep::Set(name,SL);    

diff --git a/src/BRepFill/BRepFill_MultiLine.cxx b/src/BRepFill/BRepFill_MultiLine.cxx
index 37c85d5b5b9b8267c3bce12fc5f1c18a5094e8aa..bf9356e81a6570a011bf35a4b38d79261f789bdb 100644 (file)
--- a/src/BRepFill/BRepFill_MultiLine.cxx
+++ b/src/BRepFill/BRepFill_MultiLine.cxx
@@ -47,12 +47,10 @@
 
 #ifdef DRAW
 #include <DrawTrSurf.hxx>
-#endif
-
-#ifdef DEB
 static Standard_Boolean AffichCurve = Standard_False;
 static Standard_Integer NbProj = 1;
 #endif
+
 //POP pour NT
 #include <stdio.h>
 
@@ -506,9 +504,7 @@ void BRepFill_MultiLine::Curves(Handle(Geom_Curve)& Curve,
 
 #ifdef DRAW
     if ( AffichCurve) {
-//POP pour NT
-      //      char name[100];
-      char* name = new char[100];
+      char name[100];
       sprintf(name,"C2_%d",NbProj);
       DrawTrSurf::Set(name,TLine);
       sprintf(name,"C3_%d",NbProj);

diff --git a/src/BRepFill/BRepFill_OffsetWire.cxx b/src/BRepFill/BRepFill_OffsetWire.cxx
index a2a0f2420c89d8b91302567cde482981d2cd6a89..97d06be3764205460699e3a1412e36431d7b94c4 100644 (file)
--- a/src/BRepFill/BRepFill_OffsetWire.cxx
+++ b/src/BRepFill/BRepFill_OffsetWire.cxx
@@ -105,9 +105,6 @@
 #include <DrawTrSurf.hxx>
 #include <DrawTrSurf_Curve2d.hxx>
 #include <DBRep.hxx>
-#endif
-
-#ifdef DEB
 static Standard_Boolean AffichGeom  = Standard_False;
 static Standard_Boolean Affich2d    = Standard_False;
 static Standard_Boolean AffichEdge  = Standard_False;
@@ -115,10 +112,6 @@ 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];
-static Standard_CString name = tname ;
-#endif
 #endif
 
 //  Modified by Sergey KHROMOV - Thu Nov 16 17:24:39 2000 Begin
@@ -602,8 +595,6 @@ void BRepFill_OffsetWire::Perform (const Standard_Real Offset,
       
       if(aSubst.IsCopied(myWorkSpine)) {
         myWorkSpine = TopoDS::Face(aSubst.Copy(myWorkSpine).First());
-        //sprintf(name,"WS1");
-        //DBRep::Set(name,myWorkSpine);
 
         BRepMAT2d_Explorer newExp;
         newExp.Perform(myWorkSpine);
@@ -788,7 +779,7 @@ void BRepFill_OffsetWire::PerformWithBiLo
   }
 
 
-#ifdef DEB
+#ifdef DRAW
   if (AffichEdge) {
     cout << " End Construction of geometric primitives "<<endl;
   }
@@ -816,6 +807,7 @@ void BRepFill_OffsetWire::PerformWithBiLo
     
 #ifdef DRAW
   if ( AffichGeom) {
+    char name[256];
     sprintf(name,"BISSEC_%d",NbBISSEC++);
     DrawTrSurf::Set(name,Bisec.Value());
   }
@@ -967,7 +959,7 @@ void BRepFill_OffsetWire::PerformWithBiLo
     }
   }
   
-#ifdef DEB 
+#ifdef DRAW
   if (AffichEdge) {
     cout << " End Construction of vertices on offsets"<<endl;
   }
@@ -1192,8 +1184,7 @@ void BRepFill_OffsetWire::PrepareSpine()
 
 #ifdef DRAW
   if ( AffichEdge) {
-    sprintf(name,"WS");
-    DBRep::Set(name,myWorkSpine);
+    DBRep::Set("WS",myWorkSpine);
   }
 #endif
 
@@ -1825,6 +1816,7 @@ void MakeCircle (const TopoDS_Edge&          E,
 
 #ifdef DRAW
   if ( AffichGeom && !OE.IsNull()) {
+    char name[256];
     sprintf(name,"OFFSET_%d",++NbOFFSET);
     DBRep::Set(name,OE);
   }
@@ -1901,6 +1893,7 @@ void MakeOffset (const TopoDS_Edge&        E,
 
 #ifdef DRAW  
     if (AffichGeom && !OE.IsNull()) {
+      char name[256];
       sprintf(name,"OFFSET_%d",++NbOFFSET);
       DBRep::Set(name,OE);
       Standard_Real ii = 0;
@@ -2143,6 +2136,7 @@ void TrimEdge (const TopoDS_Edge&              E,
 
 #ifdef DRAW
     if ( AffichEdge) {
+      char name[256];
       sprintf(name,"TRIMEDGE_%d",NbTRIMEDGES);
       DBRep::Set(name,NewEdge);  
     }
@@ -2152,6 +2146,7 @@ void TrimEdge (const TopoDS_Edge&              E,
       Handle(Geom_Surface) Surf;  
       Handle(Geom2d_Curve) C;
       BRep_Tool::CurveOnSurface(NewEdge,C,Surf,L,f,l);
+      char name[256];
       sprintf(name,"OFFSET2d_%d",NbTRIMEDGES++);
       Handle(Geom2d_TrimmedCurve) C2d = new Geom2d_TrimmedCurve(C,f,l);
       Handle(DrawTrSurf_Curve2d) dr =

diff --git a/src/BRepOffset/BRepOffset_Inter2d.cxx b/src/BRepOffset/BRepOffset_Inter2d.cxx
index b961e96a79c0dbfc2cfe76899db7741808366a31..e6594d25239f7cd083f029462766003c2652d5f0 100644 (file)
--- a/src/BRepOffset/BRepOffset_Inter2d.cxx
+++ b/src/BRepOffset/BRepOffset_Inter2d.cxx
@@ -46,20 +46,6 @@
 #include <BRep_CurveRepresentation.hxx>
 #include <BRep_GCurve.hxx>
 
-#ifdef DRAW 
-#include <DBRep.hxx>
-#endif
-#ifdef DEB
-#ifndef WNT
-extern Standard_Integer AffichInt2d;
-#else
-Standard_IMPORT Standard_Boolean AffichInt2d;
-#endif
-static Standard_Integer NbF2d = 0;
-static Standard_Integer NbE2d = 0;
-static Standard_Integer NbNewVertices  = 0;
-#endif
-
 #include <Geom_Line.hxx>
 #include <Geom_TrimmedCurve.hxx>
 #include <GeomConvert_CompCurveToBSplineCurve.hxx>
@@ -94,6 +80,13 @@ static Standard_Integer NbNewVertices  = 0;
 #include <BndLib_Add3dCurve.hxx>
 #include <BRepTools.hxx>
 
+#ifdef DRAW 
+#include <DBRep.hxx>
+Standard_IMPORT extern Standard_Boolean AffichInt2d;
+static Standard_Integer NbF2d = 0;
+static Standard_Integer NbE2d = 0;
+static Standard_Integer NbNewVertices  = 0;
+#endif
 
 //=======================================================================
 //function : CommonVertex
@@ -253,8 +246,7 @@ static void  Store (const TopoDS_Edge&       E1,
 #ifdef DRAW
    if (AffichInt2d) {    
      if (!OnE1 && !OnE2) {
-       //POP pour NT
-       char* name = new char[100];
+       char name[256];
        sprintf(name,"VV_%d",NbNewVertices++);  
        DBRep::Set(name,V);
      }
@@ -280,8 +272,7 @@ static void EdgeInter(const TopoDS_Face&              F,
 {
 #ifdef DRAW
   if (AffichInt2d) {
-    //POP pour NT
-    char* name = new char[100];
+    char name[256];
     sprintf(name,"E2d_%d_%d",NbF2d,NbE2d++);
     DBRep::Set(name,E1);
     sprintf(name,"E2d_%d_%d",NbF2d,NbE2d++);
@@ -552,8 +543,7 @@ static void RefEdgeInter(const TopoDS_Face&              F,
 {
 #ifdef DRAW
   if (AffichInt2d) {
-    //POP for NT
-    char* name = new char[100];
+    char name[256];
     sprintf(name,"E2d_%d_%d",NbF2d,NbE2d++);
     DBRep::Set(name,E1);
     sprintf(name,"E2d_%d_%d",NbF2d,NbE2d++);
@@ -1410,7 +1400,7 @@ void BRepOffset_Inter2d::Compute (const Handle(BRepAlgo_AsDes)&     AsDes,
                                  const TopTools_IndexedMapOfShape& 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 6aed54f558df5a8b4897eff9c48a8d82e877f1a5..3d5c593be3f67c4f9f06e2def486048e24af10c0 100644 (file)
--- a/src/BRepOffset/BRepOffset_MakeLoops.cxx
+++ b/src/BRepOffset/BRepOffset_MakeLoops.cxx
@@ -35,15 +35,10 @@
 
 #ifdef DRAW
 #include <DBRep.hxx>
-#endif
-#ifdef DEB
 Standard_Integer NbF = 1;
 static Standard_Boolean Affich = Standard_False;
-//POP pour NT
-//char name[100];
 #endif
 
-
 BRepOffset_MakeLoops::BRepOffset_MakeLoops()
 {
 }
@@ -444,9 +439,8 @@ void BRepOffset_MakeLoops::BuildFaces(const TopTools_ListOfShape&   LF,
       }
       if (ToRebuild) {
 #ifdef DRAW
-//POP for NT
        if ( Affich) {
-         char* name = new char[100];
+         char name[256];
          sprintf(name,"CF_%d",NbF++);
          DBRep::Set(name,F);
        }

diff --git a/src/BRepOffset/BRepOffset_Tool.cxx b/src/BRepOffset/BRepOffset_Tool.cxx
index 854cf312f7fc8f888703590866a2777b17e766cf..c47a4a96148e0573d284c8168a73a74cf9758f28 100644 (file)
--- a/src/BRepOffset/BRepOffset_Tool.cxx
+++ b/src/BRepOffset/BRepOffset_Tool.cxx
@@ -143,20 +143,17 @@
 
 #ifdef DRAW
 #include <DBRep.hxx>
-#endif
-
-#ifdef DEB       
 Standard_Boolean AffichInter  = Standard_False;
-static Standard_Boolean AffichExtent = Standard_False;
 static Standard_Integer NbNewEdges  = 1;
 static Standard_Integer NbFaces     = 1;
 static Standard_Integer NbFOB       = 1;
 static Standard_Integer NbFTE       = 1;
 static Standard_Integer NbExtE      = 1;
-//POP pour NT
-//char* name = new char[100];
 #endif
 
+#ifdef DEB
+static Standard_Boolean AffichExtent = Standard_False;
+#endif
 
 //=======================================================================
 //function : EdgeVertices
@@ -730,8 +727,7 @@ void BRepOffset_Tool::PipeInter(const TopoDS_Face& F1,
 { 
 #ifdef DRAW
   if (AffichInter) {
-    // POP pour NT
-    char* name = new char[100];
+    char name[256];
     sprintf(name,"FF_%d",NbFaces++);
     DBRep::Set(name,F1);
     sprintf(name,"FF_%d",NbFaces++);
@@ -779,8 +775,7 @@ void BRepOffset_Tool::PipeInter(const TopoDS_Face& F1,
       L2.Append (E.Oriented(O2));
 #ifdef DRAW
       if (AffichInter) {
-    // POP pour NT
-       char* name = new char[100];
+        char name[256];
        sprintf(name,"EI_%d",NbNewEdges++);     
        DBRep::Set(name,E.Oriented(O1));
       }
@@ -1572,8 +1567,7 @@ void BRepOffset_Tool::Inter3D(const TopoDS_Face& F1,
 {
 #ifdef DRAW
   if (AffichInter) {
-    // POP pour NT
-    char* name = new char[100];
+    char name[256];
     sprintf(name,"FF_%d",NbFaces++);
     DBRep::Set(name,F1);
     sprintf(name,"FF_%d",NbFaces++);
@@ -1695,7 +1689,7 @@ void BRepOffset_Tool::Inter3D(const TopoDS_Face& F1,
         
 #ifdef DRAW
         if (AffichInter) {
-          char* name = new char[100];
+         char name[256];
           sprintf(name,"EI_%d",NbNewEdges++);  
           DBRep::Set(name,anEdge.Oriented(O1));
          
@@ -1943,8 +1937,7 @@ Standard_Boolean BRepOffset_Tool::TryProject
 {
 #ifdef DRAW
   if (AffichInter) {
-    // POP pour NT
-    char* name = new char[100];
+    char name[256];
     sprintf(name,"FF_%d",NbFaces++);
     DBRep::Set(name,F1);
     sprintf(name,"FF_%d",NbFaces++);
@@ -1987,9 +1980,8 @@ Standard_Boolean BRepOffset_Tool::TryProject
       LInt2.Append (CurE.Oriented(O2));
 #ifdef DRAW
       if (AffichInter) {
-    // POP pour NT
-       char* name = new char[100];
-       sprintf(name,"EI_%d",NbNewEdges++);     
+        char name[256];
+        sprintf(name,"EI_%d",NbNewEdges++);    
        DBRep::Set(name,CurE.Oriented(O1));
       }
 #endif      
@@ -2014,8 +2006,7 @@ void BRepOffset_Tool::InterOrExtent(const TopoDS_Face& F1,
 {
 #ifdef DRAW
   if (AffichInter) {
-    // POP pour NT
-    char* name = new char[100];
+    char name[256];
     sprintf(name,"FF_%d",NbFaces++);
     DBRep::Set(name,F1);
     sprintf(name,"FF_%d",NbFaces++);
@@ -2064,8 +2055,7 @@ void BRepOffset_Tool::InterOrExtent(const TopoDS_Face& F1,
       L2.Append (E.Oriented(O2));
 #ifdef DRAW
       if (AffichInter) {
-    // POP pour NT
-    char* name = new char[100];
+        char name[256];
        sprintf(name,"EI_%d",NbNewEdges++);     
        DBRep::Set(name,E.Oriented(O1));
       }
@@ -2153,7 +2143,7 @@ static void ExtentEdge(const TopoDS_Face& F,
   NE.Orientation(E.Orientation());
 #ifdef DRAW
   if (AffichExtent) {
-    char* name = new char[100];
+    char name[256];
     sprintf (name,"F_%d",NbExtE);
     DBRep::Set(name,EF);
     sprintf (name,"OE_%d",NbExtE);
@@ -3467,8 +3457,7 @@ void BRepOffset_Tool::ExtentFace (const TopoDS_Face&            F,
 {
 #ifdef DRAW
   if (AffichInter) {
-    // POP pour NT
-    char* name = new char[100];
+    char name[256];
     sprintf(name,"FTE_%d",NbFTE++);
     DBRep::Set(name,F);
   }
@@ -3886,8 +3875,7 @@ void BRepOffset_Tool::ExtentFace (const TopoDS_Face&            F,
   
 #ifdef DRAW
   if (AffichInter) {
-    // POP pour NT
-    char* name = new char[100];
+    char name[256];
     sprintf(name,"FOB_%d",NbFOB++);
     DBRep::Set(name,NF);
   }

diff --git a/src/Bisector/Bisector_Inter.cxx b/src/Bisector/Bisector_Inter.cxx
index a39b5b446b86bd855e04f8662bb78b8db7cbab6b..afc86683b965cd5446a6b6cc56611b660c8eed1a 100644 (file)
--- a/src/Bisector/Bisector_Inter.cxx
+++ b/src/Bisector/Bisector_Inter.cxx
@@ -38,8 +38,6 @@
 #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/Blend/Blend_CSWalking_4.gxx b/src/Blend/Blend_CSWalking_4.gxx
index e7d0043dc7d79256331ab309b953dcaf9816e1fb..539333c75afba13360769c442b1959c587ac9319 100644 (file)
--- a/src/Blend/Blend_CSWalking_4.gxx
+++ b/src/Blend/Blend_CSWalking_4.gxx
@@ -265,10 +265,9 @@ void Blend_CSWalking::InternalPerform(Blend_CSFunction& Func,
        Arrive = Standard_True;
       }
       break;
-#ifndef DEB
+
     default:
       break;
-#endif
     }
     if (Arrive) {
       if (sens > 0.) {

diff --git a/src/Expr/Expr_BinaryExpression.cxx b/src/Expr/Expr_BinaryExpression.cxx
index 87e6b46137e821a519d5cd9960eb9f195b7a8d96..cb43954fde676a64d3dfee431a833cb8aa7346cd 100644 (file)
--- a/src/Expr/Expr_BinaryExpression.cxx
+++ b/src/Expr/Expr_BinaryExpression.cxx
@@ -74,9 +74,7 @@ const Handle(Expr_GeneralExpression)& Expr_BinaryExpression::SubExpression (cons
       Standard_OutOfRange::Raise();
     }
   }
-#if defined (WNT) || !defined (DEB)
  return *(  ( Handle_Expr_GeneralExpression* )NULL  );
-#endif  // WNT || !DEB
 }
 
 Standard_Boolean Expr_BinaryExpression::ContainsUnknowns () const

diff --git a/src/Extrema/Extrema_ExtCS.cxx b/src/Extrema/Extrema_ExtCS.cxx
index 5494321bdc9f24e9e82bfdf78537fdeb48342d10..538fa647e0970c51d419938752a092c4d7dc9eb1 100644 (file)
--- a/src/Extrema/Extrema_ExtCS.cxx
+++ b/src/Extrema/Extrema_ExtCS.cxx
@@ -130,6 +130,7 @@ void Extrema_ExtCS::Perform(const Adaptor3d_Curve& C,
       case GeomAbs_BSplineSurface:
       case GeomAbs_SurfaceOfRevolution:
       case GeomAbs_SurfaceOfExtrusion:
+      case GeomAbs_OffsetSurface:
       case GeomAbs_OtherSurface:
        {
          Standard_Real cfirst = myucinf, clast = myucsup;
@@ -139,7 +140,7 @@ void Extrema_ExtCS::Perform(const Adaptor3d_Curve& C,
          if(Precision::IsInfinite(Abs(cfirst)) || Precision::IsInfinite(Abs(clast))) {
 
            Bnd_Box aSurfBox;
-      BndLib_AddSurface::Add(*myS, ufirst, ulast, vfirst, vlast, Precision::Confusion(), aSurfBox);
+            BndLib_AddSurface::Add(*myS, ufirst, ulast, vfirst, vlast, Precision::Confusion(), aSurfBox);
            Standard_Real xmin, ymin, zmin, xmax, ymax, zmax;
            aSurfBox.Get(xmin, ymin, zmin, xmax, ymax, zmax);
            Standard_Real tmin = Precision::Infinite(), tmax = -tmin;
@@ -207,10 +208,6 @@ void Extrema_ExtCS::Perform(const Adaptor3d_Curve& C,
          return;
          
        }
-#ifndef DEB
-      default:
-#endif
-       break;
       }
       break;
     }

diff --git a/src/GeomFill/GeomFill_SweepSectionGenerator.cxx b/src/GeomFill/GeomFill_SweepSectionGenerator.cxx
index 934c43e81731970a6aa5295b54f15964db7daf85..bba3f202c6df8478d172356357b771fd9734d446 100644 (file)
--- a/src/GeomFill/GeomFill_SweepSectionGenerator.cxx
+++ b/src/GeomFill/GeomFill_SweepSectionGenerator.cxx
@@ -38,11 +38,10 @@
 
 #ifdef DRAW
 #include <DrawTrSurf.hxx>
-#endif
-#ifdef DEB
 static Standard_Boolean Affich     = Standard_False;
 static Standard_Integer NbSECTIONS = 0;
 #endif
+
 //#define GF_DEB
 //=======================================================================
 //function : GeomFill_SweepSectionGenerator
@@ -580,9 +579,7 @@ void GeomFill_SweepSectionGenerator::Section
     }
 #ifdef DRAW
     if ( Affich) {
-//POP pour NT
-//      char name[100];
-      char* name = new char[100];
+      char name[256];
       sprintf(name,"SECTION_%d",++NbSECTIONS);
       DrawTrSurf::Set(name,myFirstSect->Transformed(cumulTR));
     }
@@ -651,9 +648,7 @@ void GeomFill_SweepSectionGenerator::Section
 
 #ifdef DRAW
       if ( Affich) {
-// POP pour NT
-//     char name[100];
-       char* name = new char[100];
+        char name[256];
        sprintf(name,"SECTION_%d",++NbSECTIONS);
        DrawTrSurf::Set(name,BS);
       }

diff --git a/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx b/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx
index 8592562a311940abfa0ca47c168f91fc4a325030..4069277ce6a6de65231c7fd22a906b9e00149779 100644 (file)
--- a/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx
+++ b/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx
@@ -69,10 +69,23 @@
 #include <Geom2d_BezierCurve.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 
+#include <TColStd_SequenceOfInteger.hxx>
+#include <TColgp_SequenceOfVec.hxx>
+#include <TColgp_HArray2OfPnt.hxx>
+#include <Geom_BSplineSurface.hxx>
+#include <GeomPlate_SequenceOfAij.hxx>
+#include <GeomPlate_MakeApprox.hxx>
+
 // pour mes tests
-#ifdef DEB
+#ifdef PLATE_DEB
 #include <OSD_Chronometer.hxx>
+#endif
 
+#ifdef DRAW
+#include <DrawTrSurf.hxx>
+#include <Draw_Marker3D.hxx>
+#include <Draw_Marker2D.hxx>
+#include <Draw.hxx>
 static Standard_Integer Affich=0;
 // 0 : Pas de display
 // 1 : Display des Geometries et controle intermediaire
@@ -84,21 +97,6 @@ static Standard_Integer NbMark = 0;
 static Standard_Integer NbProj = 0;
 #endif
 
-#ifdef DRAW
-#include <DrawTrSurf.hxx>
-#include <Draw_Marker3D.hxx>
-#include <Draw_Marker2D.hxx>
-#include <Draw.hxx>
-#endif
-
-#include <TColStd_SequenceOfInteger.hxx>
-#include <TColgp_SequenceOfVec.hxx>
-#include <TColgp_HArray2OfPnt.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <GeomPlate_SequenceOfAij.hxx>
-#include <GeomPlate_MakeApprox.hxx>
-
-
 //\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 //      =========================================================
 //                   C O N S T R U C T E U R S
@@ -315,7 +313,7 @@ Handle(Geom2d_Curve)  GeomPlate_BuildPlateSurface::ProjectCurve(const Handle(Ada
  }
 #if DRAW
  if (Affich) {
-   char* name = new char[100];
+   char name[256];
    sprintf(name,"proj_%d",++NbProj);
    DrawTrSurf::Set(name, Curve2d);
  }
@@ -457,7 +455,7 @@ void GeomPlate_BuildPlateSurface::
 //---------------------------------------------------------
 void GeomPlate_BuildPlateSurface::Perform()
 { 
-#ifdef DEB
+#ifdef PLATE_DEB
   // Chronmetrage
   OSD_Chronometer Chrono;
   Chrono.Reset();
@@ -1628,7 +1626,7 @@ void GeomPlate_BuildPlateSurface::ComputeSurfInit()
       myPlanarSurfInit = mySurfInit;
 #if DRAW
       if (Affich) {
-       char* name = new char[100];
+       char name[256];
        sprintf(name,"planinit_%d",NbPlan+1);
        DrawTrSurf::Set(name, mySurfInit);
       }
@@ -1715,7 +1713,7 @@ void GeomPlate_BuildPlateSurface::ComputeSurfInit()
 
 #if DRAW
   if (Affich) {
-    char* name = new char[100];
+    char name[256];
     sprintf(name,"surfinit_%d",++NbPlan);
     DrawTrSurf::Set(name, mySurfInit);
   }
@@ -1934,7 +1932,7 @@ Intersect(Handle(GeomPlate_HArray1OfSequenceOfReal)& PntInter,
                    if (Affich > 1)
                      {
                        Handle(Draw_Marker3D) mark = new (Draw_Marker3D)(P1, Draw_X, Draw_vert);
-                       char* name = new char[100];
+                        char name[256];
                        sprintf(name,"mark_%d",++NbMark);
                        Draw::Set(name, mark); 
                      }
@@ -2419,8 +2417,7 @@ VerifSurface(const Standard_Integer NbBoucle)
              LinCont->D0(U,P);
              Handle(Draw_Marker3D) mark = 
                new (Draw_Marker3D)(P, Draw_X, Draw_orange);
-             char* name = new char[100];
-
+              char name[256];
              sprintf(name,"mark_%d",++NbMark);
              Draw::Set(name, mark);
              if (!LinCont->ProjectedCurve().IsNull())
@@ -2451,7 +2448,7 @@ VerifSurface(const Standard_Integer NbBoucle)
                LinCont->D0(U,P);       
                Handle(Draw_Marker3D) mark = 
                  new Draw_Marker3D(P, Draw_X, Draw_or);
-               char* name = new char[100];
+                char name[256];
                sprintf(name,"mark_%d",++NbMark);
                Draw::Set(name, mark);
              }

diff --git a/src/GeomProjLib/GeomProjLib.cxx b/src/GeomProjLib/GeomProjLib.cxx
index 59ffcfa43726ee687ff05bbaba5ecd224500e833..40c4730971769159f4c5bcec79cbc3f59cc8e7bf 100644 (file)
--- a/src/GeomProjLib/GeomProjLib.cxx
+++ b/src/GeomProjLib/GeomProjLib.cxx
@@ -59,8 +59,6 @@
 
 #ifdef DRAW
 #include <DrawTrSurf.hxx>
-#endif
-#ifdef DEB
 static Standard_Boolean Affich = Standard_False;
 static Standard_Integer NBPROJ = 1;
 #endif
@@ -83,9 +81,7 @@ Handle(Geom2d_Curve) GeomProjLib::Curve2d(const Handle(Geom_Curve)& C,
 {
 #ifdef DRAW
   if ( Affich) {
-//POP pour NT
-//    char name[100];
-    char* name = new char[100];
+    char name[256];
     Sprintf(name,"PROJCURV_%d",NBPROJ);
     DrawTrSurf::Set(name,C);
     Sprintf(name,"PROJSURF_%d",NBPROJ);

diff --git a/src/IntCurveSurface/IntCurveSurface_Inter.gxx b/src/IntCurveSurface/IntCurveSurface_Inter.gxx
index 694e0a41908c558fed945e479c69cbc1746fd902..c99376a26578fe1cd944392bffc22533decfc70c 100644 (file)
--- a/src/IntCurveSurface/IntCurveSurface_Inter.gxx
+++ b/src/IntCurveSurface/IntCurveSurface_Inter.gxx
@@ -1610,9 +1610,8 @@ void IntCurveSurface_ComputeParamsOnQuadric(const TheSurface& surface,
       ElSLib::Parameters(TheSurfaceTool::Sphere(surface),P,u,v);
        break;
       }
-#ifndef DEB
-  default:     break;      
-#endif
+  default:
+    break;
   }
 }
 //=======================================================================

diff --git a/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx b/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx
index ead0c8cc80a39874231c369a7378e2eb88735f81..44d73eb8ec9c569f9b15cbb2df82b955d773cfe7 100644 (file)
--- a/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx
+++ b/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx
@@ -73,18 +73,10 @@ static void ProcessSegments (const IntPatch_SequenceOfSegmentOfTheSOnBounds&,
                             const Standard_Real);
 
 static void ProcessRLine (IntPatch_SequenceOfLine&,
-#ifndef DEB
                          const IntSurf_Quadric&,
                          const IntSurf_Quadric&,
-#else
-                         const Handle(Adaptor3d_HSurface)&,
-                         const Handle(Adaptor3d_HSurface)&,
-#endif
                          const Standard_Real);
 
-
-
-
 //-- le calcul de dist est completement faux ds la routine ci dessous a revoir (lbr le 18 nov 97)
 Standard_Boolean IntersectionWithAnArc(gp_Pnt& PSurf,
                                       const Handle(IntPatch_ALine)& alin,

diff --git a/src/LocOpe/LocOpe_CSIntersector.cxx b/src/LocOpe/LocOpe_CSIntersector.cxx
index 2c08028e1fc5c34425f7b5a2e157a7755458447d..770c6ca5599c9fdbe1cfcd4cd8f5f6dc681b1665 100644 (file)
--- a/src/LocOpe/LocOpe_CSIntersector.cxx
+++ b/src/LocOpe/LocOpe_CSIntersector.cxx
@@ -51,21 +51,10 @@ static Standard_Boolean LocAfter (const LocOpe_SequenceOfPntFace&,
                                  Standard_Integer&,
                                  Standard_Integer&);
 
-#ifdef DEB                               
-static Standard_Boolean LocBefore (const LocOpe_SequenceOfPntFace&,
-                                  const Standard_Integer,
-                                  Standard_Integer&,
-                                  Standard_Integer&);
-#endif
-
-
 static void AddPoints(IntCurvesFace_Intersector&,
                       LocOpe_SequenceOfPntFace&,
                      const TopoDS_Face&);
 
-
-
-
 //=======================================================================
 //function : Init
 //purpose  : 

diff --git a/src/TopOpeBRep/TopOpeBRep_Point2d.cxx b/src/TopOpeBRep/TopOpeBRep_Point2d.cxx
index 51999a484f4c0eb9ceef0b2e5ccd89ea99972e62..18a74e125db0691144101198b1af740a9dabd5f7 100644 (file)
--- a/src/TopOpeBRep/TopOpeBRep_Point2d.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_Point2d.cxx
@@ -120,8 +120,11 @@ void TopOpeBRep_Point2d::Dump(const Standard_Integer E1index,const Standard_Inte
 #ifdef DRAW
   cout<<FUN_tool_PRODINP()<<"P"<<Index()<<" "<<P3D.X()<<" "<<P3D.Y()<<" "<<P3D.Z()<<"; # tol = "<<tol<<endl;
 #endif
-  cout<<"     on (1) :"; cout<<" vertex(1) : "; cout<<(isvertex1)? 1:0;
-  cout<<"  T "<<E1index<<"(1) : "; T1.Dump(cout);
+  cout<<"     on (1) :";
+  cout<<" vertex(1) : ";
+  cout<<(isvertex1?1:0);
+  cout<<"  T "<<E1index<<"(1) : ";
+  T1.Dump(cout);
   cout<<" par(1) = "<<par1;
   if (isvertex1) {
     P3D = BRep_Tool::Pnt(V1);
@@ -129,8 +132,11 @@ void TopOpeBRep_Point2d::Dump(const Standard_Integer E1index,const Standard_Inte
   }
   cout<<endl;
   
-  cout<<"     on (2) :"; cout<<" vertex(2) : "; cout<<(isvertex2)? 1:0;
-  cout<<"  T "<<E2index<<"(2) : "; T2.Dump(cout); 
+  cout<<"     on (2) :";
+  cout<<" vertex(2) : ";
+  cout<<(isvertex2?1:0);
+  cout<<"  T "<<E2index<<"(2) : ";
+  T2.Dump(cout);
   cout<<" par(2) = "<<par2;
   if (isvertex2) {
     P3D = BRep_Tool::Pnt(V2);

diff --git a/src/TopOpeBRep/TopOpeBRep_vpr.cxx b/src/TopOpeBRep/TopOpeBRep_vpr.cxx
index 7beee0afa135a296e0eba388b60383f08eef04a1..81c2f329d0022496c795506e814d4508402eb7b0 100644 (file)
--- a/src/TopOpeBRep/TopOpeBRep_vpr.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_vpr.cxx
@@ -59,7 +59,10 @@ extern Standard_Boolean TopOpeBRepDS_GettraceDSF();
 extern Standard_Boolean TopOpeBRepDS_GettraceDSP();
 extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer i);
 extern Standard_Boolean TopOpeBRep_GettraceNVP(Standard_Integer a,Standard_Integer b,Standard_Integer c,Standard_Integer d,Standard_Integer e);
-extern Standard_Boolean GLOBAL_bvpr = Standard_False;void debvpr(){};
+
+Standard_Boolean GLOBAL_bvpr = Standard_False;
+
+void debvpr(){};
 void debvprmess(Standard_Integer f1,Standard_Integer f2,Standard_Integer il,Standard_Integer vp,Standard_Integer si)
 {cout<<"f1,f2,il,vp,si : "<<f1<<","<<f2<<","<<il<<","<<vp<<","<<si<<endl;cout.flush();debvpr();}
 void debpoint(Standard_Integer i) {cout<<"+ debpoint"<<i<<endl;}