OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00
Code

0024284: Some trivial warnings produced by ICC 14

Browse Source 
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)
This commit is contained in:
abv 2013-10-24 09:22:29 +04:00 committed by bugmaster
parent 9447f91258
commit f24125b9e5
35 changed files with 30 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Adaptor3d/Adaptor3d_IsoCurve.cxx
View File

@ -553,7 +553,6 @@ GeomAbs_CurveType Adaptor3d_IsoCurve::GetType() const {
Standard_NoSuchObject::Raise("Adaptor3d_IsoCurve:NoneIso");
// portage WNT
return GeomAbs_OtherCurve;
break;
}
}
break;

5
src/Adaptor3d/Adaptor3d_SurfaceOfLinearExtrusion.cxx
View File

@ -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:

2
src/Adaptor3d/Adaptor3d_SurfaceOfRevolution.cxx
View File

@ -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:

2
src/BRepFeat/BRepFeat.cxx
View File

@ -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;

1
src/BRepOffset/BRepOffset_Tool.cxx
View File

@ -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;

2
src/CDF/CDF.cxx
View File

@ -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;

6
src/CPnts/CPnts_UniformDeflection.cxx
View File

@ -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)
{

2
src/DDataStd/DDataStd_DrawDriver.cxx
View File

@ -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 :
{

4
src/Draw/Draw_PInterp.hxx
View File

@ -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

1
src/Draw/Draw_Window.cxx
View File

@ -1396,7 +1396,6 @@ LRESULT APIENTRY DrawWindow::DrawProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARA
localObjet->WExpose();
localObjet->Redraw();
return 0l;
break;
}
default:

1
src/Extrema/Extrema_ExtElCS.cxx
View File

@ -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();

2
src/FSD/FSD_BinaryFile.cxx
View File

@ -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

45
src/FSD/FSD_CmpFile.cxx
View File

@ -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
}
//=======================================================================

2
src/Graphic3d/Graphic3d_TransModeFlags.hxx
View File

@ -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,

4
src/Image/Image_Diff.cxx
View File

@ -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},

1
src/Image/Image_PixMap.cxx
View File

@ -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:
{

1
src/IntTools/IntTools.cxx
View File

@ -373,7 +373,6 @@
else {
return 2;
}
break;
}
default:
break;

2
src/LDOM/LDOM_CharReference.cxx
View File

@ -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;

1
src/LDOM/LDOM_XmlReader.cxx
View File

@ -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 {

8
src/LDOM/LDOM_XmlWriter.cxx
View File

@ -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)
{

2
src/MeshVS/MeshVS_BuilderPriority.hxx
View File

@ -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
{

2
src/MeshVS/MeshVS_DisplayModeFlags.hxx
View File

@ -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
{

5
src/MeshVS/MeshVS_EntityType.hxx
View File

@ -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

5
src/MeshVS/MeshVS_SelectionModeFlags.hxx
View File

@ -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

4
src/MeshVS/MeshVS_TwoColors.hxx
View File

@ -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,

8
src/OSD/OSD_Error.cxx
View File

@ -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 );

2
src/OpenGl/OpenGl_Matrix.hxx
View File

@ -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 },

6
src/PCollection/PCollection_HExtendedString.cxx
View File

@ -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 ;
}

1
src/PLib/PLib.cxx
View File

@ -1401,7 +1401,6 @@ void PLib::EvalPolynomial(const Standard_Real Par,
}
}
break;
break;
}
case 15 : {
*tmpRA = *tmpPA; tmpRA++; tmpPA++;

2
src/QABugs/QABugs_19.cxx
View File

@ -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()) {

2
src/StepFile/recfile.pc
View File

@ -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 ++ ;

2
src/TNaming/TNaming.cxx
View File

@ -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)
{

2
src/TNaming/TNaming_Localizer.cxx
View File

@ -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

2
src/TopLoc/TopLoc_Location.cxx
View File

@ -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)

3
src/TopOpeBRepBuild/TopOpeBRepBuild_KPart.cxx
View File

@ -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);