0024129: Eliminate remaining compiler warnings in MSVC++ 2008 32 bit with warning level 4

List of resolved warnings:

c4063: Aspect.cdl; TObj_Application.cxx; PCDM.cdl; OpenGl_Workspace_5.cxx;
c4100: XDEDRAW.cxx; ViewerTest_ViewerCommands.cxx; TopOpeBRep_FacesFiller_1.cxx; TopClass_Classifier3d.gxx; TDataStd_ReferenceArray.cxx; QABugs_19.cxx; IntPatch_ImpImpIntersection_5.gxx; HLRTopoBRep_DSFiller.cxx; HLRBRep_Data.lxx; DPrsStd_AISPresentationCommands.cxx; BRepMesh_Delaun.cxx;
c4127: BOPTools_AlgoTools2D.cxx; MAT_Mat.gxx; GeomFill_SweepSectionGenerator.cxx; BRepMesh_Delaun.cxx;
c4189: IntCurveSurface_Inter.gxx; IGESToBRep_BRepEntity.cxx; BRepMesh_Delaun.cxx; BRepAlgo_Loop.cxx; IntStart_SearchOnBoundaries_1.gxx;
c4190: Plugin_Macro.hxx;
c4389: Visual3d_View.cxx; TopOpeBRep/TopOpeBRep_vpr.cxx; TDataStd_BooleanArray.cxx; IntPatch_ALine.cxx;
c4701: BRepAlgo.cxx;
c4702: MNaming_NamingRetrievalDriver_1.cxx; MNaming_NamingRetrievalDriver_2.cxx; BRepClass3d_SolidExplorer.cxx;
c4706: TestTopOpe_BOOP.cxx;

Additional fixes:
- old-style declarations of C functions in IGES and STEP parsers
- clean-up of debug code, fixes for building in Debug mode
- in BRepFill_TrimShellCorner.cxx, lines 878-9, wrong use of assignment instead of comparison fixed
- fix for Plugin_Macro reverted; warning 4190 disabled instead
- in IntPatch_ALine.cxx, line 520, wrong comparison of boolean with index fixed
- in InterfaceGraphic_Visual3d.hxx, field IsCustomMatrix made boolean
- in TopOpeBRepBuild_ShapeSet, obsolete (unused) methods removed

src/Aspect/Aspect.cdl

@@ -405,7 +405,8 @@ is
                                         IS_HOLLOW,
                                         IS_HATCH,
                                         IS_SOLID,
-                                        IS_HIDDENLINE
+                                        IS_HIDDENLINE,
+                                        IS_POINT
         end InteriorStyle;
         ---Purpose: Definition of interior types for primitive
         --          faces.
@@ -415,6 +416,7 @@ is
         --          IS_HATCH    display hatched with a hatch style.
         --          IS_SOLID    display the interior entirely filled.
         --          IS_HIDDENLINE       display in hidden lines removed.
+        --          IS_POINT            display only vertices.
         --
         ---Category: Enumerations
 

src/BOPTools/BOPTools_AlgoTools2D.cxx

@@ -294,22 +294,18 @@ static
       aUP1=aUPeriod+aDelta;
       //
       if (u2 > aUP2) {
-        for(k=1; 1; ++k) {
+        k=1;
+        do {
           aUx=u2-k*aUPeriod;
-          if (aUx < aUP1) {
+          iCnt = k++;
-            iCnt=k;
+        } while (aUx >= aUP1);
-            break;
-          }
-        }
       }
       else if (u2 < -aUP2) {
-        for(k=1; 1; ++k) {
+        k=1;
+        do {
           aUx=u2+k*aUPeriod;
-          if (aUx > -aUP1) {
+          iCnt = (k++) + 1;
-            iCnt=k+1;
+        } while (aUx <= -aUP1);
-            break;
-          }
-        }
       }
       du = ( mincond ) ? aUPeriod : -aUPeriod;
       du=iCnt*du;

src/BRepAlgo/BRepAlgo.cxx

@@ -291,7 +291,7 @@ TopoDS_Edge  BRepAlgo::ConcatenateWireC0(const TopoDS_Wire& aWire)
       FirstVertex = wexp.CurrentVertex();
     } else {
       Standard_Boolean isSameCurve = Standard_False;
-      Standard_Real NewFpar, NewLpar;
+      Standard_Real NewFpar = RealFirst(), NewLpar = RealLast();
       GeomAdaptor_Curve GAprevcurve(CurveSeq.Last());
 
       if (aCurve == CurveSeq.Last()) {

src/BRepAlgo/BRepAlgo_Loop.cxx

@@ -50,7 +50,7 @@
 #ifdef DRAW
 #include <DBRep.hxx>
 #endif
-#ifdef DEB
+#ifdef DEBUG_ALGO
 Standard_Boolean AffichLoop  = Standard_False;
 Standard_Integer NbLoops     = 0;
 Standard_Integer NbWires     = 1;
@@ -189,7 +189,7 @@ static TopoDS_Vertex  UpdateClosedEdge(const TopoDS_Edge&         E,
   }
   if (OnStart && OnEnd) {
     if (!VB[0].IsSame(VB[1])) {
-#ifdef DEB
+#ifdef DEBUG_ALGO
       if (AffichLoop)
 	cout <<"Two different vertices on the closing vertex"<<endl;
 #endif
@@ -306,7 +306,7 @@ static Standard_Boolean  SelectEdge(const TopoDS_Face&    F,
 {
   TopTools_ListIteratorOfListOfShape itl;
   NE.Nullify();
-#ifdef DEB  
+#ifdef DEBUG_ALGO  
   if (AffichLoop) {
     if ( LE.Extent() > 2) {
       cout <<"vertex on more than 2 edges in a face."<<endl;
@@ -507,14 +507,14 @@ void BRepAlgo_Loop::Perform()
   TopoDS_Vertex                                       V1,V2;
   Standard_Boolean                                    YaCouture = Standard_False;
 
-#ifdef DEB
+#ifdef DEBUG_ALGO
   if (AffichLoop) {
     cout <<"NewLoop"<<endl;
-    Standard_Integer NbEdges = 1;
     NbLoops++;
 #ifdef DRAW
     sprintf(name,"FLoop_%d",NbLoops);
     DBRep::Set(name,myFace);
+    Standard_Integer NbEdges = 1;
 #endif
     for (Mapit.Initialize(myVerOnEdges); Mapit.More(); Mapit.Next()) { 
       const TopoDS_Edge& E = TopoDS::Edge(Mapit.Key());
@@ -664,7 +664,7 @@ void BRepAlgo_Loop::Perform()
 
     if (VF.IsSame(CV) && SamePnt2d(VF,EF,CE,myFace))
       myNewWires.Append (NW);
-#ifdef DEB
+#ifdef DEBUG_ALGO
     else {
       cout <<"BRepAlgo_Loop: Open Wire"<<endl;
       if (AffichLoop)

src/BRepCheck/BRepCheck_Wire.cxx

@@ -402,12 +402,17 @@ Standard_Boolean IsDistanceIn3DTolerance (const BRepAdaptor_Surface& /*aFaceSurf
 //function : IsDistanceIn3DTolerance
 //purpose  : 
 //=======================================================================
+static 
 Standard_Boolean IsDistanceIn2DTolerance (const BRepAdaptor_Surface& aFaceSurface,
                                           const gp_Pnt2d& thePnt,
                                           const gp_Pnt2d& thePntRef,
                                           const Standard_Real aTol3d,
+#ifdef DEB
                                           const Standard_Boolean PrintWarnings = Standard_True)
-  {
+#else
+                                          const Standard_Boolean = Standard_True)
+#endif
+{
   Standard_Real dumax = 0.01 * (aFaceSurface.LastUParameter() - aFaceSurface.FirstUParameter());
   Standard_Real dvmax = 0.01 * (aFaceSurface.LastVParameter() -	aFaceSurface.FirstVParameter());
   Standard_Real dumin = Abs(thePnt.X() - thePntRef.X());

src/BRepClass3d/BRepClass3d_SolidExplorer.cxx

@@ -584,7 +584,6 @@ Standard_Integer BRepClass3d_SolidExplorer::OtherSegment(const gp_Pnt& P,
     
     
   } //-- for(;;) { ...  } 
-  return 0;
 }
 
 //  Modified by skv - Thu Sep  4 12:30:14 2003 OCC578 Begin

src/BRepFill/BRepFill_TrimShellCorner.cxx

@@ -876,8 +876,8 @@ Standard_Boolean SplitUEdges(const Handle(TopTools_HArray2OfShape)&     theUEdge
         //const BOPTools_VVInterference& aVV = aVVs(vvit);
         const BOPDS_InterfVV& aVV = aVVs(vvit);
 
-        if(((vindex1 == aVV.Index1()) && (vindex2 = aVV.Index2())) ||
+        if(((vindex1 == aVV.Index1()) && (vindex2 == aVV.Index2())) ||
-           ((vindex1 == aVV.Index2()) && (vindex2 = aVV.Index1()))) {
+           ((vindex1 == aVV.Index2()) && (vindex2 == aVV.Index1()))) {
 
           if(!aVV.HasIndexNew()) {
             continue;

src/BRepMesh/BRepMesh_Delaun.cxx

@@ -589,7 +589,7 @@ Standard_Boolean BRepMesh_Delaun::isBoundToFrontier(
 //=======================================================================
 void BRepMesh_Delaun::cleanupMesh()
 {
-  while ( Standard_True )
+  for(;;)
   {
     BRepMesh_MapOfIntegerInteger aLoopEdges( 10, myMeshData->Allocator() );
     NCollection_Map<Standard_Integer> aDelTriangles;
@@ -2046,7 +2046,7 @@ void  BRepMesh_Delaun::AddVertices( BRepMesh_Array1OfVertexOfDelaun& theVertices
 //function : UseEdge
 //purpose  : Modify mesh to use the edge. Return True if done
 //=======================================================================
-Standard_Boolean BRepMesh_Delaun::UseEdge( const Standard_Integer theIndex )
+Standard_Boolean BRepMesh_Delaun::UseEdge( const Standard_Integer /*theIndex*/ )
 {
   /*
   const BRepMesh_PairOfIndex& aPair = myMeshData->ElemConnectedTo( theIndex );
@@ -2459,10 +2459,6 @@ Standard_Real BRepMesh_Delaun::polyArea( const TColStd_SequenceOfInteger& thePol
   {
     return aArea;
   }
-
-  Standard_Integer aEndIndex = (theEndIndex > aPolyLen) ? 
-    aPolyLen : theEndIndex;
-
   Standard_Integer aCurEdgeInfo = thePolygon( theStartIndex );
   Standard_Integer aCurEdgeId   = Abs( aCurEdgeInfo );
   const BRepMesh_Edge* aCurEdge = &GetEdge( aCurEdgeId );

src/BRepOffset/BRepOffset_Inter2d.cxx

@@ -298,7 +298,6 @@ static void EdgeInter(const TopoDS_Face&              F,
     return;
 
   Standard_Real f[3],l[3];
-  Standard_Real MilTol2 = 1000*Tol*Tol;
   Standard_Real TolDub = 1.e-7;
   Standard_Integer i;
 
@@ -401,6 +400,7 @@ static void EdgeInter(const TopoDS_Face&              F,
 	      cout << "out of limit"<<endl;
 	      cout<<"aT2 = "<<aT2<<", f[2] = "<<f[2]<<", l[2] = "<<l[2]<<endl;
 	    }
+          Standard_Real MilTol2 = 1000*Tol*Tol;
 	  if (P1.SquareDistance(P) >  MilTol2 || P2.SquareDistance(P) > MilTol2 || P1.Distance(P2) > 2.*Tol)
 	    {
 	      cout << "Inter2d : Solution rejected "<<endl;
@@ -570,7 +570,6 @@ static void RefEdgeInter(const TopoDS_Face&              F,
     return;
 
   Standard_Real f[3],l[3];
-  Standard_Real MilTol2 = 1000*Tol*Tol;
   Standard_Real TolDub = 1.e-7;
   Standard_Integer i;
 
@@ -670,6 +669,7 @@ static void RefEdgeInter(const TopoDS_Face&              F,
 	  cout << "out of limit"<<endl;
 	  cout<<"aT2 = "<<aT2<<", f[2] = "<<f[2]<<", l[2] = "<<l[2]<<endl;
 	}
+      Standard_Real MilTol2 = 1000*Tol*Tol;
       if (P1.SquareDistance(P) >  MilTol2 || P2.SquareDistance(P) > MilTol2 || P1.Distance(P2) > 2.*Tol)
 	{
 	  cout << "Inter2d : Solution rejected"<<endl;

src/BRepOffset/BRepOffset_MakeOffset.cxx

@@ -129,7 +129,7 @@
 #endif
 #ifdef DEB
 #include <OSD_Chronometer.hxx>
-
+//#define DEB_VERB
   Standard_Boolean AffichInt2d = Standard_False;       
   Standard_Boolean AffichOffC  = Standard_False;       
   Standard_Boolean ChronBuild  = Standard_False;
@@ -3333,9 +3333,8 @@ void BRepOffset_MakeOffset::EncodeRegularity ()
     const TopTools_ListOfShape& LofOF    = myAsDes->Ascendant(ROE);
     
     if (LofOF.Extent() != 2) {
-#ifdef DEB
+#ifdef DEB_VERB
-      if ( Standard_False)
+    cout << " Edge shared by " << LofOF.Extent() << " Faces" << endl;
-	cout << " Edge shared by " << LofOF.Extent() << " Faces" << endl;
 #endif
       continue;
     }

src/BRepTools/BRepTools_NurbsConvertModification.cxx

@@ -587,8 +587,6 @@ Standard_Boolean BRepTools_NurbsConvertModification::NewCurve2d
       return Standard_True;
     }
   }
-  Curve2d = C2d;
-  return Standard_True;
 }
 
 //=======================================================================

src/BSplSLib/BSplSLib.cxx

@@ -57,7 +57,6 @@ struct BSplSLib_DataContainer
         VDegree > BSplCLib::MaxDegree() || BSplCLib::MaxDegree() > 25,
         "BSplSLib: bspline degree is greater than maximum supported");
   }
-
   Standard_Real poles[4*(25+1)*(25+1)];
   Standard_Real knots1[2*25];
   Standard_Real knots2[2*25];

src/BinDrivers/BinDrivers.cxx

@@ -32,11 +32,6 @@
 #include <BinDrivers_DocumentRetrievalDriver.hxx>
 #include <Plugin_Macro.hxx>
 
-// avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
-#pragma warning(4:4190)
-#endif
-
 static Standard_GUID BinStorageDriver  ("03a56835-8269-11d5-aab2-0050044b1af1");
 static Standard_GUID BinRetrievalDriver("03a56836-8269-11d5-aab2-0050044b1af1");
 
@@ -95,4 +90,8 @@ TCollection_AsciiString BinDrivers::StorageVersion()
 {
   return BinLDrivers::StorageVersion();
 }
+
+#ifdef _MSC_VER
+#pragma warning(disable:4190) /* disable warning on C++ type returned by C function; should be OK for C++ usage */
+#endif
 PLUGIN(BinDrivers)

src/BinLDrivers/BinLDrivers.cxx

@@ -29,11 +29,6 @@
 #include <BinLDrivers_DocumentRetrievalDriver.hxx>
 #include <Plugin_Macro.hxx>
 
-// avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
-#pragma warning(4:4190)
-#endif
-
 static Standard_GUID BinLStorageDriver  ("13a56835-8269-11d5-aab2-0050044b1af1");
 static Standard_GUID BinLRetrievalDriver("13a56836-8269-11d5-aab2-0050044b1af1");
 #define CURRENT_DOCUMENT_VERSION 7
@@ -94,4 +89,8 @@ TCollection_AsciiString BinLDrivers::StorageVersion()
   TCollection_AsciiString aVersionStr (CURRENT_DOCUMENT_VERSION);
   return aVersionStr;
 }
+
+#ifdef _MSC_VER
+#pragma warning(disable:4190) /* disable warning on C++ type returned by C function; should be OK for C++ usage */
+#endif
 PLUGIN(BinLDrivers)

src/BinTObjDrivers/BinTObjDrivers.cxx

@@ -31,11 +31,6 @@
 #include <BinTObjDrivers_XYZDriver.hxx>
 #include <Plugin_Macro.hxx>
 
-// avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
-#pragma warning(4:4190)
-#endif
-
 static Standard_GUID BinStorageDriver  ("f78ff4a2-a779-11d5-aab4-0050044b1af1");
 static Standard_GUID BinRetrievalDriver("f78ff4a3-a779-11d5-aab4-0050044b1af1");
 
@@ -74,4 +69,7 @@ void BinTObjDrivers::AddDrivers (const Handle(BinMDF_ADriverTable)& aDriverTable
   aDriverTable -> AddDriver (new BinTObjDrivers_IntSparseArrayDriver (aMsgDrv));
 }
 
+#ifdef _MSC_VER
+#pragma warning(disable:4190) /* disable warning on C++ type returned by C function; should be OK for C++ usage */
+#endif
 PLUGIN(BinTObjDrivers)

src/BinXCAFDrivers/BinXCAFDrivers.cxx

@@ -27,15 +27,9 @@
 #include <BinDrivers.hxx>
 #include <Plugin_Macro.hxx>
 
-// avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
-#pragma warning(4:4190)
-#endif
-
 static Standard_GUID BinXCAFStorageDriver  ("a78ff496-a779-11d5-aab4-0050044b1af1");
 static Standard_GUID BinXCAFRetrievalDriver("a78ff497-a779-11d5-aab4-0050044b1af1");
 
-
 //=======================================================================
 //function :
 //purpose  : 
@@ -77,4 +71,7 @@ Handle(BinMDF_ADriverTable) BinXCAFDrivers::AttributeDrivers(const Handle(CDM_Me
   return aTable;
 }
 
+#ifdef _MSC_VER
+#pragma warning(disable:4190) /* disable warning on C++ type returned by C function; should be OK for C++ usage */
+#endif
 PLUGIN(BinXCAFDrivers)

src/DPrsStd/DPrsStd_AISPresentationCommands.cxx

@@ -68,7 +68,7 @@
 //purpose  : DDisplay (DOC,entry, not_update)
 //=======================================================================
 
-static Standard_Integer DPrsStd_AISDisplay (Draw_Interpretor& di,
+static Standard_Integer DPrsStd_AISDisplay (Draw_Interpretor&,
 					  Standard_Integer nb, 
 					  const char** arg) 
 {   

src/Draw/Draw_Window.cxx

@@ -2042,18 +2042,14 @@ Standard_Boolean Draw_Interprete (const char*);
 static DWORD WINAPI readStdinThreadFunc(VOID)
 {
   if (!Draw_IsConsoleSubsystem) return 1;
-
   for(;;) {
     while (console_semaphore != WAIT_CONSOLE_COMMAND)
       Sleep(100);
-    //if (gets(console_command))
+      if (fgets(console_command,COMMAND_SIZE,stdin))
-	if (fgets(console_command,COMMAND_SIZE,stdin))
       {
         console_semaphore = HAS_CONSOLE_COMMAND;
       }
-
   }
-  return 0;
 }
 
 /*--------------------------------------------------------*\

src/FWOSDriver/FWOSDriver.cxx

@@ -25,9 +25,8 @@
 
 #include <Plugin_Macro.hxx>
 
-// avoid warnings on 'extern "C"' functions returning C++ classes
+#ifdef _MSC_VER
-#ifdef WNT
+#pragma warning(disable:4190) /* disable warning on C++ type returned by C function; should be OK for C++ usage */
-#pragma warning(4:4190)
 #endif
 
 PLUGIN(FWOSDriver)

src/Geom2dAPI/Geom2dAPI_InterCurveCurve.cxx

@@ -221,10 +221,8 @@ void Geom2dAPI_InterCurveCurve::Segment
 //purpose  : 
 //=======================================================================
 
-void Geom2dAPI_InterCurveCurve::Segment
+void Geom2dAPI_InterCurveCurve::Segment (const Standard_Integer Index,
-  (const Standard_Integer      Index,
+                                         Handle(Geom2d_Curve)&) const 
-         Handle(Geom2d_Curve)& //Curve1
-   ) const 
 {
   Standard_NotImplemented::Raise(" ");
 

src/GeomFill/GeomFill_SweepSectionGenerator.cxx

@@ -48,7 +48,7 @@
 static Standard_Boolean Affich     = Standard_False;
 static Standard_Integer NbSECTIONS = 0;
 #endif
-
+//#define GF_DEB
 //=======================================================================
 //function : GeomFill_SweepSectionGenerator
 //purpose  : 
@@ -628,7 +628,7 @@ void GeomFill_SweepSectionGenerator::Section
 		    gp_Vec(PPath,P1));
       Angle = ElCLib::CircleParameter(Axis,P2);
     }
-#ifdef DEB
+#ifdef GF_DEB
     if (Standard_False) {
       gp_Vec dummyD1 = myAdpPath->DN(U,1);
       gp_Vec dummyTg = Axis.Direction();

src/Graphic3d/Graphic3d_MarkerImage.cxx

@@ -181,10 +181,10 @@ const Handle(Image_PixMap)& Graphic3d_MarkerImage::GetImageAlpha()
       myImageAlpha->InitZero (Image_PixMap::ImgGray, myImage->Width(), myImage->Height());
       myImageAlpha->SetTopDown (Standard_False);
       Quantity_Parameter anAlpha;
-      for (Standard_Integer aRowIter = 0; aRowIter < myImage->Height(); aRowIter++)
+      for (Standard_Size aRowIter = 0; aRowIter < myImage->Height(); aRowIter++)
       {
         Standard_Byte* anImageRow = myImageAlpha->ChangeRow (aRowIter);
-        for (Standard_Integer aColumnIter = 0; aColumnIter < myImage->Width(); aColumnIter++)
+        for (Standard_Size aColumnIter = 0; aColumnIter < myImage->Width(); aColumnIter++)
         {
           myImage->PixelColor (aColumnIter, aRowIter, anAlpha);
           anImageRow[aColumnIter] = Standard_Byte (255.0 * anAlpha);

src/HLRBRep/HLRBRep_Data.cxx

@@ -1625,9 +1625,12 @@ TopAbs_State HLRBRep_Data::Compare (const Standard_Integer E,
 //purpose  : 
 //=======================================================================
 
-Standard_Boolean
+
-HLRBRep_Data::OrientOutLine (const Standard_Integer I,
+#ifdef DEB
-			     HLRBRep_FaceData& FD)
+Standard_Boolean HLRBRep_Data::OrientOutLine (const Standard_Integer I, HLRBRep_FaceData& FD)
+#else
+Standard_Boolean HLRBRep_Data::OrientOutLine (const Standard_Integer, HLRBRep_FaceData& FD)
+#endif
 {
   const Handle(HLRAlgo_WiresBlock)& wb = FD.Wires();
   Standard_Integer nw = wb->NbWires();

src/HLRBRep/HLRBRep_Data.lxx

@@ -137,6 +137,6 @@ inline HLRAlgo_Interference & HLRBRep_Data::Interference ()
 //=======================================================================
 
 inline Standard_Boolean 
-HLRBRep_Data::EdgeOfTheHidingFace (const Standard_Integer E,
+HLRBRep_Data::EdgeOfTheHidingFace (const Standard_Integer,
 				   const HLRBRep_EdgeData& ED) const
 { return ED.HideCount() == myHideCount-1; }

src/HLRBRep/HLRBRep_LineTool.lxx

@@ -162,11 +162,11 @@ inline Standard_Integer HLRBRep_LineTool::NbSamples(const gp_Lin&,
 { return 3; }
 
 // modified by NIZHNY-MKK  Tue Nov  1 18:49:28 2005
-inline void HLRBRep_LineTool::SamplePars (const gp_Lin& C,
+inline void HLRBRep_LineTool::SamplePars (const gp_Lin&,
 					  const Standard_Real U0,
 					  const Standard_Real U1,
-					  const Standard_Real Defl,
+					  const Standard_Real,
-					  const Standard_Integer NbMin,
+					  const Standard_Integer,
 					  Handle(TColStd_HArray1OfReal)& Pars) {
 
   Pars = new TColStd_HArray1OfReal(1, 3);

src/HLRBRep/HLRBRep_PolyAlgo.cxx

@@ -3150,7 +3150,11 @@ UpdateAroundNode (const Standard_Integer iNode,
 //=======================================================================
 
 void 
+#ifdef DEB
 HLRBRep_PolyAlgo::OrientTriangle(const Standard_Integer iTri,
+#else
+HLRBRep_PolyAlgo::OrientTriangle(const Standard_Integer,
+#endif
 				 const Standard_Address Tri1Indices,
 				 const Standard_Address Nod1Indices,
 				 const Standard_Address Nod1RValues,

src/HLRTopoBRep/HLRTopoBRep_DSFiller.cxx

@@ -68,7 +68,7 @@
 
 static Standard_Boolean IntLineRisesFromRegularity(const TopoDS_Edge& anIntLine,
                                                    const TopoDS_Edge& anEdge,
-                                                   const TopoDS_Face& aFace,
+                                                   const TopoDS_Face&,
                                                    const TopTools_ListOfShape& aList)
 {
   TopoDS_Vertex Ver [2];

src/IGESFile/analiges.c

@@ -23,7 +23,7 @@
 
 void iges_newparam(int typarg,int longval, char *parval);
 void iges_newpart(int numsec);
-void iges_curpart(int numsec,int dnum);
+void iges_curpart(int dnum);
 void iges_addparam(int longval, char* parval);
 
 #define ArgVide 0
@@ -55,8 +55,7 @@ static int bases[] =
 /*      Utilitaire decodant un nombre en format fixe dans une ligne
 	Il part de "depuis" inclus (debut ligne = 0) et prend "tant" caracteres
 	Valeur lue en retour de fonction   */
-static int IGES_decode(ligne,depuis,tant)
+static int IGES_decode (char* ligne, int depuis, int tant)
-char* ligne; int depuis, tant;
 {
   int val = 0; int i;
   int depart = depuis+tant-1;
@@ -71,8 +70,7 @@ char* ligne; int depuis, tant;
 }
 
 /*   Recopie d'une chaine de caracteres de longueur fixe (close par \0)  */
-void IGES_copstr(ligne,depuis,tant,dans)
+void IGES_copstr(char *ligne, int depuis, int tant, char* dans)
-char *ligne; int depuis, tant; char* dans;
 {
   int i;
   for (i = 0; i < tant; i ++) { dans[i] = ligne[depuis+i]; }
@@ -80,8 +78,7 @@ char *ligne; int depuis, tant; char* dans;
 }
 
 /*                   Analyse section D                */
-void iges_Dsect (Dstat,numsec,ligne)
+void iges_Dsect (int *Dstat, int numsec, char* ligne)
-int *Dstat,numsec; char* ligne;
 {
   struct dirpart *curp;
   if (*Dstat == 0) {
@@ -125,15 +122,16 @@ int *Dstat,numsec; char* ligne;
 /*     Lecture section P : preanalyse
        Extraction du numero D et troncature a 64 caracteres  */
 
-void iges_Psect(Pstat,numsec,ligne)
+void iges_Psect (int numsec, char ligne[80])
-int *Pstat; int numsec; char ligne[80];
 {
   int dnum;
   dnum = atoi(&ligne[65]);
   ligne[64] = '\0';
-  iges_curpart(numsec,dnum);
+  iges_curpart(dnum);
 #ifdef VERIFPRINT
   printf("Entite P:%d ->D:%d,soit %s\n",numsec,dnum,ligne);
+#else
+  (void)numsec; // just to avoid warning
 #endif
 }
 
@@ -154,8 +152,7 @@ static int typarg;
 /*  +  definitions des types de parametres en tete  */
 
 
-void iges_param(Pstat,ligne,c_separ,c_fin,lonlin)
+void iges_param (int *Pstat, char *ligne, char c_separ, char c_fin, int lonlin)
-int *Pstat; char c_separ,c_fin, *ligne; int lonlin;
 {
   int i,i0,j; char param[80]; char unpar;
   if (*Pstat == 0) reste  = 0;

src/IGESFile/igesread.c

@@ -34,7 +34,7 @@ int  iges_lire (FILE* lefic, int *numsec, char ligne[100], int modefnes);
 void iges_newparam(int typarg,int longval, char *parval);
 void iges_param(int *Pstat,char *ligne,char c_separ,char c_fin,int lonlin);
 void iges_Dsect (int *Dstat,int numsec,char* ligne);
-void iges_Psect(int *Pstat,int numsec,char ligne[80]);
+void iges_Psect(int numsec,char ligne[80]);
 
 
 
@@ -56,8 +56,7 @@ void iges_Psect(int *Pstat,int numsec,char ligne[80]);
 static  char sects [] = " SGDPT ";
 
 
-int igesread(nomfic,lesect,modefnes)
+int igesread (char* nomfic, int lesect[6], int modefnes)
-char* nomfic; int lesect[6]; int modefnes;
 {
   /* MGE 16/06/98 */
 
@@ -113,7 +112,7 @@ char* nomfic; int lesect[6]; int modefnes;
     }
     if (i == 3) iges_Dsect(&Dstat,numsec,ligne);    /* Directory  (Dsect) */
     if (i == 4) {                                   /* Parametres (Psect) */
-      iges_Psect(&Pstat,numsec,ligne);
+      iges_Psect(numsec,ligne);
       for (;;) {
 	iges_param(&Pstat,ligne,c_separ,c_fin,64);
 	if (Pstat != 2) break;

src/IGESFile/igesread.h

@@ -56,7 +56,7 @@ extern "C" {
   void iges_newparam(int typarg,int longval, char *parval);
   void iges_param(int *Pstat,char *ligne,char c_separ,char c_fin,int lonlin);
   void iges_Dsect (int *Dstat,int numsec,char* ligne);
-  void iges_Psect(int *Pstat,int numsec,char ligne[80]);
+  void iges_Psect(int numsec,char ligne[80]);
 
   /* MGE 20/07/98 */
   void IGESFile_Check2 (int mode,char * code, int num, char * str);

src/IGESFile/structiges.c

@@ -92,8 +92,7 @@ static struct dirpage *curpage;
 /*    Utilitaire : Reservation de caracteres
       Remplace suite de mini-malloc par gestion de page   */
 
-char* iges_newchar(newtext,lentext)
+char* iges_newchar (char* newtext, int lentext)
-char* newtext; int lentext;
 {
   int i, lnt;
   if ((lnt = onecarpage->used) > Maxcar-lentext-1) {  /* allouer nouvelle page */
@@ -143,8 +142,7 @@ void iges_setglobal()
 
 /*   Definition et Selection d'un nouveau dirpart   */
 
-void iges_newpart(numsec)
+void iges_newpart(int numsec)
-int numsec;
 {
   if (curpage->used >= Maxparts) {
     struct dirpage* newpage;
@@ -163,8 +161,7 @@ int numsec;
 
 /*   Selection du dirpart dnum, correspond a numsec en Psect   */
 
-void iges_curpart(numsec,dnum)
+void iges_curpart (int dnum)
-int numsec,dnum;
 {
   if (curp == NULL) return;
   if (dnum == curp->numpart) return;
@@ -198,8 +195,7 @@ int numsec,dnum;
 /*   (manque la gestion d'un Hollerith sur plusieurs lignes)   */
 
 /*   longval : longueur de parval, incluant le zero final   */
-void iges_newparam(typarg,longval,parval)
+void iges_newparam (int typarg, int longval, char *parval)
-int typarg,longval; char *parval;
 {
   char *newval;
   if (curlist == NULL) return;      /*  non defini : abandon  */
@@ -224,8 +220,7 @@ int typarg,longval; char *parval;
 }
 
 /*     Complement du parametre courant (cf Hollerith sur +ieurs lignes)    */
-void iges_addparam(longval,parval)
+void iges_addparam (int longval, char* parval)
-int longval; char* parval;
 {
   char *newval, *oldval; int i,long0;
   if (longval <= 0) return;
@@ -243,8 +238,7 @@ int longval; char* parval;
 /*               Relecture : Initialiation              */
 /*  entites relues par suite de lirpart + {lirparam}
     lirparam initiaux : pour relire le demarrage (start section)   */
-void iges_stats(nbpart, nbparam)
+void iges_stats (int* nbpart, int* nbparam)
-int* nbpart; int* nbparam;
 {
   curpage  = firstpage; curnumpart = 0;
   curlist  = starts;
@@ -253,13 +247,10 @@ int* nbpart; int* nbparam;
   *nbparam = nbparams;
 }
 
-/*               Lecture d'une part : retour = n0 section, 0 si fin         */
+/*      Lecture d'une part : retour = n0 section, 0 si fin         */
-int iges_lirpart
+/* \par tabval tableau recepteur des entiers (reserver 17 valeurs) */
-  (tabval, res1,res2,nom,num, nbparam)
+/* \par res1 res2 nom num char : transmis a part */
-
+int iges_lirpart (int* *tabval, char* *res1, char* *res2, char* *nom, char* *num, int *nbparam)
-int* *tabval;        /* tableau recepteur des entiers (reserver 17 valeurs) */
-char* *res1; char* *res2; char* *nom; char* *num;  /* char : transmis a part */
-int *nbparam;
 {
   if (curpage == NULL) return 0;
   curp = &(curpage->parts[curnumpart]);
@@ -283,8 +274,7 @@ void iges_nextpart()
 }
 
 /*               Lecture parametre + passage au suivant                   */
-int iges_lirparam(typarg,parval)    /* renvoie 0 si fin de liste, 1 sinon */
+int iges_lirparam (int *typarg, char* *parval)    /* renvoie 0 si fin de liste, 1 sinon */
-int *typarg; char* *parval;
 {
   if (curparam == NULL) return 0;
   *typarg = curparam->typarg;
@@ -295,8 +285,7 @@ int *typarg; char* *parval;
 
 /*               Fin pour ce fichier : liberer la place                  */
 /*    mode = 0 : tout; 1 : parametres; 2 : caracteres  */
-void iges_finfile(mode)
+void iges_finfile (int mode)
-int mode;
 {
   struct dirpage* oldpage;
   if (mode == 0 || mode == 2) {  free (starts);  free (header);  }

src/IGESToBRep/IGESToBRep_BRepEntity.cxx

@@ -93,10 +93,6 @@
 #include <IGESToBRep_ToolContainer.hxx>
 #include <Message_ProgressSentry.hxx>
 
-// mjm le 10/10/96 on force la continuity a 0 en attendant de pouvoir
-// travailler sur wire en non plus edge.
-
-
 //=======================================================================
 //function : IGESToBRep_BRepEntity
 //purpose  : 
@@ -466,7 +462,6 @@ TopoDS_Shape IGESToBRep_BRepEntity::TransferFace
     TopoDS_Face F;
     Handle(IGESData_IGESEntity) surf         = start->Surface();
     Standard_Integer            nbloops      = start->NbLoops();
-    Standard_Boolean            hasouterloop = start->HasOuterLoop();
     IGESToBRep_TopoSurface TS(*this);
 
     // surface

src/Image/Image_AlienPixMap.cxx

@@ -143,13 +143,13 @@ bool Image_AlienPixMap::InitWrapper (ImgFormat,
 // function : InitTrash
 // purpose  :
 // =======================================================================
+#ifdef HAVE_FREEIMAGE
 bool Image_AlienPixMap::InitTrash (ImgFormat           thePixelFormat,
                                    const Standard_Size theSizeX,
                                    const Standard_Size theSizeY,
-                                   const Standard_Size theSizeRowBytes)
+                                   const Standard_Size /*theSizeRowBytes*/)
 {
   Clear();
-#ifdef HAVE_FREEIMAGE
   FREE_IMAGE_TYPE aFormatFI = convertToFreeFormat (thePixelFormat);
   int aBitsPerPixel = (int )Image_PixMap::SizePixelBytes (thePixelFormat) * 8;
   if (aFormatFI == FIT_UNKNOWN)
@@ -176,10 +176,16 @@ bool Image_AlienPixMap::InitTrash (ImgFormat           thePixelFormat,
   // assign image after wrapper initialization (virtual Clear() called inside)
   myLibImage = anImage;
   return true;
-#else
-  return Image_PixMap::InitTrash (thePixelFormat, theSizeX, theSizeY, theSizeRowBytes);
-#endif
 }
+#else
+bool Image_AlienPixMap::InitTrash (ImgFormat           thePixelFormat,
+                                   const Standard_Size theSizeX,
+                                   const Standard_Size theSizeY,
+                                   const Standard_Size theSizeRowBytes)
+{
+  return Image_PixMap::InitTrash (thePixelFormat, theSizeX, theSizeY, theSizeRowBytes);
+}
+#endif
 
 // =======================================================================
 // function : InitCopy

src/IntCurveSurface/IntCurveSurface_Inter.gxx

@@ -78,7 +78,7 @@
 #include <TColStd_HArray1OfReal.hxx>
 #include <Adaptor3d_TopolTool.hxx>
 #include <ElCLib.hxx>
-
+//#define ICS_DEB
 static 
   void EstLimForInfExtr(const gp_Lin&   Line,
 			const TheSurface& surface, 
@@ -315,7 +315,9 @@ 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 ICS_DEB
   Standard_Integer NbOnC  = TheCurveTool::NbIntervals(curve,GeomAbs_C2);
+#endif
   Standard_Real U0,U1,V0,V1; 
   
   if(NbUOnS > 1) { 

src/IntPatch/IntPatch_ALine.cxx

@@ -518,12 +518,8 @@ void IntPatch_ALine::ComputeVertexParameters(const Standard_Real Tol) {
     if(   (VTX0.IsOnDomS1() == Standard_False)
        && (VTX0.IsOnDomS2() == Standard_False)) { 
       svtx.Remove(nbvtx);
-#ifndef DEB
+      if(lapt) { 
-      if((signed)lapt == nbvtx) { 
+        indl--;
-#else
-      if(lapt == nbvtx) { 
-#endif
-	indl--;
       }
     }
   }

src/IntPatch/IntPatch_ImpImpIntersection_5.gxx

@@ -568,13 +568,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);
@@ -669,11 +662,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;

src/IntStart/IntStart_SearchOnBoundaries_1.gxx

@@ -269,7 +269,6 @@ void BoundedArc (const TheArc& A,
       
       if (!SolAgain.IsDone()) {Standard_Failure::Raise();}
       
-      Standard_Integer Nbp_again = SolAgain.NbPoints();
       Standard_Integer Nbi_again = SolAgain.NbIntervals();
       
       if (Nbi_again > 0)
@@ -826,7 +825,7 @@ void PointProcess (const gp_Pnt& Pt,
 //function : IsRegularity
 //purpose  : 
 //=======================================================================
-Standard_Boolean IsRegularity(const TheArc& A,
+Standard_Boolean IsRegularity(const TheArc&,
                               const Handle(TheTopolTool)& aDomain)
 {
   Standard_Address anEAddress=aDomain->Edge();

src/InterfaceGraphic/InterfaceGraphic_Visual3d.hxx

@@ -98,9 +98,10 @@ typedef struct {
   float ViewScaleY;
   float ViewScaleZ;
 
-  int   IsCustomMatrix;
   float ModelViewMatrix[4][4];
 
+  unsigned IsCustomMatrix;
+
 } CALL_DEF_VIEWORIENTATION;
 
 
@@ -120,9 +121,10 @@ typedef struct {
     float um, vm, uM, vM;
   } WindowLimit;
 
-  int   IsCustomMatrix;
   float ProjectionMatrix[4][4];
 
+  unsigned IsCustomMatrix;
+
 } CALL_DEF_VIEWMAPPING;
 
 /* REPERAGE */

src/MAT/MAT_Mat.gxx

@@ -267,7 +267,7 @@ void MAT_Mat::CreateMat(Tool& atool)
     //---------------------------------------------------
     // boucle 2 Tant qu il y a des bisectrices a effacer.
     //---------------------------------------------------
-    while(Standard_True) {
+    for(;;) {
       NbIterBis++;
 
       noofbisectorstoremove = 0;
@@ -339,7 +339,7 @@ void MAT_Mat::CreateMat(Tool& atool)
 	// <bisectortwotoremove(i).
 	//---------------------------------------------------------------
 
-	while(Standard_True){
+	for(;;){
 
 #ifdef DEBUG_Mat
 	  atool.Dump(bisectortoremove->BisectorNumber(),0);

src/MNaming/MNaming_NamingRetrievalDriver_1.cxx

@@ -52,10 +52,8 @@ static TopAbs_ShapeEnum IntegerToShapeEnum (const Standard_Integer I)
     case  5 : return TopAbs_WIRE;
     case  6 : return TopAbs_EDGE;
     case  7 : return TopAbs_VERTEX;
-      default :
+    default : return TopAbs_SHAPE;
-	return TopAbs_SHAPE;
     }
-  return TopAbs_SHAPE;
 }
 
 //=======================================================================

src/MNaming/MNaming_NamingRetrievalDriver_2.cxx

@@ -51,10 +51,8 @@ static TopAbs_ShapeEnum IntegerToShapeEnum (const Standard_Integer I)
     case  5 : return TopAbs_WIRE;
     case  6 : return TopAbs_EDGE;
     case  7 : return TopAbs_VERTEX;
-      default :
+    default : return TopAbs_SHAPE;
-	return TopAbs_SHAPE;
     }
-  return TopAbs_SHAPE;
 }
 
 //=======================================================================

src/OpenGl/OpenGl_GraphicDriver_3.cxx

@@ -69,9 +69,9 @@ void OpenGl_GraphicDriver::MarkerContextGroup (const Graphic3d_CGroup& theCGroup
 
 void OpenGl_GraphicDriver::MarkerContextGroup (const Graphic3d_CGroup& theCGroup,
                                                const Standard_Integer  theNoInsert,
-                                               const Standard_Integer  theMarkWidth,
+                                               const Standard_Integer  /*theMarkWidth*/,
-                                               const Standard_Integer  theMarkHeight,
+                                               const Standard_Integer  /*theMarkHeight*/,
-                                               const Handle(TColStd_HArray1OfByte)& theTexture)
+                                               const Handle(TColStd_HArray1OfByte)& /*theTexture*/)
 {
   if (!theCGroup.ContextMarker.IsDef)
   {

src/OpenGl/OpenGl_Workspace_5.cxx

@@ -516,7 +516,7 @@ const OpenGl_AspectFace* OpenGl_Workspace::AspectFace (const Standard_Boolean th
         glDisable (GL_POLYGON_STIPPLE);
         break;
       }
-      case 5: //szvgl - no corresponding enumeration item Aspect_IS_POINT // = 5
+      case Aspect_IS_POINT: //szvgl - no corresponding enumeration item Aspect_IS_POINT // = 5
       {
         glPolygonMode(GL_FRONT_AND_BACK,GL_POINT);
         break;

src/PCDM/PCDM.cdl

@@ -49,6 +49,7 @@ is
 	    RS_AlreadyRetrieved,
 	    RS_UnknownDocument,
 	    RS_WrongResource,
+	    RS_ReaderException,
 	    RS_NoModel
     end ReaderStatus;
     

src/QABugs/QABugs_19.cxx

@@ -682,7 +682,7 @@ static Standard_Integer OCC24019 (Draw_Interpretor& di, Standard_Integer argc, c
 //function : OCC11758
 //purpose  : 
 //=======================================================================
-static Standard_Integer OCC11758 (Draw_Interpretor& di, Standard_Integer n, const char** argv)
+static Standard_Integer OCC11758 (Draw_Interpretor& di, Standard_Integer n, const char**)
 {
   if (n != 1) return 1;
 

src/RWHeaderSection/RWHeaderSection_ReadWriteModule.cxx

@@ -62,20 +62,19 @@ return 0;
 }
 
 	// --- External Mapping Case Recognition ---
-
-Standard_Integer RWHeaderSection_ReadWriteModule::CaseStep
-	(const TColStd_SequenceOfAsciiString& types) const
-{
-
-  Standard_Integer NbComp = types.Length();
 #ifdef DEB
+Standard_Integer RWHeaderSection_ReadWriteModule::CaseStep (const TColStd_SequenceOfAsciiString& types) const
+{
+  Standard_Integer NbComp = types.Length();
   if (NbComp < 2) {
     cout << "Plex Instance illegal " << endl;
   }
-#endif
   return 0;
 }
-
+#else
+Standard_Integer RWHeaderSection_ReadWriteModule::CaseStep (const TColStd_SequenceOfAsciiString&) const
+{ return 0; }
+#endif
 
 	// --- External Mapping Recognition ---
 

src/STEPControl/STEPControl_ActorRead.cxx

@@ -135,6 +135,7 @@
 // Purpose: Use it in DEB mode to dump your shapes
 // ============================================================================
 
+#ifdef DEB
 static void DumpWhatIs(const TopoDS_Shape& S) {
 
   TopTools_MapOfShape aMapOfShape;
@@ -180,7 +181,7 @@ static void DumpWhatIs(const TopoDS_Shape& S) {
         nbVertexes++;
     }
   }
-  #ifdef DEB
+
   cout << "//What is?// NB COMPOUNDS: " << nbCompounds << endl;
   cout << "//What is?// NB SOLIDS: " << nbSolids << endl;
   cout << "//What is?// NB SHELLS: " << nbShells << endl;
@@ -190,8 +191,8 @@ static void DumpWhatIs(const TopoDS_Shape& S) {
   cout << "//What is?// NB WIRES: " << nbWires << endl;
   cout << "//What is?// NB EDGES: " << nbEdges << endl;
   cout << "//What is?// NB VERTEXES: " << nbVertexes << endl;
-  #endif
 }
+#endif
 
 namespace {
   // Set global var to inform outer methods that current representation item is non-manifold.

src/STEPControl/STEPControl_ActorWrite.cxx

@@ -124,6 +124,7 @@
 // Purpose: Use it in DEB mode to dump your shapes
 // ============================================================================
 
+#ifdef DEB
 static void DumpWhatIs(const TopoDS_Shape& S) {
 
   TopTools_MapOfShape aMapOfShape;
@@ -163,7 +164,7 @@ static void DumpWhatIs(const TopoDS_Shape& S) {
         nbVertexes++;
     }
   }
-  #ifdef DEB
+
   cout << "//What is?// NB SOLIDS: " << nbSolids << endl;
   cout << "//What is?// NB SHELLS: " << nbShells << endl;
   cout << "//What is?//    OPEN SHELLS: " << nbOpenShells << endl;
@@ -172,8 +173,8 @@ static void DumpWhatIs(const TopoDS_Shape& S) {
   cout << "//What is?// NB WIRES: " << nbWires << endl;
   cout << "//What is?// NB EDGES: " << nbEdges << endl;
   cout << "//What is?// NB VERTEXES: " << nbVertexes << endl;
-  #endif
 }
+#endif
 
 //=======================================================================
 // Function : IsManifoldShape

src/Standard/Standard_MMgrOpt.cxx

@@ -793,10 +793,10 @@ retry:
                                     PAGE_READWRITE,
                                     DWORD(AlignedSize / 0x80000000),
                                     DWORD(AlignedSize % 0x80000000), NULL); 
-    HANDLE * aMBlock = NULL;
+    HANDLE * aMBlock = (hMap && GetLastError() != ERROR_ALREADY_EXISTS ? 
+                        (HANDLE*)MapViewOfFile(hMap,FILE_MAP_WRITE,0,0,0) : NULL);
     // check for error and try allocating address space
-    if ( ! hMap || GetLastError() == ERROR_ALREADY_EXISTS ||
+    if ( ! aMBlock ) 
-         ! ((aMBlock = (HANDLE*)MapViewOfFile(hMap,FILE_MAP_WRITE,0,0,0))) ) 
     {
       // close handle if allocated
       if ( hMap ) 

src/StdDrivers/StdDrivers.cxx

@@ -30,11 +30,6 @@
 #include <Standard_GUID.hxx>
 #include <Plugin_Macro.hxx>
 
-// avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
-#pragma warning(4:4190)
-#endif
-
 static Standard_GUID StdStorageDriver     ("ad696000-5b34-11d1-b5ba-00a0c9064368");
 static Standard_GUID StdRetrievalDriver   ("ad696001-5b34-11d1-b5ba-00a0c9064368");
 static Standard_GUID StdSchemaID          ("ad696002-5b34-11d1-b5ba-00a0c9064368");
@@ -82,5 +77,9 @@ Handle(Standard_Transient) StdDrivers::Factory(const Standard_GUID& aGUID) {
   return t;
 }
 
+#ifdef _MSC_VER
+#pragma warning(disable:4190) /* disable warning on C++ type returned by C function; should be OK for C++ usage */
+#endif
+
 // Declare entry point PLUGINFACTORY
 PLUGIN(StdDrivers)

src/StdLDrivers/StdLDrivers.cxx

@@ -29,11 +29,6 @@
 #include <Standard_GUID.hxx>
 #include <Plugin_Macro.hxx>
 
-// avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
-#pragma warning(4:4190)
-#endif
-
 static Standard_GUID StdLStorageDriver     ("bd696000-5b34-11d1-b5ba-00a0c9064368");
 static Standard_GUID StdLRetrievalDriver   ("bd696001-5b34-11d1-b5ba-00a0c9064368");
 static Standard_GUID StdLSchemaID          ("bd696002-5b34-11d1-b5ba-00a0c9064368");
@@ -73,5 +68,9 @@ Handle(Standard_Transient) StdLDrivers::Factory(const Standard_GUID& aGUID) {
   return t;
 }
 
+#ifdef _MSC_VER
+#pragma warning(disable:4190) /* disable warning on C++ type returned by C function; should be OK for C++ usage */
+#endif
+
 // Declare entry point PLUGINFACTORY
 PLUGIN(StdLDrivers)

src/StepFile/recfile.pc

@@ -57,8 +57,7 @@
 
 static char txt_cart_p[]   = "CARTESIAN_POINT";
 
-void rec_restext(newtext,lentext)         /* destine a etre appele de l'exterieur */
+void rec_restext(char* newtext, int lentext)         /* destine a etre appele de l'exterieur */
-char* newtext; int lentext;
 {
   char *res, *text;
   if(strcmp(newtext,txt_cart_p)==0) {
@@ -83,18 +82,16 @@ char* newtext; int lentext;
   *res = '\0' ;
 }
 
-void rec_gettext(r)
+void rec_gettext(char* *r)
-char* *r ;
-{ *r = restext; }
 /*  Le resultat retourne (pointeur) est destine a etre inclus dans un struct */
+{ *r = restext; }
 
-void rec_settext(s)
+void rec_settext(char* s)
-char* s ;    /* substituer le texte courant par un autre deja alloue */
+/* substituer le texte courant par un autre deja alloue */
 {  restext = s ;  }
 
-char* rec_newtext(r)
+char* rec_newtext(char* r)
 /*  routine utilitaire creant une chaine dynamique a partir d'un char[]  */
-char* r ;
 {
   char* savrestext; char* s0;
   savrestext = restext;
@@ -173,8 +170,7 @@ static char idzero[]   = "#0";
 
 
 /*              Trace pour controle            */
-void recfile_modeprint(mode)
+void recfile_modeprint(int mode)
-int mode ;
 {  modeprint = mode;  }
 
 static int   lastno;
@@ -221,8 +217,8 @@ void rec_finfile()  {  }
 /*   GESTION DES RECORDS   */
 
 /*   ENREGISTRER UN RECORD (deja pret)    */
-void static rec_new(newrec)
+void static rec_new(struct rec* newrec)
-struct rec* newrec ;    /*  nouveau record a enregistrer  */
+/*  nouveau record a enregistrer  */
 {
  nbrec ++ ;
  if ( firstrec == NULL ) firstrec = newrec ;
@@ -231,8 +227,7 @@ struct rec* newrec ;    /*  nouveau record a enregistrer  */
 }
 
 /*  type du dernier argument lu  */
-void rec_typarg(argtype)
+void rec_typarg(int argtype)
-int argtype ;
 {  typarg = argtype;  }
 
 /*   ENREGISTRER UNE ENTITE (record courant)   */
@@ -392,8 +387,7 @@ void rec_deblist()
 
 
 /*   Affichage du contenu d'un record   */
-void rec_print(unrec)
+void rec_print(struct rec* unrec)
-struct rec* unrec ;
 {
  int numa = 0;  int numl = 0;  int argl = 0;
  if (unrec == NULL) {  printf ("Non defini\n") ; return;  }
@@ -490,8 +484,7 @@ void scope_fin()
      La liberation de la memoire est faite par lir_file_fin, en une fois
 */
 
-void lir_file_nbr(nbh,nbr,nbp)
+void lir_file_nbr(int* nbh, int* nbr, int* nbp)
-int* nbh; int* nbr; int* nbp;
 /*  initialise le traitement et retourne la taille du directory et du header */
 {
  currec = firstrec ;
@@ -499,8 +492,7 @@ int* nbh; int* nbr; int* nbp;
  *nbh = nbhead;  *nbr = nbrec;  *nbp = nbpar;
 }
 
-void lir_file_fin(mode)
+void lir_file_fin(int mode)
-int mode;
 /*  fin du traitement : regroupe les liberations de memoire en une phase  */
 /*  mode = 1 : rec+arg. 2 : carpage; 3 : 1+2  */
 {
@@ -538,10 +530,9 @@ int mode;
   }
 }
 
-int lir_file_rec(ident,type,nbarg)
+int lir_file_rec(char* *ident, char* *type, int *nbarg)
 /*   retourne les parametres du record courant
      retour de fonction ; 1 si ok, 0 si liste epuisee   */
-char* *ident ; char* *type ; int *nbarg ;
 {
  if (currec == NULL) return (0) ;
 /*                                   rec_check(2) ;    */
@@ -560,8 +551,7 @@ void lir_file_finrec()
 /*                                   rec_check(2) ;   */
 }
 
-int lir_file_arg(type,val)
+int lir_file_arg(int* type, char* *val)
-int* type ; char* *val ;
 /*  lit l'argument courant (au debut le 1er), fait le menage, prepare suivant
     retourne 1 si ok, 0 si c'est fini
     attention, suppose que nbarg > 0 ... (bref, pas de protection)   */
@@ -579,8 +569,8 @@ int* type ; char* *val ;
 /*   Affiche ce qui ne va pas, mais aussi accede a tout : ainsi, les adresses
      verolees aparaissent au grand jour du dbx   */
 
-void rec_check(mode)
+void rec_check(int mode)
-int mode ;       /* =1 pas de controle nbrec (en cours d'enregistrement) */
+/* mode=1 pas de controle nbrec (en cours d'enregistrement) */
 {
   struct rec* lerec ; struct unarg* larg ; int nr,na ;
   lerec = firstrec ;

src/TDataStd/TDataStd_BooleanArray.cxx

@@ -117,7 +117,7 @@ void TDataStd_BooleanArray::SetValue (const Standard_Integer index,
   Standard_Integer degree = index - (byte_index << 3) - myLower;
   Standard_Integer byte_value = DegreeOf2(degree);
 
-  if (value == ((myValues->Value(byte_index) & byte_value) > 0))
+  if ((value != 0) == ((myValues->Value(byte_index) & byte_value) > 0))
     return;
 
   Backup();

src/TDataStd/TDataStd_ReferenceArray.cxx

@@ -144,7 +144,7 @@ const Handle(TDataStd_HLabelArray1)& TDataStd_ReferenceArray::InternalArray () c
 //purpose  : 
 //=======================================================================
 void TDataStd_ReferenceArray::SetInternalArray (const Handle(TDataStd_HLabelArray1)& values,
-						const Standard_Boolean isCheckItem)
+                                                const Standard_Boolean)
 {
 //  myArray = values;
   Standard_Integer aLower    = values->Lower();

src/TObj/TObj_Application.cxx

@@ -138,7 +138,7 @@ Standard_Boolean TObj_Application::LoadDocument
   myIsError = Standard_False;
   TCollection_ExtendedString aPath ((const Standard_CString)theSourceFile);
 
-  PCDM_ReaderStatus aStatus = (PCDM_ReaderStatus) -1;
+  PCDM_ReaderStatus aStatus = PCDM_RS_ReaderException;
   {
     try
     {
@@ -202,7 +202,7 @@ Standard_Boolean TObj_Application::LoadDocument
     case PCDM_RS_DriverFailure:
       ErrorMessage (Message_Msg("TObj_Appl_RDriverFailure") << aPath);
       break;
-    case -1:
+    case PCDM_RS_ReaderException:
       ErrorMessage (Message_Msg("TObj_Appl_RException") << aPath);
       break;
     default:

src/TestTopOpe/TestTopOpe_BOOP.cxx

@@ -63,13 +63,25 @@ extern void PrintKRO_PREPA();
 
 Standard_Integer TestTopOpe_BOOP::Prepare(const char* ns1,const char* ns2)
 {
-  Standard_Integer err = 0;
+  Standard_Integer anErrorCode = 0;
-  if ((err = LoadShapes(ns1,ns2))) return err; // 0
+  anErrorCode = LoadShapes(ns1,ns2);  // mylastPREP is 0
-  if ((err = LoadnewDS())) return err; // 100
+  if (anErrorCode)
-  if ((err = DSF_Insert())) return err; // 100<,<200
+    return anErrorCode;
-  if ((err = LoadnewHB())) return err; // 200
+
-  if ((err = Builder_Perform())) return err; // 200<,<300
+  anErrorCode = LoadnewDS();          // mylastPREP is 100
-  return 0;
+  if (anErrorCode)
+    return anErrorCode;
+
+  anErrorCode = DSF_Insert();         // mylastPREP is (100,200)
+  if (anErrorCode)
+    return anErrorCode;
+
+  anErrorCode = LoadnewHB();          // mylastPREP is 200
+  if (anErrorCode)
+    return anErrorCode;
+
+  anErrorCode = Builder_Perform();    // mylastPREP is (200,300)
+  return anErrorCode;
 }
 
 Standard_Integer TestTopOpe_BOOP::LoadShapes(const char* ns1, const char* ns2)
@@ -95,7 +107,6 @@ Standard_Integer TestTopOpe_BOOP::LoadnewDS()
 
 Standard_Integer TestTopOpe_BOOP::DSF_Insert()
 {
-//  Standard_Integer err = 0;
   TopOpeBRep_DSFiller DSF;
   DSF_Insert(DSF);
   mylastPREP = 190;
@@ -104,7 +115,6 @@ Standard_Integer TestTopOpe_BOOP::DSF_Insert()
 
 Standard_Integer TestTopOpe_BOOP::LoadnewHB()
 {
-//  Standard_Integer err = 0;
   TopOpeBRepTool_GeomTool GT;
   Standard_Boolean c2d = myVarsTopo.GetC2D();
   GT.Define(myVarsTopo.GetOCT(),Standard_True,c2d, c2d);
@@ -118,7 +128,6 @@ Standard_Integer TestTopOpe_BOOP::LoadnewHB()
 
 Standard_Integer TestTopOpe_BOOP::Builder_Perform()
 {
-//  Standard_Integer err = 0;  
   myHB->Perform(myHDS,myS1,myS2);
 #ifdef DEB
   if ( TopOpeBRepTool_GettraceKRO() ) PrintKRO_PREPA();

src/TestTopOpe/TestTopOpe_BOOPCommands.cxx

@@ -322,18 +322,20 @@ Standard_Integer TOPOC(Draw_Interpretor& interpretor,Standard_Integer na,const c
 } // TOPO
 
 // ----------------------------------------------------------------------
+#ifdef DEB
 Standard_Integer BOOPCHK(Draw_Interpretor& ,Standard_Integer na,const char** a)
 {
   if (!strcmp(a[0],"tchk")) { 
-#ifdef DEB
 //    Standard_IMPORT extern Standard_Integer TopOpeBRepTool_BOOOPE_CHECK_DEB;
     Standard_IMPORT Standard_Integer TopOpeBRepTool_BOOOPE_CHECK_DEB;
     if ( na >= 2 ) TopOpeBRepTool_BOOOPE_CHECK_DEB = (Draw::Atoi(a[1])) ? 1 : 0;
-#endif
     return 0;
   }
   return 0;
 }
+#else
+Standard_Integer BOOPCHK(Draw_Interpretor& ,Standard_Integer,const char**) {return 0;}
+#endif
 
 // ----------------------------------------------------
 Standard_Integer TOPOSETCOMMANDS(TestTopOpe_BOOP& PT,Standard_Integer na,const char** a, Draw_Interpretor& di)

src/TestTopOpeTools/TestTopOpeTools_TraceCommands.cxx

@@ -203,12 +203,11 @@ static Standard_Integer InitTraceTopOpeKernel (TestTopOpeTools_Trace& T)
   return 0;
 }
 #endif
-
+#ifdef DEB
 //----------------------------------------------------------------------------
 Standard_Integer InitContextTopOpeKernel (TestTopOpeTools_Trace& T)
 //----------------------------------------------------------------------------
 {
-#ifdef DEB
   if (T.Add("nosew",(tf_value)TopOpeBRepTool_SetcontextNOSEW)) return 1;
   if (T.Add("nopnc",(tf_value)TopOpeBRepDS_SetcontextNOPNC)) return 1;
   if (T.Add("nosg",(tf_value)TopOpeBRepBuild_SetcontextNOSG)) return 1;
@@ -238,9 +237,12 @@ Standard_Integer InitContextTopOpeKernel (TestTopOpeTools_Trace& T)
   if (T.Add("nopfi",(tf_value)TopOpeBRepDS_SetcontextNOPFI)) return 1;
   if (T.Add("mktonreg",(tf_value)TopOpeBRepDS_SetcontextMKTONREG)) return 1;
   if (T.Add("nogap",(tf_value)TopOpeBRepDS_SetcontextNOGAP)) return 1;
-#endif
+
   return 0;
 }
+#else 
+Standard_Integer InitContextTopOpeKernel (TestTopOpeTools_Trace&) { return 0;}
+#endif
 
 Standard_EXPORT Standard_Integer TestTopOpeTools_SetFlags
 (TestTopOpeTools_Trace& theFlags, Standard_Integer mute, Standard_Integer n , const char** a) 
@@ -282,7 +284,12 @@ Standard_EXPORT Standard_Integer TestTopOpeTools_SetFlags
 // a1 = flag (for example tbs) <a2> = value, if omitted flag becomes True
 //=========================================================================
 
-Standard_Integer TestTopOpeTools_SetTrace(Draw_Interpretor&, Standard_Integer n , const char** a) 
+ 
+#ifdef DEB
+Standard_Integer TestTopOpeTools_SetTrace(Draw_Interpretor&, Standard_Integer n ,const char** a)
+#else
+Standard_Integer TestTopOpeTools_SetTrace(Draw_Interpretor&, Standard_Integer,const char**)
+#endif
 {
   Standard_Integer ok = Standard_True;
 #ifdef DEB
@@ -297,16 +304,19 @@ Standard_Integer TestTopOpeTools_SetTrace(Draw_Interpretor&, Standard_Integer n
 // a1 = flag (for example tbs) <a2> = value, if omitted flag becomes True
 //=========================================================================
 
-Standard_Integer TestTopOpeTools_SetContext(Draw_Interpretor&, Standard_Integer n , const char** a) 
+#ifdef DEB
+Standard_Integer TestTopOpeTools_SetContext(Draw_Interpretor&, Standard_Integer n ,const char** a)
 {
   Standard_Integer ok = Standard_True;
-#ifdef DEB
   InitContextTopOpeKernel(theContext);
   Standard_Integer mute = 0; if (!strcasecmp(a[0],"ctxmute")) mute = 1;
   ok = TestTopOpeTools_SetFlags(theContext,mute,n,a);
-#endif
   return ok;
 }
+#else
+Standard_Integer TestTopOpeTools_SetContext(Draw_Interpretor&, Standard_Integer,const char**) 
+{ return Standard_True;}
+#endif
 
 Standard_Integer dstrace(Draw_Interpretor& di, Standard_Integer n , const char** a) {
   const char ** pa = NULL; TCollection_AsciiString a1;

src/TopClass/TopClass_Classifier3d.gxx

@@ -28,7 +28,7 @@ TopClass_Classifier3d::TopClass_Classifier3d() : isSet(Standard_False)
 
 //======================================================================
 void TopClass_Classifier3d::Reset(const gp_Lin&       L,
-				 const Standard_Real Param,
+				 const Standard_Real,
 				 const Standard_Real Tol) { 
   myLin       = L;
   myParam     = RealLast();
@@ -41,7 +41,7 @@ void TopClass_Classifier3d::Reset(const gp_Lin&       L,
 #include <IntCurveSurface_TransitionOnCurve.hxx>
 
 void TopClass_Classifier3d::Compare(const TopoDS_Face&        Face,
-				    const TopAbs_Orientation  Orientation) {  
+				    const TopAbs_Orientation) {  
   if(!isSet) { 
     cout<<" Call to TopClass_Classifier3d::Compare  without a Reset ! ";
     return;

src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx

@@ -489,10 +489,10 @@ void TopOpeBRep_EdgesFiller::RecomputeInterferences(const TopoDS_Edge& E,TopOpeB
     Handle(TopOpeBRepDS_Interference)& iloi = loi.First(); 
     TopOpeBRepDS_Transition& TU = iloi->ChangeTransition();
     Standard_Integer ifb = TU.IndexBefore();
-    Standard_Integer ifa = TU.IndexAfter();
     const TopoDS_Face& fb = TopoDS::Face(myPDS->Shape(ifb));
 
 #ifdef DEB
+    Standard_Integer ifa = TU.IndexAfter();
     if (ifb != ifa) {cout<<"TopOpeBRep_EdgesFiller : ifb != ifa on E"<<EIX<<" NYI"<<endl;}
 #endif
 

src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx

@@ -212,7 +212,7 @@ static Standard_Boolean FUN_IoflSsuppS(const TopOpeBRepDS_PDataStructure pDS,
 //           attached to the edge (stored in the DS).
 //=======================================================================
 static Standard_Boolean FUN_findTF(const TopOpeBRepDS_PDataStructure pDS,
-		      const Standard_Integer iE, const Standard_Integer iF, const Standard_Integer iOOF,
+		      const Standard_Integer iE, const Standard_Integer, const Standard_Integer iOOF,
 		      TopOpeBRepDS_Transition& TF)
 {  
   Standard_Real factor = 0.5;
@@ -973,8 +973,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

src/TopOpeBRep/TopOpeBRep_Point2d.cxx

@@ -89,9 +89,9 @@ TopOpeBRepDS_Transition& TopOpeBRep_Point2d::ChangeTransition(const Standard_Int
 //function : Dump
 //purpose  : 
 //=======================================================================
+#ifdef DEB
 void TopOpeBRep_Point2d::Dump(const Standard_Integer E1index,const Standard_Integer E2index) const
 {
-#ifdef DEB
   Standard_Real par1 = Parameter(1);
   Standard_Real par2 = Parameter(2);
   
@@ -142,5 +142,7 @@ void TopOpeBRep_Point2d::Dump(const Standard_Integer E1index,const Standard_Inte
     cout<<" PV(2) : "<<P3D.X()<<" "<<P3D.Y()<<" "<<P3D.Z();
   }
   cout<<endl;
-#endif
 }
+#else
+void TopOpeBRep_Point2d::Dump(const Standard_Integer,const Standard_Integer) const {}
+#endif

src/TopOpeBRep/TopOpeBRep_ProcessGR.cxx

@@ -166,10 +166,10 @@ TopAbs_State TopOpeBRep_FacesFiller::StBipVPonF
   gp_Pnt pmil = BC.Value(parmil);
 
 #ifdef DEB
+#ifdef DRAW
   Standard_Boolean trc = TopOpeBRep_GettraceBIPS();
-    #ifdef DRAW
+  if (trc) {TCollection_AsciiString aa("pmil"); FUN_brep_draw(aa,pmil);}
-      if (trc) {TCollection_AsciiString aa("pmil"); FUN_brep_draw(aa,pmil);}
+#endif
-    #endif
 #endif
   TopAbs_State st = FSC_StatePonFace (pmil,F,*myPShapeClassifier);
   return st;

src/TopOpeBRep/TopOpeBRep_ShapeIntersector.cxx

@@ -424,9 +424,9 @@ Standard_Boolean TopOpeBRep_ShapeIntersector::MoreIntersection() const
 //purpose  : 
 //=======================================================================
 
+#ifdef DEB
 void TopOpeBRep_ShapeIntersector::DumpCurrent(const Standard_Integer K) const
 {
-#ifdef DEB
   if      ( myFFDone ) {
     if      ( K == 1 ) myFaceScanner.DumpCurrent(cout);
     else if ( K == 2 ) myFaceExplorer.DumpCurrent(cout);
@@ -447,19 +447,22 @@ void TopOpeBRep_ShapeIntersector::DumpCurrent(const Standard_Integer K) const
     if      ( K == 1 ) myEdgeScanner.DumpCurrent(cout);
     else if ( K == 2 ) myEdgeExplorer.DumpCurrent(cout);
   }
-#endif
 }
+#else
+void TopOpeBRep_ShapeIntersector::DumpCurrent(const Standard_Integer) const {}
+#endif
 
 //=======================================================================
 //function : Index
 //purpose  : 
 //=======================================================================
 
+#ifdef DEB
 Standard_Integer TopOpeBRep_ShapeIntersector::Index
 (const Standard_Integer K)const
 {
   Standard_Integer i = 0;
-#ifdef DEB
+
   if      ( myFFDone ) {
     if      ( K == 1 ) i = myFaceScanner.Index();
     else if ( K == 2 ) i = myFaceExplorer.Index();
@@ -480,9 +483,14 @@ Standard_Integer TopOpeBRep_ShapeIntersector::Index
     if      ( K == 1 ) i = myEdgeScanner.Index();
     else if ( K == 2 ) i = myEdgeExplorer.Index();
   }
-#endif
   return i;
 }
+#else
+Standard_Integer TopOpeBRep_ShapeIntersector::Index (const Standard_Integer)const
+{
+  return 0;
+}
+#endif
 
 
 //=======================================================================

src/TopOpeBRep/TopOpeBRep_ShapeIntersector2d.cxx

@@ -152,9 +152,9 @@ Standard_Boolean TopOpeBRep_ShapeIntersector2d::MoreIntersection() const
 //purpose  : 
 //=======================================================================
 
+#ifdef DEB
 void TopOpeBRep_ShapeIntersector2d::DumpCurrent(const Standard_Integer K) const
 {
-#ifdef DEB
   if      ( myFFDone ) {
     if      ( K == 1 ) myFaceScanner.DumpCurrent(cout);
     else if ( K == 2 ) myFaceExplorer.DumpCurrent(cout);
@@ -163,6 +163,9 @@ void TopOpeBRep_ShapeIntersector2d::DumpCurrent(const Standard_Integer K) const
     if      ( K == 1 ) myEdgeScanner.DumpCurrent(cout);
     else if ( K == 2 ) myEdgeExplorer.DumpCurrent(cout);
   }
+#else
+void TopOpeBRep_ShapeIntersector2d::DumpCurrent(const Standard_Integer) const
+{
 #endif
 }
 
@@ -171,11 +174,12 @@ void TopOpeBRep_ShapeIntersector2d::DumpCurrent(const Standard_Integer K) const
 //purpose  : 
 //=======================================================================
 
+#ifdef DEB
 Standard_Integer TopOpeBRep_ShapeIntersector2d::Index
 (const Standard_Integer K)const
 {
   Standard_Integer i = 0;
-#ifdef DEB
+
   if      ( myFFDone ) {
     if      ( K == 1 ) i = myFaceScanner.Index();
     else if ( K == 2 ) i = myFaceExplorer.Index();
@@ -184,9 +188,12 @@ Standard_Integer TopOpeBRep_ShapeIntersector2d::Index
     if      ( K == 1 ) i = myEdgeScanner.Index();
     else if ( K == 2 ) i = myEdgeExplorer.Index();
   }
-#endif
+
   return i;
 }
+#else
+Standard_Integer TopOpeBRep_ShapeIntersector2d::Index (const Standard_Integer)const { return 0;}
+#endif
 
 
 //=======================================================================

src/TopOpeBRep/TopOpeBRep_VPointInter.cxx

@@ -335,9 +335,9 @@ Standard_OStream& TopOpeBRep_VPointInter::Dump(const Standard_Integer I,const To
 //function : Dump
 //purpose  : 
 //=======================================================================
+#ifdef DEB
 Standard_OStream& TopOpeBRep_VPointInter::Dump(const TopoDS_Face& FF1,const TopoDS_Face& FF2,Standard_OStream& OS) const
 {
-#ifdef DEB
   const TopoDS_Face& F1 = TopoDS::Face(FF1);
   const TopoDS_Face& F2 = TopoDS::Face(FF2);
   OS<<"VP "<<myIndex<<" on "<<myShapeIndex<<" :";
@@ -368,7 +368,9 @@ Standard_OStream& TopOpeBRep_VPointInter::Dump(const TopoDS_Face& FF1,const Topo
     Dump(1,F1,OS);
     Dump(2,F2,OS); 
   }
-
+#else
+Standard_OStream& TopOpeBRep_VPointInter::Dump(const TopoDS_Face&,const TopoDS_Face&,Standard_OStream& OS) const
+{
 #endif
 
   return OS;

src/TopOpeBRep/TopOpeBRep_vpr.cxx

@@ -187,7 +187,7 @@ static void FUN_VPgeometryfound
   
   Standard_Integer absindex = VP.ShapeIndex();
   Standard_Integer OOabsindex = (absindex == 1) ? 2 : 1; 
-  Standard_Boolean OOShapeIndex = (ShapeIndex == 1) ? 2 : 1;
+  Standard_Integer OOShapeIndex = (ShapeIndex == 1) ? 2 : 1;
   Standard_Boolean on2edges = (absindex == 3) || (Lrest && (rkErest == OOabsindex));
   TopoDS_Shape edge = (rkErest == ShapeIndex)? Erest : VP.Edge(ShapeIndex);
 
@@ -228,19 +228,15 @@ static void FUN_VPgeometryfound
   else          hasOOedge = (VP.State(OOShapeIndex) == TopAbs_ON);
   if ( hasOOedge ) {  
     TopoDS_Shape OOedge;
-#ifndef DEB
+
-    if (on2edges) OOedge = ((signed) rkErest == (signed) OOShapeIndex)? Erest : VP.Edge(OOShapeIndex);
-#else
     if (on2edges) OOedge = (rkErest == OOShapeIndex)? Erest : VP.Edge(OOShapeIndex);
-#endif
     else          OOedge = VP.EdgeON(OOShapeIndex);    
+
     Standard_Real OOpar = 0.;
-#ifndef DEB
+
-    if (on2edges) OOpar = ((signed) rkErest == (signed) OOShapeIndex)? parErest : VP.EdgeParameter(OOShapeIndex);
-#else
     if (on2edges) OOpar = (rkErest == OOShapeIndex)? parErest : VP.EdgeParameter(OOShapeIndex);
-#endif
     else          OOpar = VP.EdgeONParameter(OOShapeIndex); 
+
     Standard_Real tolOOe = FUN_tool_maxtol(OOedge);
     Standard_Real OOtolp = Precision::Parametric(tolOOe);
     if (BDS.HasShape(OOedge)) {

src/TopOpeBRepBuild/TopOpeBRepBuild_Area1dBuilder.cxx

@@ -38,9 +38,9 @@ extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE();
 //purpose  : 
 //=======================================================================
 
+#ifdef DEB
 void TopOpeBRepBuild_Area1dBuilder::DumpList(const TopOpeBRepBuild_ListOfLoop& LOL)
 {
-#ifdef DEB
   Standard_Integer iLOL;
   TopOpeBRepBuild_ListIteratorOfListOfLoop  itLOL;
   for (iLOL = 0, itLOL.Initialize(LOL); itLOL.More(); iLOL++, itLOL.Next()) {
@@ -49,6 +49,9 @@ void TopOpeBRepBuild_Area1dBuilder::DumpList(const TopOpeBRepBuild_ListOfLoop& L
     const Handle(TopOpeBRepBuild_Loop)& L = itLOL.Value();
     L->Dump();cout<<endl;
   }
+#else
+void TopOpeBRepBuild_Area1dBuilder::DumpList(const TopOpeBRepBuild_ListOfLoop&)
+{
 #endif
 }
 
@@ -261,19 +264,19 @@ void TopOpeBRepBuild_Area1dBuilder::InitAreaBuilder
 void TopOpeBRepBuild_Area1dBuilder::ADD_Loop_TO_LISTOFLoop
 (const Handle(TopOpeBRepBuild_Loop)& L,
  TopOpeBRepBuild_ListOfLoop& LOL,
- const Standard_Address ss) const
+ const Standard_Address
-{
 #ifdef DEB
-  char* s = (char*)ss;
+  ss
 #endif
-
+  ) const
+{
   LOL.Append(L);
   
 #ifdef DEB
   if (TopOpeBRepBuild_GettraceAREA()) {
     cout<<"--------------------- add area loop to area : ";
     L->Dump(); cout<<endl;
-    if (s != NULL) cout<<s<<endl;
+    if (ss != NULL) cout<<(char*)ss<<endl;
     DumpList(LOL);
     cout<<"---------------------"<<endl;
   }
@@ -288,10 +291,13 @@ void TopOpeBRepBuild_Area1dBuilder::ADD_Loop_TO_LISTOFLoop
 void TopOpeBRepBuild_Area1dBuilder::REM_Loop_FROM_LISTOFLoop
 (TopOpeBRepBuild_ListIteratorOfListOfLoop& ITA,
  TopOpeBRepBuild_ListOfLoop& A,
+#ifdef DEB
  const Standard_Address ss) const
 {
-#ifdef DEB
   char* s = (char*)ss;
+#else
+const Standard_Address) const
+{
 #endif
 
 #ifdef DEB
@@ -322,9 +328,15 @@ void TopOpeBRepBuild_Area1dBuilder::REM_Loop_FROM_LISTOFLoop
 void TopOpeBRepBuild_Area1dBuilder::ADD_LISTOFLoop_TO_LISTOFLoop
 (TopOpeBRepBuild_ListOfLoop& A1,
  TopOpeBRepBuild_ListOfLoop& A2,
+ #ifdef DEB
  const Standard_Address ss,
  const Standard_Address ss1,
  const Standard_Address ss2) const
+#else
+ const Standard_Address,
+ const Standard_Address,
+ const Standard_Address) const
+#endif
 {
 #ifdef DEB
   char* s  = (char*)ss;

src/TopOpeBRepBuild/TopOpeBRepBuild_FaceBuilder.cxx

@@ -104,31 +104,6 @@ void TopOpeBRepBuild_FaceBuilder::InitFaceBuilder(TopOpeBRepBuild_WireEdgeSet& W
   TopOpeBRepBuild_WireEdgeClassifier WEC(F,BB);
   TopOpeBRepBuild_LoopSet& LS = myLoopSet;
   myFaceAreaBuilder.InitFaceAreaBuilder(LS,WEC,ForceClass);
-
-  //  Standard_Boolean hascnxsta = WES.HasConnexStartElement();
-  //  if ( hascnxsta ) {
-  //    myMOSI.Clear();
-  //    InitFace();
-  //    for (;MoreFace();NextFace()) {
-  //      InitWire();
-  //      for (;MoreWire();NextWire()) {
-  //	Standard_Boolean isold = IsOldWire();if (isold) continue;
-  //	InitEdge();
-  //	for(;MoreEdge();NextEdge()) {
-  //	  const TopoDS_Shape& E = Edge();
-  //	  Standard_Boolean issta = WES.IsStartElement(E);
-  //	  Standard_Boolean nsta  = WES.NStartElement(E);Standard_Boolean iscnx = (nsta == 2);
-  //	  if (!issta || !iscnx ) continue;
-  //	  Standard_Boolean isb = myMOSI.IsBound(E);
-  //	  if (!isb) myMOSI.Bind(E,0);
-  //	  Standard_Integer nmosi = myMOSI(E);
-  //	  nmosi++;
-  //	  myMOSI(E) = nmosi;
-  //	}
-  //      }
-  //    }
-  //  } // hascnxsta
-  
 }
 
 //---------------------------------------------------------------

src/TopOpeBRepBuild/TopOpeBRepBuild_ShapeSet.cdl

@@ -116,14 +116,6 @@ is
     ChangeStartShapes(me:in out) returns ListOfShape from TopTools;
     ---C++: return &
 
-    IsStartElement(me;S:Shape) returns Boolean;
-    IsElement(me;S:Shape) returns Boolean;
-    IsShape(me;S:Shape) returns Boolean;
-
-    NStartElement(me;S:Shape) returns Integer;
-    NElement(me;S:Shape) returns Integer;
-    NShape(me;S:Shape) returns Integer;
-
     FindNeighbours(me:in out) is virtual;
     ---Purpose: Build the list of neighbour shapes of myCurrentShape
     -- (neighbour shapes and myCurrentShapes are of type t)

src/TopOpeBRepBuild/TopOpeBRepBuild_ShapeSet.cxx

@@ -292,95 +292,6 @@ TopTools_ListOfShape& TopOpeBRepBuild_ShapeSet::ChangeStartShapes()
   return myStartShapes;
 }
 
-//=======================================================================
-//function : IsStartElement
-//purpose  : 
-//=======================================================================
-Standard_Boolean TopOpeBRepBuild_ShapeSet::IsStartElement(const TopoDS_Shape& S) const
-{
-  Standard_Boolean b = Standard_False;
-#ifdef DEB
-  b = myOMSS.Contains(S);
-#endif
-  return b;
-}
-
-//=======================================================================
-//function : IsElement
-//purpose  : 
-//=======================================================================
-Standard_Boolean TopOpeBRepBuild_ShapeSet::IsElement(const TopoDS_Shape& S) const
-{
-  Standard_Boolean b = Standard_False;
-#ifdef DEB
-  b = myOMES.Contains(S);
-#endif
-  return b;
-}
-
-//=======================================================================
-//function : IsShape
-//purpose  : 
-//=======================================================================
-Standard_Boolean TopOpeBRepBuild_ShapeSet::IsShape(const TopoDS_Shape& S) const
-{
-  Standard_Boolean b = Standard_False;
-#ifdef DEB
-  b = myOMSH.Contains(S);
-#endif
-  return b;
-}
-
-//=======================================================================
-//function : NStartElement
-//purpose  : 
-//=======================================================================
-Standard_Integer TopOpeBRepBuild_ShapeSet::NStartElement(const TopoDS_Shape& S) const
-{
-  Standard_Integer n = 0;
-#ifdef DEB
-  Standard_Boolean b = Standard_False;
-  b = IsStartElement(S);
-  if (b) n++;
-  b = IsStartElement(S.Oriented(TopAbs::Complement(S.Orientation())));
-  if (b) n++;
-#endif
-  return n;
-}
-
-//=======================================================================
-//function : NElement
-//purpose  : 
-//=======================================================================
-Standard_Integer TopOpeBRepBuild_ShapeSet::NElement(const TopoDS_Shape& S) const
-{
-  Standard_Integer n = 0;
-#ifdef DEB
-  Standard_Boolean b = Standard_False;
-  b = IsElement(S);  if (b) n++;
-  b = IsElement(S.Oriented(TopAbs::Complement(S.Orientation())));
-  if (b) n++;
-#endif
-  return n;
-}
-
-//=======================================================================
-//function : IsShape
-//purpose  : 
-//=======================================================================
-Standard_Integer TopOpeBRepBuild_ShapeSet::NShape(const TopoDS_Shape& S) const
-{
-  Standard_Integer n = 0;
-#ifdef DEB
-  Standard_Boolean b = Standard_False;
-  b = IsShape(S);
-  if (b) n++;
-  b = IsShape(S.Oriented(TopAbs::Complement(S.Orientation())));
-  if (b) n++;
-#endif
-  return n;
-}
-
 //=======================================================================
 //function : FindNeighbours
 //purpose  : 
@@ -494,7 +405,19 @@ void TopOpeBRepBuild_ShapeSet::DumpName(Standard_OStream& OS,const TCollection_A
 //function : DumpCheck
 //purpose  : 
 //=======================================================================
-void TopOpeBRepBuild_ShapeSet::DumpCheck(Standard_OStream& OS,const TCollection_AsciiString& str,const TopoDS_Shape& S,const Standard_Boolean chk) const
+
+#ifdef DEB
+void TopOpeBRepBuild_ShapeSet::DumpCheck(Standard_OStream& OS,
+                                         const TCollection_AsciiString& str,
+                                         const TopoDS_Shape& S, 
+                                         const Standard_Boolean chk
+#else
+void TopOpeBRepBuild_ShapeSet::DumpCheck(Standard_OStream&,
+                                         const TCollection_AsciiString&,
+                                         const TopoDS_Shape&,
+                                         const Standard_Boolean
+#endif
+                                                                    ) const
 { 
   if (!myCheckShape) return;
 

src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceSet.cxx

@@ -53,7 +53,11 @@ TopOpeBRepBuild_ShapeSet(TopAbs_EDGE)
 //=======================================================================
 
 TopOpeBRepBuild_ShellFaceSet::TopOpeBRepBuild_ShellFaceSet
+#ifdef DEB
 (const TopoDS_Shape& S,const Standard_Address A) : // DEB
+#else
+(const TopoDS_Shape& S,const Standard_Address) : // DEB
+#endif
 TopOpeBRepBuild_ShapeSet(TopAbs_EDGE)
 {
   mySolid = TopoDS::Solid(S);

src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeSet.cdl

@@ -61,9 +61,7 @@ is
     -- Initialize iterator of neighbour edges to edge myCurrentShape
     MakeNeighboursList(me: in out;E,V:Shape) returns ListOfShape from TopTools is redefined;
     ---C++: return const &
-    HasConnexStartElement(me) returns Boolean; -- desactivated
 
-    -- private
     VertexConnectsEdges(me;V,E1,E2:Shape;O1,O2:out Orientation from TopAbs)
     returns Boolean is private;
     ---Purpose: 

src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeSet.cxx

@@ -354,29 +354,6 @@ const TopTools_ListOfShape & TopOpeBRepBuild_WireEdgeSet::MakeNeighboursList(con
 
 } // MakeNeighoursList
 
-//=======================================================================
-//function : HasConnexStartElement
-//purpose  : 
-//=======================================================================
-Standard_Boolean TopOpeBRepBuild_WireEdgeSet::HasConnexStartElement() const
-{
-#ifdef DEB
-  Standard_ProgramError::Raise("WireEdgeSet::HasConnexStartElement management disactivated");
-#endif
-
-  Standard_Boolean b = Standard_False;
-
-//  Standard_Integer n = myOMSS.Extent();
-//  for(Standard_Integer i=1;i<=n;i++) {
-//    const TopoDS_Shape& S = myOMSS.FindKey(i);
-//    Standard_Integer ns = NStartElement(S);
-//    b = (ns == 2);
-//    if (b) break;
-//  }
-
-  return b;
-}
-
 //=======================================================================
 //function : VertexConnectsEdges
 //purpose  : 

src/TopOpeBRepBuild/TopOpeBRepBuild_keep.cxx

@@ -101,7 +101,12 @@ Standard_Boolean TopOpeBRepBuild_Builder::GKeepShape1
 // S is used for trace only
 //=======================================================================
 void TopOpeBRepBuild_Builder::GKeepShapes
-(const TopoDS_Shape& S,const TopTools_ListOfShape& LSclass,const TopAbs_State TB,const TopTools_ListOfShape& Lin,TopTools_ListOfShape& Lou)
+#ifdef DEB
+(const TopoDS_Shape& S,
+#else
+(const TopoDS_Shape&,
+#endif
+ const TopTools_ListOfShape& LSclass,const TopAbs_State TB,const TopTools_ListOfShape& Lin,TopTools_ListOfShape& Lou)
 {
 #ifdef DEB
   Standard_Integer iS; Standard_Boolean tSPS = GtraceSPS(S,iS);

src/TopOpeBRepDS/TopOpeBRepDS_Curve.cxx

@@ -353,9 +353,13 @@ void TopOpeBRepDS_Curve::ChangeIsWalk(const Standard_Boolean B)
 //purpose  : 
 //=======================================================================
 
-Standard_OStream& TopOpeBRepDS_Curve::Dump(Standard_OStream& OS,
+Standard_OStream& TopOpeBRepDS_Curve::Dump (Standard_OStream& OS,
-					   const Standard_Integer index,
+                                            const Standard_Integer index,
-					   const Standard_Boolean compact)const
+#ifdef DEB
+                                            const Standard_Boolean compact)const
+#else
+                                            const Standard_Boolean)const
+#endif
 {
 #ifdef DEB
   OS<<"Curve : "; if (index != 0) OS<<index<<" ";

src/TopOpeBRepDS/TopOpeBRepDS_Interference.cxx

@@ -283,17 +283,22 @@ Standard_OStream& TopOpeBRepDS_Interference::Dump
 //function : Dump
 //purpose  : 
 //=======================================================================
-
+#ifdef DEB
 Standard_OStream& TopOpeBRepDS_Interference::Dump
 (Standard_OStream& OS,
  const TCollection_AsciiString& s1,
  const TCollection_AsciiString& s2) const
 {
-#ifdef DEB
   OS<<s1;
   Dump(OS);
   OS<<s2;
   OS.flush();
-#endif
   return OS;
 }
+#else
+Standard_OStream& TopOpeBRepDS_Interference::Dump
+(Standard_OStream& OS,
+ const TCollection_AsciiString&,
+ const TCollection_AsciiString&) const
+{ return OS; }
+#endif

src/TopOpeBRepDS/TopOpeBRepDS_SurfaceCurveInterference.cxx

@@ -94,7 +94,12 @@ void  TopOpeBRepDS_SurfaceCurveInterference::PCurve
 
 Standard_OStream& TopOpeBRepDS_SurfaceCurveInterference::DumpPCurve
   (Standard_OStream& OS,
-   const Standard_Boolean compact)const
+#ifdef DEB
+   const Standard_Boolean compact
+#else
+   const Standard_Boolean
+#endif
+   )const
 {
 #ifdef DEB
   Dump(OS); OS<<endl;

src/TopOpeBRepTool/TopOpeBRepTool_HBoxTool.cxx

@@ -228,9 +228,10 @@ const TopOpeBRepTool_IndexedDataMapOfShapeBox& TopOpeBRepTool_HBoxTool::IMS() co
 //function : DumpB
 //purpose  : 
 //=======================================================================
-void TopOpeBRepTool_HBoxTool::DumpB (const Bnd_Box& B)
+void TopOpeBRepTool_HBoxTool::DumpB 
-{
 #ifdef DEB
+(const Bnd_Box& B)
+{
   if      (B.IsVoid()) cout<<"# IsVoid";
   else if (B.IsWhole()) cout<<"# IsWhole";
   else {
@@ -239,5 +240,10 @@ void TopOpeBRepTool_HBoxTool::DumpB (const Bnd_Box& B)
     cout<<"bounding "<<x<<" "<<y<<" "<<z<<" "<<X<<" "<<Y<<" "<<Z;
     cout.flush();
   }
-#endif
 }
+#else
+(const Bnd_Box& )
+{
+}
+#endif
+

src/ViewerTest/ViewerTest_ObjectCommands.cxx

@@ -4620,7 +4620,7 @@ static Standard_Integer VShowFaceBoundary (Draw_Interpretor& /*di*/,
 //function : VMarkersTest
 //purpose  : Draws an array of markers for testing purposes.
 //=======================================================================
-static Standard_Integer VMarkersTest (Draw_Interpretor& theDI,
+static Standard_Integer VMarkersTest (Draw_Interpretor&,
                                       Standard_Integer  theArgNb,
                                       const char**      theArgVec)
 {

src/ViewerTest/ViewerTest_ViewerCommands.cxx

@@ -511,12 +511,12 @@ TCollection_AsciiString ViewerTest::ViewerInit (const Standard_Integer thePxLeft
     // Get connection string
   #if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX))
     TCollection_AsciiString aDisplayName(theDisplayName);
-    if (aDisplayName.IsEmpty())
+    if (!aDisplayName.IsEmpty())
       SetDisplayConnection (new Aspect_DisplayConnection ());
     else
       SetDisplayConnection (new Aspect_DisplayConnection (aDisplayName));
-
   #else
+    (void)theDisplayName; // avoid warning on unused argument
     SetDisplayConnection (new Aspect_DisplayConnection ());
   #endif
     aGraphicDriver = new OpenGl_GraphicDriver();

src/Visual3d/Visual3d_View.cxx

@@ -1137,7 +1137,7 @@ void Visual3d_View::SetViewOrientation (const Visual3d_ViewOrientation& VO) {
         MyCView.Orientation.ViewScaleZ                  = float (Z);
 
         CustomIsModified =
-        MyCView.Orientation.IsCustomMatrix != MyViewOrientation.IsCustomMatrix();
+          (MyCView.Orientation.IsCustomMatrix != MyViewOrientation.IsCustomMatrix());
         MyCView.Orientation.IsCustomMatrix = MyViewOrientation.IsCustomMatrix();
         if ( MyViewOrientation.IsCustomMatrix() ) {
           Standard_Integer i, j;

src/XCAFDrivers/XCAFDrivers.cxx

@@ -34,11 +34,6 @@
 
 #include <Plugin_Macro.hxx>
 
-// avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
-#pragma warning(4:4190)
-#endif
-
 static Standard_GUID XSStorageDriver  ("ed8793f8-3142-11d4-b9b5-0060b0ee281b");
 static Standard_GUID XSRetrievalDriver("ed8793f9-3142-11d4-b9b5-0060b0ee281b");
 static Standard_GUID XCAFSchemaID     ("ed8793fa-3142-11d4-b9b5-0060b0ee281b");
@@ -82,4 +77,8 @@ Handle(Standard_Transient) XCAFDrivers::Factory(const Standard_GUID& aGUID) {
   return StdDrivers::Factory (aGUID);
 }
 
+#ifdef _MSC_VER
+#pragma warning(disable:4190) /* disable warning on C++ type returned by C function; should be OK for C++ usage */
+#endif
+
 PLUGIN(XCAFDrivers)

src/XDEDRAW/XDEDRAW.cxx

@@ -1015,7 +1015,7 @@ static Standard_Integer XShowFaceBoundary (Draw_Interpretor& di,
 //function : testDoc
 //purpose  : Method to test destruction of document
 //=======================================================================
-static Standard_Integer testDoc (Draw_Interpretor& di,
+static Standard_Integer testDoc (Draw_Interpretor&,
                                  Standard_Integer argc,
                                  const char ** argv)
 {

src/XmlDrivers/XmlDrivers.cxx

@@ -38,11 +38,6 @@
 
 #include <Plugin_Macro.hxx>
 
-// avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
-#pragma warning(4:4190)
-#endif
-
 static Standard_GUID XmlStorageDriver  ("03a56820-8269-11d5-aab2-0050044b1af1");
 static Standard_GUID XmlRetrievalDriver("03a56822-8269-11d5-aab2-0050044b1af1");
 
@@ -93,5 +88,9 @@ Handle(XmlMDF_ADriverTable) XmlDrivers::AttributeDrivers
   return aTable;
 }
 
+#ifdef _MSC_VER
+#pragma warning(disable:4190) /* disable warning on C++ type returned by C function; should be OK for C++ usage */
+#endif
+
 // Declare entry point PLUGINFACTORY
 PLUGIN(XmlDrivers)

src/XmlLDrivers/XmlLDrivers.cxx

@@ -33,11 +33,6 @@
 #include <time.h>
 #include <Plugin_Macro.hxx>
 
-// avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
-#pragma warning(4:4190)
-#endif
-
 static Standard_GUID XmlLStorageDriver  ("13a56820-8269-11d5-aab2-0050044b1af1");
 static Standard_GUID XmlLRetrievalDriver("13a56822-8269-11d5-aab2-0050044b1af1");
 #define CURRENT_DOCUMENT_VERSION 7
@@ -119,5 +114,9 @@ TCollection_AsciiString XmlLDrivers::StorageVersion()
   return aVersionStr;
 }
 
+#ifdef _MSC_VER
+#pragma warning(disable:4190) /* disable warning on C++ type returned by C function; should be OK for C++ usage */
+#endif
+
 // Declare entry point PLUGINFACTORY
 PLUGIN(XmlLDrivers)

src/XmlTObjDrivers/XmlTObjDrivers.cxx

@@ -32,11 +32,6 @@
 
 #include <Plugin_Macro.hxx>
 
-// avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
-#pragma warning(4:4190)
-#endif
-
 static Standard_GUID XmlStorageDriver  ("f78ff4a0-a779-11d5-aab4-0050044b1af1");
 static Standard_GUID XmlRetrievalDriver("f78ff4a1-a779-11d5-aab4-0050044b1af1");
 
@@ -76,4 +71,8 @@ void XmlTObjDrivers::AddDrivers (const Handle(XmlMDF_ADriverTable)& aDriverTable
   aDriverTable -> AddDriver (new XmlTObjDrivers_IntSparseArrayDriver(anMsgDrv));
 }
 
+#ifdef _MSC_VER
+#pragma warning(disable:4190) /* disable warning on C++ type returned by C function; should be OK for C++ usage */
+#endif
+
 PLUGIN(XmlTObjDrivers)

src/XmlXCAFDrivers/XmlXCAFDrivers.cxx

@@ -27,11 +27,6 @@
 #include <XmlDrivers.hxx>
 #include <Plugin_Macro.hxx>
 
-// avoid warnings on 'extern "C"' functions returning C++ classes
-#ifdef WNT
-#pragma warning(4:4190)
-#endif
-
 static Standard_GUID XSStorageDriver  ("f78ff496-a779-11d5-aab4-0050044b1af1");
 static Standard_GUID XSRetrievalDriver("f78ff497-a779-11d5-aab4-0050044b1af1");
 
@@ -56,4 +51,7 @@ Handle(Standard_Transient) XmlXCAFDrivers::Factory(const Standard_GUID& aGUID)
   return XmlDrivers::Factory (aGUID);
 }
 
+#ifdef _MSC_VER
+#pragma warning(disable:4190) /* disable warning on C++ type returned by C function; should be OK for C++ usage */
+#endif
 PLUGIN(XmlXCAFDrivers)