0024284: Some trivial warnings produced by ICC 14

Eliminated ICC 14 warnings:
# 82: storage class is not first (e.g. "int static f()"
# 2621: attribute "dllexport" does not apply here (e.g. "Standard_EXPORT typedef int qqint;")
# 2415: variable "..." of static storage duration was declared but never referenced
# 111: statement is unreachable (usually "break" after "return" in cycles)

diff --git a/src/Adaptor3d/Adaptor3d_IsoCurve.cxx b/src/Adaptor3d/Adaptor3d_IsoCurve.cxx
index fdff6fd88aa56a2230aa5cd08070c328e0180ff4..6dcccd72a463cd783b2cd5023fe07ad3fbccca3c 100755 (executable)
--- a/src/Adaptor3d/Adaptor3d_IsoCurve.cxx
+++ b/src/Adaptor3d/Adaptor3d_IsoCurve.cxx
@@ -553,7 +553,6 @@ GeomAbs_CurveType Adaptor3d_IsoCurve::GetType() const {
          Standard_NoSuchObject::Raise("Adaptor3d_IsoCurve:NoneIso");
          // portage WNT
          return GeomAbs_OtherCurve;
-         break;
        }
       }
       break;

diff --git a/src/Adaptor3d/Adaptor3d_SurfaceOfLinearExtrusion.cxx b/src/Adaptor3d/Adaptor3d_SurfaceOfLinearExtrusion.cxx
index 0a484866afbe949e2264c4a3961ba70645418953..8bed54a3b05100114187f0fc647c8446b18c37e4 100755 (executable)
--- a/src/Adaptor3d/Adaptor3d_SurfaceOfLinearExtrusion.cxx
+++ b/src/Adaptor3d/Adaptor3d_SurfaceOfLinearExtrusion.cxx
@@ -431,7 +431,6 @@ GeomAbs_SurfaceType Adaptor3d_SurfaceOfLinearExtrusion::GetType() const
       else {
         return GeomAbs_Plane;
       }
-      break;
     }
     
   case GeomAbs_Circle:
@@ -447,7 +446,6 @@ GeomAbs_SurfaceType Adaptor3d_SurfaceOfLinearExtrusion::GetType() const
       else {
         return GeomAbs_SurfaceOfExtrusion;
       }
-      break;
     }
     // JAG 10.11.95
     
@@ -460,7 +458,6 @@ GeomAbs_SurfaceType Adaptor3d_SurfaceOfLinearExtrusion::GetType() const
       else {
         return GeomAbs_SurfaceOfExtrusion;
       }
-      break;
     }
     
   case GeomAbs_Parabola:
@@ -472,7 +469,6 @@ GeomAbs_SurfaceType Adaptor3d_SurfaceOfLinearExtrusion::GetType() const
       else {
         return GeomAbs_SurfaceOfExtrusion;
       }
-      break;
     }
     
   case GeomAbs_Hyperbola:
@@ -484,7 +480,6 @@ GeomAbs_SurfaceType Adaptor3d_SurfaceOfLinearExtrusion::GetType() const
       else {
         return GeomAbs_SurfaceOfExtrusion;
       }
-      break;
     }
 
   default:

diff --git a/src/Adaptor3d/Adaptor3d_SurfaceOfRevolution.cxx b/src/Adaptor3d/Adaptor3d_SurfaceOfRevolution.cxx
index ad27bfc449ade198b67f2295e18ef9f7d6a72aac..e6b42cd047dd8c863d82e88ff7da7b7586719924 100755 (executable)
--- a/src/Adaptor3d/Adaptor3d_SurfaceOfRevolution.cxx
+++ b/src/Adaptor3d/Adaptor3d_SurfaceOfRevolution.cxx
@@ -596,7 +596,6 @@ GeomAbs_SurfaceType Adaptor3d_SurfaceOfRevolution::GetType() const
        return bRet;
       }
     }
-    break;
   }//case GeomAbs_Line: 
   //  
   case GeomAbs_Circle:   {
@@ -639,7 +638,6 @@ GeomAbs_SurfaceType Adaptor3d_SurfaceOfRevolution::GetType() const
       }
       return bRet;
     }
-    break;
   }
   //  
   default:

diff --git a/src/BRepFeat/BRepFeat.cxx b/src/BRepFeat/BRepFeat.cxx
index 539a279b55ebbc84dbf5396a6d9f60acb0dbdbf0..a5db4fcdc1a784b886f6b19ece9bc9a3544df8e2 100755 (executable)
--- a/src/BRepFeat/BRepFeat.cxx
+++ b/src/BRepFeat/BRepFeat.cxx
@@ -336,7 +336,6 @@ static Standard_Boolean IsIn (BRepTopAdaptor_FClass2d& FC,
    gp_Pnt2d P = AC.Value(QU.Parameter(i));
    if (FC.Perform(P, Standard_False) == TopAbs_OUT) {
      return Standard_False;
-     break;
    } 
  }
  return Standard_True;
@@ -481,7 +480,6 @@ Standard_Boolean BRepFeat::IsInside(const TopoDS_Face& F1,
     Geom2dAdaptor_Curve  AC(C,f1,l1);
     if (!IsIn(FC,AC)) {
       return Standard_False;
-      break;
     }
   }
   return Standard_True;

diff --git a/src/BRepOffset/BRepOffset_Tool.cxx b/src/BRepOffset/BRepOffset_Tool.cxx
index 6b3b2824067422bbe5cc0e0ad703ee25bde19cf7..6d596280ab29141f7cf9e39f2d94fecd5c83a2a9 100755 (executable)
--- a/src/BRepOffset/BRepOffset_Tool.cxx
+++ b/src/BRepOffset/BRepOffset_Tool.cxx
@@ -3934,7 +3934,6 @@ static Standard_Boolean IsInOut (BRepTopAdaptor_FClass2d& FC,
    gp_Pnt2d P = AC.Value(QU.Parameter(i));
    if (FC.Perform(P) != S) {
      return Standard_False;
-     break;
    } 
  }
  return Standard_True;

diff --git a/src/CDF/CDF.cxx b/src/CDF/CDF.cxx
index 02b28bd450559769af9724dd66516fa5a9c27bd6..626ace6f3ebfa1073346c81d3ba196ed46cfb481 100755 (executable)
--- a/src/CDF/CDF.cxx
+++ b/src/CDF/CDF.cxx
@@ -23,7 +23,7 @@
 #include <CDF.ixx>
 #include <Standard_Failure.hxx>
 
-void static CDF_InitApplication () {
+static void CDF_InitApplication () {
 
   static Standard_Boolean FirstApplication = Standard_True;
 

diff --git a/src/CPnts/CPnts_UniformDeflection.cxx b/src/CPnts/CPnts_UniformDeflection.cxx
index 70f3d3d25a533653d2013961d530824fcd5c5040..6d7f267da7786eea2efc1e82bfe09411f008dfcb 100755 (executable)
--- a/src/CPnts/CPnts_UniformDeflection.cxx
+++ b/src/CPnts/CPnts_UniformDeflection.cxx
@@ -68,12 +68,6 @@ static  void D02d(const Standard_Address C, const Standard_Real U,
   PP.SetCoord(P.X(),P.Y(),0.);
 }
 
-static inline void D13d(const Standard_Address C, const Standard_Real U,
-                     gp_Pnt& P, gp_Vec& V1)
-{
-  ((Adaptor3d_Curve*)C)->D1(U,P,V1);
-}
-
 static inline void D23d(const Standard_Address C, const Standard_Real U,
                      gp_Pnt& P, gp_Vec& V1, gp_Vec& V2)
 {

diff --git a/src/DDataStd/DDataStd_DrawDriver.cxx b/src/DDataStd/DDataStd_DrawDriver.cxx
index 11f117ea39f1ff0ea204cf0fc59f28bc087edf9c..1c1b1aeae8b2775d1a6aba04da1f12d44f89fc47 100755 (executable)
--- a/src/DDataStd/DDataStd_DrawDriver.cxx
+++ b/src/DDataStd/DDataStd_DrawDriver.cxx
@@ -160,7 +160,6 @@ Handle(Draw_Drawable3D) DDataStd_DrawDriver::Drawable (const TDF_Label& L) const
     case TDataXtd_POINT :
       {  
        return DrawableShape(L,Draw_jaune,Standard_False);
-       break;
       }
     case TDataXtd_LINE :
     case TDataXtd_CIRCLE :
@@ -168,7 +167,6 @@ Handle(Draw_Drawable3D) DDataStd_DrawDriver::Drawable (const TDF_Label& L) const
     case TDataXtd_SPLINE :
       {  
        return DrawableShape(L,Draw_cyan,Standard_False);
-       break;
       }  
     case TDataXtd_ANY_GEOM :
       { 

diff --git a/src/Draw/Draw_PInterp.hxx b/src/Draw/Draw_PInterp.hxx
index 184e814b06562ac8a6cbc593691bdf38c08ac160..2ba381c6020a394a2d408c734397194e14936c3a 100755 (executable)
--- a/src/Draw/Draw_PInterp.hxx
+++ b/src/Draw/Draw_PInterp.hxx
@@ -27,8 +27,4 @@ struct Tcl_Interp;
 
 typedef Tcl_Interp *Draw_PInterp;
 
-
-#include <Standard_Type.hxx>
-inline const Handle(Standard_Type)& STANDARD_TYPE(Draw_PInterp) {return *((Handle(Standard_Type)*)0);}
-
 #endif

diff --git a/src/Draw/Draw_Window.cxx b/src/Draw/Draw_Window.cxx
index 12d02cdaaa797a0b31f090f3fdbfe575a97c437f..63e2e87a5c29aa53e116723fa39bc3f115f7718a 100755 (executable)
--- a/src/Draw/Draw_Window.cxx
+++ b/src/Draw/Draw_Window.cxx
@@ -1396,7 +1396,6 @@ LRESULT APIENTRY DrawWindow::DrawProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARA
       localObjet->WExpose();
       localObjet->Redraw();
       return 0l;
-      break;
     }
 
   default:

diff --git a/src/Extrema/Extrema_ExtElCS.cxx b/src/Extrema/Extrema_ExtElCS.cxx
index de862227a73e2a4f567caff179e134b751e625a6..496741c3e5b4e8e083f240a87b99a8e1bb7f7b3b 100755 (executable)
--- a/src/Extrema/Extrema_ExtElCS.cxx
+++ b/src/Extrema/Extrema_ExtElCS.cxx
@@ -308,7 +308,6 @@ void Extrema_ExtElCS::Perform(const gp_Circ& C,
       mySqDist->SetValue(1, aDist * aDist);
     } else {
       Standard_Integer aNbExt   = anExtC.NbExt();
-      gp_Pnt           aCenter  = C.Location();
       Standard_Integer i;
       Standard_Integer aCurI    = 1;
       Standard_Real    aTolConf = Precision::Confusion();

diff --git a/src/FSD/FSD_BinaryFile.cxx b/src/FSD/FSD_BinaryFile.cxx
index fb2742200c875cde8637e1fbb911e92c78db3344..f347a4e25590fc44cd1529f8bfcd6912c21ec307 100755 (executable)
--- a/src/FSD/FSD_BinaryFile.cxx
+++ b/src/FSD/FSD_BinaryFile.cxx
@@ -20,8 +20,6 @@
 #include <OSD.hxx>
 
 const Standard_CString MAGICNUMBER = "BINFILE";
-const Standard_CString ENDOFNORMALEXTENDEDSECTION = "BEGIN_REF_SECTION";
-const Standard_Integer SIZEOFNORMALEXTENDEDSECTION = 16;
 
 //=======================================================================
 //function : FSD_BinaryFile

diff --git a/src/FSD/FSD_CmpFile.cxx b/src/FSD/FSD_CmpFile.cxx
index 3111e44ad0b54cdd6bd9245ca2c8b17e90b0da3e..84c40b9934f528bb717736695f1d1b7e6090d404 100755 (executable)
--- a/src/FSD/FSD_CmpFile.cxx
+++ b/src/FSD/FSD_CmpFile.cxx
@@ -38,8 +38,6 @@
 //#endif
 
 const Standard_CString MAGICNUMBER = "CMPFILE";
-const Standard_CString ENDOFNORMALEXTENDEDSECTION = "BEGIN_REF_SECTION";
-const Standard_Integer SIZEOFNORMALEXTENDEDSECTION = 16;
 
 //=======================================================================
 //function : FSD_CmpFile
@@ -281,49 +279,6 @@ void FSD_CmpFile::ReadExtendedLine(TCollection_ExtendedString& buffer)
   }
 
   FlushEndOfLine();
-#if 0
-  char c = '\0';
-  Standard_ExtCharacter i = 0,j,count = 0;
-  Standard_Boolean fin = Standard_False;
-  Standard_CString tg = ENDOFNORMALEXTENDEDSECTION;
- 
-  buffer.Clear();
-
-  while (!fin && !IsEnd()) {
-    myStream.get(c);
-
-    if (c == tg[count]) count++;
-    else count = 0;
-    if (count < SIZEOFNORMALEXTENDEDSECTION) {
-      i = 0; j = 0;
-      i += (Standard_ExtCharacter)c;
-      if (c == '\0') fin = Standard_True;
-      i = (i << 8);
-      
-      myStream.get(c);
-      if (c == tg[count]) count++;
-      else count = 0;
-      if (count < SIZEOFNORMALEXTENDEDSECTION) {
-       if ( c != '\r') {
-         j += (Standard_ExtCharacter)c;
-         if (c != '\n' && c != '\r') {
-           fin = Standard_False;
-           i |= (0x00FF & j);
-           buffer += (Standard_ExtCharacter)i;
-         }
-
-       }
-      }
-      else {
-       Storage_StreamExtCharParityError::Raise();      
-      }
-    }
-    else {
-      Storage_StreamExtCharParityError::Raise();
-    }
-  }
-#endif
-
 }
 
 //=======================================================================

diff --git a/src/Graphic3d/Graphic3d_TransModeFlags.hxx b/src/Graphic3d/Graphic3d_TransModeFlags.hxx
index 2f84455c759485a29f2abfbb1adb709e11b64ffe..d4d938b407656d79a67fd91c9ab01e29200da558 100755 (executable)
--- a/src/Graphic3d/Graphic3d_TransModeFlags.hxx
+++ b/src/Graphic3d/Graphic3d_TransModeFlags.hxx
@@ -21,7 +21,7 @@
 #ifndef Graphic3d_TRANS_MODE_FLAGS_HXX
 #define Graphic3d_TRANS_MODE_FLAGS_HXX
 
-Standard_EXPORT typedef Standard_Integer Graphic3d_TransModeFlags;
+typedef Standard_Integer Graphic3d_TransModeFlags;
 
 enum {
   Graphic3d_TMF_None               = 0x0000,

diff --git a/src/Image/Image_Diff.cxx b/src/Image/Image_Diff.cxx
index 3428fbe404fcdacc4bd693670829528c265e2e24..078fef333ee666fe91e0c0ed8f226d32bd02fbb9 100644 (file)
--- a/src/Image/Image_Diff.cxx
+++ b/src/Image/Image_Diff.cxx
@@ -70,7 +70,7 @@ namespace
   }
 
   static const Standard_Size NEIGHBOR_PIXELS_NB = 8;
-  struct
+  static struct
   {
     Standard_Integer row_inc;
     Standard_Integer col_inc;
@@ -100,7 +100,7 @@ namespace
           && aCol < theData.SizeY();
     }
   }
-  static const NEIGHBOR_PIXELS[NEIGHBOR_PIXELS_NB] =
+  const NEIGHBOR_PIXELS[NEIGHBOR_PIXELS_NB] =
   {
     {-1, -1}, {-1,  0}, {-1,  1},
     { 0, -1},           { 0,  1},

diff --git a/src/Image/Image_PixMap.cxx b/src/Image/Image_PixMap.cxx
index a01c5cedfa0f7a30fec940bef944c067270e8dbd..3dcae01aa175b8529fb456730b53430ae8196954 100644 (file)
--- a/src/Image/Image_PixMap.cxx
+++ b/src/Image/Image_PixMap.cxx
@@ -261,7 +261,6 @@ Quantity_Color Image_PixMap::PixelColor (const Standard_Integer theX,
                              Quantity_Parameter (Standard_Real (aPixel)),
                              Quantity_Parameter (Standard_Real (aPixel)),
                              Quantity_TOC_RGB);
-      break;
     }
     case ImgRGBAF:
     {

diff --git a/src/IntTools/IntTools.cxx b/src/IntTools/IntTools.cxx
index 5ee0c999c16242dadf0151d7c468e4ceed268afa..ef475f433b2085c18500523756fe115e7849519d 100755 (executable)
--- a/src/IntTools/IntTools.cxx
+++ b/src/IntTools/IntTools.cxx
@@ -373,7 +373,6 @@
       else {
        return 2;
       }
-      break;
     }
   default: 
     break;

diff --git a/src/LDOM/LDOM_CharReference.cxx b/src/LDOM/LDOM_CharReference.cxx
index a989d34c05e00de096179d7dfc1a84eb6922c88a..29b55290cc277d4bdd0a369e8146adeb83ef6aa3 100755 (executable)
--- a/src/LDOM/LDOM_CharReference.cxx
+++ b/src/LDOM/LDOM_CharReference.cxx
@@ -34,7 +34,7 @@ const int ENTI_AMP  = 1;
 const int ENTI_LT   = 2;
 const int ENTI_GT   = 3;
 const int ENTI_QUOT = 4;
-const int ENTI_APOS = 5;
+//const int ENTI_APOS = 5;
 
 struct entityRef {
   const char * name;

diff --git a/src/LDOM/LDOM_XmlReader.cxx b/src/LDOM/LDOM_XmlReader.cxx
index ac08408b3291373722398247792d91b5d121c82b..fc1bdf72c2e5d0660e2b49327a215873f3700707 100755 (executable)
--- a/src/LDOM/LDOM_XmlReader.cxx
+++ b/src/LDOM/LDOM_XmlReader.cxx
@@ -38,7 +38,6 @@
 //#include <ctype.h>
 
 const int XML_MIN_BUFFER = 10;
-const int MAX_ATTRIBUTES = 512;
 const int FILE_NONVALUE  = -1;
 
 typedef enum {

diff --git a/src/LDOM/LDOM_XmlWriter.cxx b/src/LDOM/LDOM_XmlWriter.cxx
index 9d6e854b25e38ac5e0506e8c8243031278a06742..17c5f4887e74cc663ae4f6ab1743a67f0bcb1fb3 100755 (executable)
--- a/src/LDOM/LDOM_XmlWriter.cxx
+++ b/src/LDOM/LDOM_XmlWriter.cxx
@@ -101,8 +101,8 @@
 
 static const LXMLCh  gEndElement[] = { chOpenAngle, chForwardSlash, chNull };
 static const LXMLCh  gEndElement1[]= { chForwardSlash, chNull };
-static const LXMLCh  gEndPI[] = { chQuestion, chCloseAngle, chNull };
-static const LXMLCh  gStartPI[] = { chOpenAngle, chQuestion, chNull };
+//static const LXMLCh  gEndPI[] = { chQuestion, chCloseAngle, chNull };
+//static const LXMLCh  gStartPI[] = { chOpenAngle, chQuestion, chNull };
 static const LXMLCh  gXMLDecl1[] =
 {       chOpenAngle, chQuestion, chLatin_x, chLatin_m, chLatin_l
     ,   chSpace, chLatin_v, chLatin_e, chLatin_r, chLatin_s, chLatin_i
@@ -113,11 +113,13 @@ static const LXMLCh  gXMLDecl2[] =
     ,   chLatin_o, chLatin_d, chLatin_i, chLatin_n, chLatin_g, chEqual
     ,   chDoubleQuote, chNull
 };
+/*
 static const LXMLCh  gXMLDecl3[] =
 {       chDoubleQuote, chSpace, chLatin_s, chLatin_t, chLatin_a
     ,   chLatin_n, chLatin_d, chLatin_a, chLatin_l, chLatin_o
     ,   chLatin_n, chLatin_e, chEqual, chDoubleQuote, chNull
 };
+*/
 static const LXMLCh  gXMLDecl4[] =
 {       chDoubleQuote, chQuestion, chCloseAngle
     ,   chLF, chNull
@@ -132,6 +134,7 @@ static const LXMLCh  gStartComment[] =
 {    chOpenAngle, chBang, chDash, chDash, chNull };
 static const LXMLCh  gEndComment[] =
 {    chDash, chDash, chCloseAngle, chNull };
+/*
 static const LXMLCh  gStartDoctype[] =
 {   chOpenAngle, chBang, chLatin_D, chLatin_O, chLatin_C, chLatin_T,
     chLatin_Y, chLatin_P, chLatin_E, chSpace, chNull
@@ -152,6 +155,7 @@ static const LXMLCh  gNotation[] =
 {   chLatin_N, chLatin_D, chLatin_A, chLatin_T, chLatin_A,
     chSpace, chDoubleQuote, chNull
 };
+*/
 
 static LXMLCh * getEncodingName (const LXMLCh * theEncodingName)
 {

diff --git a/src/MeshVS/MeshVS_BuilderPriority.hxx b/src/MeshVS/MeshVS_BuilderPriority.hxx
index 099b83c4dfba61924c06e32fd88a542040827358..d27aab5dab3925fbaa56dbecfd6706041dad4109 100755 (executable)
--- a/src/MeshVS/MeshVS_BuilderPriority.hxx
+++ b/src/MeshVS/MeshVS_BuilderPriority.hxx
@@ -21,7 +21,7 @@
 #ifndef MeshVS_BUILDERPRIORITY_HXX
 #define MeshVS_BUILDERPRIORITY_HXX
 
-Standard_EXPORT typedef Standard_Integer MeshVS_BuilderPriority;
+typedef Standard_Integer MeshVS_BuilderPriority;
 
 enum
 {

diff --git a/src/MeshVS/MeshVS_DisplayModeFlags.hxx b/src/MeshVS/MeshVS_DisplayModeFlags.hxx
index 00e5b4f6d7c2d690af4bea81d247452a8bb578b7..abef87f771ffe1b511cb93e41005a50406df75bc 100755 (executable)
--- a/src/MeshVS/MeshVS_DisplayModeFlags.hxx
+++ b/src/MeshVS/MeshVS_DisplayModeFlags.hxx
@@ -21,7 +21,7 @@
 #ifndef MeshVS_DISPLAY_MODE_FLAGS_HXX
 #define MeshVS_DISPLAY_MODE_FLAGS_HXX
 
-Standard_EXPORT typedef Standard_Integer MeshVS_DisplayModeFlags;
+typedef Standard_Integer MeshVS_DisplayModeFlags;
 
 enum
 {

diff --git a/src/MeshVS/MeshVS_EntityType.hxx b/src/MeshVS/MeshVS_EntityType.hxx
index 9bbed41520caf04b920fcfd45cbbec8a18296aa5..b7b97ade8c8ac09f4209e4968a212d32c46f23d9 100755 (executable)
--- a/src/MeshVS/MeshVS_EntityType.hxx
+++ b/src/MeshVS/MeshVS_EntityType.hxx
@@ -21,7 +21,7 @@
 #ifndef MeshVS_ENTITYTYPEHXX
 #define MeshVS_ENTITYTYPEHXX
 
-Standard_EXPORT typedef enum
+typedef enum
 {
   MeshVS_ET_NONE   = 0x00,
   MeshVS_ET_Node   = 0x01,
@@ -33,8 +33,7 @@ Standard_EXPORT typedef enum
   MeshVS_ET_Element = MeshVS_ET_0D | MeshVS_ET_Link | MeshVS_ET_Face | MeshVS_ET_Volume,
   MeshVS_ET_All     = MeshVS_ET_Element | MeshVS_ET_Node
 
-
-}   MeshVS_EntityType;
+} MeshVS_EntityType;
 
 #endif
 

diff --git a/src/MeshVS/MeshVS_SelectionModeFlags.hxx b/src/MeshVS/MeshVS_SelectionModeFlags.hxx
index 18dac96e1c3610a5416d1bad84f708721046d9a0..885610bc021b2438a7b0d672710b158435e4abe2 100755 (executable)
--- a/src/MeshVS/MeshVS_SelectionModeFlags.hxx
+++ b/src/MeshVS/MeshVS_SelectionModeFlags.hxx
@@ -21,7 +21,7 @@
 #ifndef MeshVS_SELECTION_MODE_FLAGS_HXX
 #define MeshVS_SELECTION_MODE_FLAGS_HXX
 
-Standard_EXPORT typedef enum
+typedef enum
 {
   MeshVS_SMF_Mesh    = 0x0000,
   MeshVS_SMF_Node    = 0x0001,
@@ -35,8 +35,7 @@ Standard_EXPORT typedef enum
 
   MeshVS_SMF_Group   = 0x0100
 
-
-}   MeshVS_SelectionModeFlags;
+} MeshVS_SelectionModeFlags;
 
 #endif
 

diff --git a/src/MeshVS/MeshVS_TwoColors.hxx b/src/MeshVS/MeshVS_TwoColors.hxx
index ecf78139b973885dc7de5816b4e9f420d2e53b13..f3a53c77e8b76395173c4845422a8ad09dea7a0b 100755 (executable)
--- a/src/MeshVS/MeshVS_TwoColors.hxx
+++ b/src/MeshVS/MeshVS_TwoColors.hxx
@@ -30,14 +30,14 @@
 
 #include <Quantity_Color.hxx>
 
-Standard_EXPORT typedef struct {
+typedef struct {
   unsigned int r1 : 8;
   unsigned int g1 : 8;
   unsigned int b1 : 8;
   unsigned int r2 : 8;
   unsigned int g2 : 8;
   unsigned int b2 : 8;
-}   MeshVS_TwoColors;
+} MeshVS_TwoColors;
 
 
 Standard_EXPORT Standard_Integer HashCode ( const MeshVS_TwoColors& theKey,

diff --git a/src/OSD/OSD_Error.cxx b/src/OSD/OSD_Error.cxx
index 962aaabae00d2fc05707e3850e290178118fabff..54ba6f50d161ef358b48417d39438815df471e02 100755 (executable)
--- a/src/OSD/OSD_Error.cxx
+++ b/src/OSD/OSD_Error.cxx
@@ -563,7 +563,7 @@ static ERROR_TABLE commErrorTable [] = {
 
 };
 
-#define COMM_ERR_TABLE_SIZE (  sizeof ( commErrorTable ) / sizeof ( commErrorTable[ 0 ] )  )
+#define COMM_ERR_TABLE_SIZE (int)(sizeof(commErrorTable) / sizeof(commErrorTable[0]))
 
 static ERROR_TABLE dirErrorTable[] = {
 
@@ -578,7 +578,7 @@ static ERROR_TABLE dirErrorTable[] = {
 
 };
 
-#define DIR_ERR_TABLE_SIZE (  sizeof ( dirErrorTable ) / sizeof ( dirErrorTable[ 0 ] )  )
+#define DIR_ERR_TABLE_SIZE (int)(sizeof(dirErrorTable) / sizeof(dirErrorTable[0]))
 
 static ERROR_TABLE fileErrorTable[] = {
 
@@ -620,9 +620,7 @@ static ERROR_TABLE fileNodeErrorTable[] = {
 
 };
 
-#define FILE_NODE_ERR_TABLE_SIZE (  sizeof ( fileNodeErrorTable ) /    \
-                                    sizeof ( fileNodeErrorTable[ 0 ] ) \
-                                 )
+#define FILE_NODE_ERR_TABLE_SIZE (int)(sizeof(fileNodeErrorTable) / sizeof(fileNodeErrorTable[0]))
 
 static Standard_Integer _get_comm_error ( DWORD );
 

diff --git a/src/OpenGl/OpenGl_Matrix.hxx b/src/OpenGl/OpenGl_Matrix.hxx
index cf9f875b09e471c078e4b566128a899cfd43a9c0..914b82a88af70c0f7e67d3e18a030baaf8e09a61 100644 (file)
--- a/src/OpenGl/OpenGl_Matrix.hxx
+++ b/src/OpenGl/OpenGl_Matrix.hxx
@@ -32,7 +32,7 @@ struct OpenGl_Matrix
 Standard_EXPORT void OpenGl_Multiplymat3 (OpenGl_Matrix *c, const OpenGl_Matrix *a, const OpenGl_Matrix *b);
 Standard_EXPORT void OpenGl_Transposemat3 (OpenGl_Matrix *c, const OpenGl_Matrix *a);
 
-const static OpenGl_Matrix OpenGl_IdentityMatrix =
+static const OpenGl_Matrix OpenGl_IdentityMatrix =
 {
   // mat[4][4]
   { { 1.0f, 0.0f, 0.0f, 0.0f },

diff --git a/src/PCollection/PCollection_HExtendedString.cxx b/src/PCollection/PCollection_HExtendedString.cxx
index fc8e125d7fe6141a771a6d5b7bb077b58e1f1cec..0ae6e55d7c2d576464de7d2801c13b3c54a67cf8 100755 (executable)
--- a/src/PCollection/PCollection_HExtendedString.cxx
+++ b/src/PCollection/PCollection_HExtendedString.cxx
@@ -357,10 +357,10 @@ Standard_Integer PCollection_HExtendedString::Location
 {
    if (ToIndex > Length() || FromIndex <= 0 || FromIndex > ToIndex ) 
                       Standard_OutOfRange::Raise();
-   for(Standard_Integer i = FromIndex-1, count = 0; i <= ToIndex-1; i++) 
+   for(Standard_Integer i = FromIndex-1, icount = 0; i <= ToIndex-1; i++) 
               if(Data(i) == C) {
-               count++;
-               if ( count == N ) return (i+1);
+               icount++;
+               if ( icount == N ) return (i+1);
              }
    return 0 ;
 }

diff --git a/src/PLib/PLib.cxx b/src/PLib/PLib.cxx
index 9bcd5889ac00a77732ea116899af46921e3eb2a0..8c0ab96a41460dedfdf133eaa4b91bce868bbba5 100755 (executable)
--- a/src/PLib/PLib.cxx
+++ b/src/PLib/PLib.cxx
@@ -1401,7 +1401,6 @@ void  PLib::EvalPolynomial(const Standard_Real    Par,
       }
     }
     break;
-    break;
   }
   case 15 : {
     *tmpRA = *tmpPA; tmpRA++; tmpPA++;

diff --git a/src/QABugs/QABugs_19.cxx b/src/QABugs/QABugs_19.cxx
index 58cd291d964394caa4f4d2a1b76bdbd90a2e69cd..04c9a8fdc4c534d9ffaa03fcec924017f59ee673 100755 (executable)
--- a/src/QABugs/QABugs_19.cxx
+++ b/src/QABugs/QABugs_19.cxx
@@ -295,7 +295,7 @@ Standard_Integer OCC22595 (Draw_Interpretor& di, Standard_Integer /*argc*/, cons
 #include <BRepExtrema_DistShapeShape.hxx>
 #include <BRepTools.hxx>
 
-Standard_Boolean static OCC23774Test(const TopoDS_Face& grossPlateFace, const TopoDS_Shape& originalWire, Draw_Interpretor& di)
+static Standard_Boolean OCC23774Test(const TopoDS_Face& grossPlateFace, const TopoDS_Shape& originalWire, Draw_Interpretor& di)
 {
   BRepExtrema_DistShapeShape distShapeShape(grossPlateFace,originalWire,Extrema_ExtFlag_MIN);
   if(!distShapeShape.IsDone()) {

diff --git a/src/StepFile/recfile.pc b/src/StepFile/recfile.pc
index 0ae1de1c44796a1f6e05a318988c2c31bebd4b10..d76a6df5ed58078e27ba819ce1bc7fdfd5d82ed4 100755 (executable)
--- a/src/StepFile/recfile.pc
+++ b/src/StepFile/recfile.pc
@@ -219,7 +219,7 @@ void rec_finfile()  {  }
 /*   GESTION DES RECORDS   */
 
 /*   ENREGISTRER UN RECORD (deja pret)    */
-void static rec_new(struct rec* newrec)
+static void rec_new(struct rec* newrec)
 /*  nouveau record a enregistrer  */
 {
  nbrec ++ ;

diff --git a/src/TNaming/TNaming.cxx b/src/TNaming/TNaming.cxx
index c00acfdcbd3eb9ebb0c89e42d40f825fb840f03f..5a076f5c1e4e8d0053e2d0d4e19fac551442fa7b 100755 (executable)
--- a/src/TNaming/TNaming.cxx
+++ b/src/TNaming/TNaming.cxx
@@ -144,7 +144,7 @@ static void MapShapes(const TDF_Label& LCible, const TDF_Label& LSource, TopTool
 //purpose  : TNaming
 //=======================================================================
 
-void static SubstituteShape(const TopoDS_Shape& oldShape,
+static void SubstituteShape(const TopoDS_Shape& oldShape,
                            const TopoDS_Shape& newShape,
                            TNaming_DataMapOfShapePtrRefShape& amap) 
 {

diff --git a/src/TNaming/TNaming_Localizer.cxx b/src/TNaming/TNaming_Localizer.cxx
index 997033826590881c8633ff389fc3fadcdef57580..4d5bded97bc7b8a039a4ef943155bcf7105930da 100755 (executable)
--- a/src/TNaming/TNaming_Localizer.cxx
+++ b/src/TNaming/TNaming_Localizer.cxx
@@ -281,11 +281,9 @@ Standard_Boolean TNaming_Localizer::IsNew (const TopoDS_Shape&    S,
   for (; itLab.More(); itLab.Next()) {
     if (itLab.OldShape().IsSame(S)) {
       return Standard_False;
-      break;
     }
     if (itLab.NewShape().IsSame(S)) {
       return Standard_True;
-      break;
     }
   }
 #ifdef DEB

diff --git a/src/TopLoc/TopLoc_Location.cxx b/src/TopLoc/TopLoc_Location.cxx
index 732e0232dac90664d0c3c824bb96e6f19c4150e7..285e082c7a8f1cda80da74dd2973248c0176ecf4 100755 (executable)
--- a/src/TopLoc/TopLoc_Location.cxx
+++ b/src/TopLoc/TopLoc_Location.cxx
@@ -29,7 +29,7 @@
 #include <gp_Trsf.hxx>
 #include <TopLoc_TrsfPtr.hxx>
 
-const static gp_Trsf TheIdentity;
+static const gp_Trsf TheIdentity;
 
 
 static Standard_Boolean IsInternalIdentity(const TopLoc_Location& loc)

diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_KPart.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_KPart.cxx
index 3f628c4b837034701e9bb03cc2af3b89e733bd71..2c4439308b17fef22227528226eeae0f47564458 100755 (executable)
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_KPart.cxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_KPart.cxx
@@ -2136,18 +2136,15 @@ static Standard_Boolean disjPerformCommon(const TopTools_IndexedMapOfShape& theM
       switch (ires) {
       case RESNULL: {
        continue;
-       break;
       }
       case RESSHAPE12 : {
        aMapOfCommonOfCouple.Add(sol1);
        aMapOfCommonOfCouple.Add(sol2);
        continue;
-       break;
       }
       case RESSHAPE1 : {
        aMapOfCommonOfCouple.Add(sol1);
        continue;
-       break;
       }
       case RESSHAPE2 : {
        aMapOfCommonOfCouple.Add(sol2);