summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortpaviot <tpaviot@gmail.com>2011-10-20 22:01:47 +0200
committerQbProg <tholag@gmail.com>2011-10-28 20:12:50 +0200
commitb73a3bebd710867d92b93d62f76e05e881f32f21 (patch)
tree54db83f2854bb79fbd314bb2b0ffc26e1ed39482
parent9cecd5f3d1932474ddf3f764b6aeb3423c29e9ea (diff)
downloadoce-b73a3bebd710867d92b93d62f76e05e881f32f21.tar.gz
oce-b73a3bebd710867d92b93d62f76e05e881f32f21.zip
[warning-fix][empty-body]
-rw-r--r--inc/LDOM_DeclareSequence.hxx2
-rw-r--r--inc/Standard_String.hxx16
-rw-r--r--src/Adaptor3d/Adaptor3d_TopolTool.cxx4
-rw-r--r--src/AlienImage/AlienImage_GIFLZWDict.cxx2
-rw-r--r--src/BOP/BOP_ArgumentAnalyzer.cxx2
-rw-r--r--src/BOP/BOP_ShellSolid_3.cxx2
-rw-r--r--src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx4
-rw-r--r--src/FEmTool/FEmTool_Assembly.cxx8
-rw-r--r--src/FEmTool/FEmTool_ProfileMatrix.cxx2
-rw-r--r--src/IGESDefs/IGESDefs_ToolMacroDef.cxx2
-rw-r--r--src/LDOM/LDOM_XmlWriter.cxx2
-rw-r--r--src/MgtTopoDS/MgtTopoDS.cxx2
-rw-r--r--src/PlotMgt/PlotMgt_fillpolyarc.cxx1
-rw-r--r--src/PlotMgt/PlotMgt_fillpolygon.cxx4
-rw-r--r--src/RWStl/RWStl.cxx2
-rw-r--r--src/Resource/Resource_Manager.cxx2
-rw-r--r--src/ShapeFix/ShapeFix_ComposeShell.cxx2
-rw-r--r--src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx4
-rw-r--r--src/StepData/StepData_StepWriter.cxx6
19 files changed, 32 insertions, 37 deletions
diff --git a/inc/LDOM_DeclareSequence.hxx b/inc/LDOM_DeclareSequence.hxx
index 9f064d3c..4d7a7fe8 100644
--- a/inc/LDOM_DeclareSequence.hxx
+++ b/inc/LDOM_DeclareSequence.hxx
@@ -202,7 +202,7 @@ void ClassName::InsertAt (const Standard_Integer anI, const Type& aVal) \
if (anItem -> myPrev) anItem -> myPrev -> myNext = anItem; \
myLength++; \
myICur++; \
- } else ; \
+ } \
} \
\
void ClassName::Clear () \
diff --git a/inc/Standard_String.hxx b/inc/Standard_String.hxx
index 2886485d..7500544d 100644
--- a/inc/Standard_String.hxx
+++ b/inc/Standard_String.hxx
@@ -10,8 +10,8 @@
# if OptJr
-#define STRLEN(s,i) {(i) = 0;while((s)[(i)++] != '\0');(i)--;}
-#define EXTSTRLEN(s,i) {(i) = 0;while((s)[(i)++] != 0);(i)--;}
+#define STRLEN(s,i) {(i) = 0;while((s)[(i)++] != '\0') {} (i)--;}
+#define EXTSTRLEN(s,i) {(i) = 0;while((s)[(i)++] != 0) {} (i)--;}
#define STRCPY(s1,s2,i) {for(LoopIndex=0; LoopIndex<(i); LoopIndex++)(s1)[LoopIndex] = (s2)[LoopIndex];}
#define STRCAT(s1,i,s2,j) {for(LoopIndex=0; LoopIndex<(j); LoopIndex++) (s1)[(i)+LoopIndex] = (s2)[LoopIndex];}
@@ -68,14 +68,14 @@ inline Standard_Boolean ExtStringTestOfZero(const Standard_Integer anExtString )
if ((ptrdiff_t(aString) & 1) == 0) { \
LoopIndex = 0 ; \
if ((ptrdiff_t(aString) & 3) == 0) { \
- while (CStringTestOfZero(((Standard_Integer *)aString)[LoopIndex++])); \
+ while (CStringTestOfZero(((Standard_Integer *)aString)[LoopIndex++])) {} \
LoopIndex = ( LoopIndex << 2 ) - 4 ; \
} \
else { \
- while (HalfCStringTestOfZero(((Standard_ExtCharacter *)aString)[LoopIndex++])); \
+ while (HalfCStringTestOfZero(((Standard_ExtCharacter *)aString)[LoopIndex++])) {} \
LoopIndex = ( LoopIndex << 1 ) - 2 ; \
} \
- while (aString[LoopIndex++] != '\0'); \
+ while (aString[LoopIndex++] != '\0') {} \
LoopIndex -= 1 ; \
} \
else \
@@ -85,7 +85,7 @@ inline Standard_Boolean ExtStringTestOfZero(const Standard_Integer anExtString )
#define EXTSTRINGLEN( anExtString , LoopIndex ) { \
if ((ptrdiff_t(anExtString) & 3) == 0) { \
LoopIndex = 0 ; \
- while (ExtStringTestOfZero(((Standard_Integer *)anExtString)[LoopIndex++]));\
+ while (ExtStringTestOfZero(((Standard_Integer *)anExtString)[LoopIndex++])) {} \
LoopIndex = ( LoopIndex << 1 ) - 2 ; \
if ( anExtString[ LoopIndex ] != 0 ) \
LoopIndex += 1 ; \
@@ -878,8 +878,8 @@ inline Standard_Boolean ExtStringTestOfZero(const Standard_Integer anExtString )
# else
-#define STRLEN(s,i) {(i) = 0;while((s)[(i)++] != '\0');(i)--;}
-#define EXTSTRLEN(s,i) {(i) = 0;while((s)[(i)++] != 0);(i)--;}
+#define STRLEN(s,i) {(i) = 0;while((s)[(i)++] != '\0') {} (i)--;}
+#define EXTSTRLEN(s,i) {(i) = 0;while((s)[(i)++] != 0) {}} (i)--;}
#define STRCPY(s1,s2,i) {for(int j=0; j<(i); j++)(s1)[j] = (s2)[j];}
#define STRCAT(s1,i,s2,j) {for(int k=0; k<(j); k++) (s1)[(i)+k] = (s2)[k];}
diff --git a/src/Adaptor3d/Adaptor3d_TopolTool.cxx b/src/Adaptor3d/Adaptor3d_TopolTool.cxx
index 9f47a95b..ca5ec98e 100644
--- a/src/Adaptor3d/Adaptor3d_TopolTool.cxx
+++ b/src/Adaptor3d/Adaptor3d_TopolTool.cxx
@@ -1125,7 +1125,7 @@ void Adaptor3d_TopolTool::BSplSamplePnts(const Standard_Real theDefl,
else { //myNbSamplesU == 3
//insert in bigger segment
i = 2;
- while(!anUFlg(i++));
+ while(!anUFlg(i++)) {}
if(i < nbsu/2) j = Min(i+(nbsu-i)/2, nbsu-1);
else j = Max(i/2, 2);
}
@@ -1204,7 +1204,7 @@ void Adaptor3d_TopolTool::BSplSamplePnts(const Standard_Real theDefl,
else { //myNbSamplesU == 3
//insert in bigger segment
i = 2;
- while(!aVFlg(i++));
+ while(!aVFlg(i++)) {}
if(i < nbsv/2) j = Min(i+(nbsv-i)/2, nbsv-1);
else j = Max(i/2, 2);
}
diff --git a/src/AlienImage/AlienImage_GIFLZWDict.cxx b/src/AlienImage/AlienImage_GIFLZWDict.cxx
index 363a6101..652a6c0b 100644
--- a/src/AlienImage/AlienImage_GIFLZWDict.cxx
+++ b/src/AlienImage/AlienImage_GIFLZWDict.cxx
@@ -546,7 +546,7 @@ static chist_vec __fastcall mediancut (
int minr, maxr, ming, maxg, minb, maxb, v;
int halfsum, lowersum;
- for ( bi = 0; bv[ bi ].colors < 2 && bi < boxes; ++bi );
+ for ( bi = 0; bv[ bi ].colors < 2 && bi < boxes; ++bi ) {}
if ( bi == boxes ) break;
diff --git a/src/BOP/BOP_ArgumentAnalyzer.cxx b/src/BOP/BOP_ArgumentAnalyzer.cxx
index 84e7c491..7dfb8c2c 100644
--- a/src/BOP/BOP_ArgumentAnalyzer.cxx
+++ b/src/BOP/BOP_ArgumentAnalyzer.cxx
@@ -512,7 +512,7 @@ void BOP_ArgumentAnalyzer::TestRebuildFace()
Standard_Integer nbedgeused = 0;
anExpE.Init(aLF.First(), TopAbs_EDGE);
- for(; anExpE.More(); anExpE.Next(), nbedgeused++);
+ for(; anExpE.More(); anExpE.Next(), nbedgeused++) {}
if(nbstartedges != nbedgeused) {
bBadFace = Standard_True;
diff --git a/src/BOP/BOP_ShellSolid_3.cxx b/src/BOP/BOP_ShellSolid_3.cxx
index a7ae2d6d..f5709815 100644
--- a/src/BOP/BOP_ShellSolid_3.cxx
+++ b/src/BOP/BOP_ShellSolid_3.cxx
@@ -450,7 +450,7 @@ Standard_Boolean BOP_ShellSolid::SplitFace(const Standard_Integer theFaceIndex,
if(aLF.Extent() != 2) {
for(; anItNewF.More(); anItNewF.Next()) {
TopExp_Explorer anExp(anItNewF.Value(), TopAbs_EDGE);
- for(; anExp.More(); anExp.Next(), nbedgeused++);
+ for(; anExp.More(); anExp.Next(), nbedgeused++) {}
}
if(nbedgeused != nbstartedges) {
return Standard_False;
diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
index 1e6b8aa5..81bc3e0b 100644
--- a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
@@ -2807,13 +2807,13 @@ void BRepBuilderAPI_Sewing::VerticesAssembling()
#ifdef DEB
cout << "Assemble " << nbVert << " vertices on faces..." << endl;
#endif
- while (GlueVertices(myVertexNode,myNodeSections,myBoundFaces,myTolerance));
+ while (GlueVertices(myVertexNode,myNodeSections,myBoundFaces,myTolerance)) {}
}
if (nbVertFree) {
#ifdef DEB
cout << "Assemble " << nbVertFree << " vertices on floating edges..." << endl;
#endif
- while (GlueVertices(myVertexNodeFree,myNodeSections,myBoundFaces,myTolerance));
+ while (GlueVertices(myVertexNodeFree,myNodeSections,myBoundFaces,myTolerance)) {}
}
}
}
diff --git a/src/FEmTool/FEmTool_Assembly.cxx b/src/FEmTool/FEmTool_Assembly.cxx
index 1e7d4f39..b300677d 100644
--- a/src/FEmTool/FEmTool_Assembly.cxx
+++ b/src/FEmTool/FEmTool_Assembly.cxx
@@ -533,7 +533,7 @@ void FEmTool_Assembly::AddConstraint(const Standard_Integer IndexofConstraint,
for(i = Aux1->Lower(); i <= Aux1->Upper(); i++) Coeff->SetValue(i, Aux1->Value(i));
for(i = Aux1->Upper() + 1; i <= Imax; i++) Coeff->SetValue(i, 0.);
Iter.Initialize(L);
- for(i = 1; i < s1; Iter.Next(), i++);
+ for(i = 1; i < s1; Iter.Next(), i++) {}
Iter.Value() = Coeff;
}
else if(Imin > Aux1->Upper() && Imax >= Aux2->Lower()) {
@@ -542,7 +542,7 @@ void FEmTool_Assembly::AddConstraint(const Standard_Integer IndexofConstraint,
for(i = Imin; i <= Aux2->Lower() - 1; i++) Coeff->SetValue(i, 0.);
for(i = Aux2->Lower(); i <= Aux2->Upper(); i++) Coeff->SetValue(i, Aux2->Value(i));
Iter.Initialize(L);
- for(i = 1; i < s2; Iter.Next(), i++);
+ for(i = 1; i < s2; Iter.Next(), i++) {}
Iter.Value() = Coeff;
}
else if(Imin > Aux1->Upper() && Imax < Aux2->Lower()) {
@@ -550,7 +550,7 @@ void FEmTool_Assembly::AddConstraint(const Standard_Integer IndexofConstraint,
Coeff = new TColStd_HArray1OfReal(Imin,Imax);
Coeff->Init(0.);
Iter.Initialize(L);
- for(i = 1; i < s1; Iter.Next(), i++);
+ for(i = 1; i < s1; Iter.Next(), i++) {}
L.InsertAfter(Coeff,Iter);
}
else {
@@ -560,7 +560,7 @@ void FEmTool_Assembly::AddConstraint(const Standard_Integer IndexofConstraint,
for(i = Aux1->Upper() + 1; i <= Aux2->Lower() - 1; i++) Coeff->SetValue(i, 0.);
for(i = Aux2->Lower(); i <= Aux2->Upper(); i++) Coeff->SetValue(i, Aux2->Value(i));
Iter.Initialize(L);
- for(i = 1; i < s1; Iter.Next(), i++);
+ for(i = 1; i < s1; Iter.Next(), i++) {}
Iter.Value() = Coeff;
Iter.Next();
L.Remove(Iter);
diff --git a/src/FEmTool/FEmTool_ProfileMatrix.cxx b/src/FEmTool/FEmTool_ProfileMatrix.cxx
index 2f7e421b..9953b7eb 100644
--- a/src/FEmTool/FEmTool_ProfileMatrix.cxx
+++ b/src/FEmTool/FEmTool_ProfileMatrix.cxx
@@ -29,7 +29,7 @@
for(i = 1, k = 1; i <= FirstIndexes.Length(); i++)
for(j = FirstIndexes(i); j <= i; j++) {
- for(l = i+1; l <= FirstIndexes.Length() && j < FirstIndexes(l); l++);
+ for(l = i+1; l <= FirstIndexes.Length() && j < FirstIndexes(l); l++) {}
if(l > FirstIndexes.Length()) NextCoeff->SetValue(k, 0);
else NextCoeff->SetValue(k, l);
diff --git a/src/IGESDefs/IGESDefs_ToolMacroDef.cxx b/src/IGESDefs/IGESDefs_ToolMacroDef.cxx
index 2bef06fd..16583fa4 100644
--- a/src/IGESDefs/IGESDefs_ToolMacroDef.cxx
+++ b/src/IGESDefs/IGESDefs_ToolMacroDef.cxx
@@ -37,7 +37,7 @@ void IGESDefs_ToolMacroDef::ReadOwnParams
// Counting the no. of language statements.
Standard_Integer nbval; // svv Jan 10 2000 : porting on DEC
for (nbval = 0; PR.CurrentNumber() != PR.NbParams();
- nbval++, PR.SetCurrentNumber(PR.CurrentNumber() + 1));
+ nbval++, PR.SetCurrentNumber(PR.CurrentNumber() + 1)) {}
PR.SetCurrentNumber(tempCurrent);
if (nbval > 0) langStatements =
diff --git a/src/LDOM/LDOM_XmlWriter.cxx b/src/LDOM/LDOM_XmlWriter.cxx
index 3efe2701..3a615f92 100644
--- a/src/LDOM/LDOM_XmlWriter.cxx
+++ b/src/LDOM/LDOM_XmlWriter.cxx
@@ -152,7 +152,7 @@ static LXMLCh * getEncodingName (const LXMLCh * theEncodingName)
anEncoding = anUTFEncoding;
}
Standard_Integer aLen = 0;
- while (anEncoding[aLen++] != chNull);
+ while (anEncoding[aLen++] != chNull) {}
LXMLCh * aResult = new LXMLCh [aLen];
memcpy (aResult, anEncoding, aLen * sizeof (LXMLCh));
return aResult;
diff --git a/src/MgtTopoDS/MgtTopoDS.cxx b/src/MgtTopoDS/MgtTopoDS.cxx
index 208185d4..07d5a7b5 100644
--- a/src/MgtTopoDS/MgtTopoDS.cxx
+++ b/src/MgtTopoDS/MgtTopoDS.cxx
@@ -368,7 +368,7 @@ void MgtTopoDS::Translate1
// count the number of <sub-shape> of the Shape's TShape
Standard_Integer nbElem = 0;
TopoDS_Iterator itr(S);
- for (;itr.More();++nbElem,itr.Next());
+ for (;itr.More();++nbElem,itr.Next()) {}
if (nbElem) {
Handle(PTopoDS_HArray1OfShape1) myArray =
diff --git a/src/PlotMgt/PlotMgt_fillpolyarc.cxx b/src/PlotMgt/PlotMgt_fillpolyarc.cxx
index 7ca74cc2..31c543ba 100644
--- a/src/PlotMgt/PlotMgt_fillpolyarc.cxx
+++ b/src/PlotMgt/PlotMgt_fillpolyarc.cxx
@@ -181,7 +181,6 @@ int __InitFillArc(double X, double Y, double a, double b, double alpha,
(mpo_lines+i)->type = 5;
else (mpo_lines+i)->type = 4;
}
- else;
// cout << "Xlm = " << (mpo_lines+i)->X3 << " Xrm = " << (mpo_lines+i)->X4 << endl << flush;
// cout << "------------ i = " << i << endl << flush;
}
diff --git a/src/PlotMgt/PlotMgt_fillpolygon.cxx b/src/PlotMgt/PlotMgt_fillpolygon.cxx
index ee22b078..f04ee01e 100644
--- a/src/PlotMgt/PlotMgt_fillpolygon.cxx
+++ b/src/PlotMgt/PlotMgt_fillpolygon.cxx
@@ -153,8 +153,6 @@ int __InitFillPolygon(double* X, double* Y, int n, double step, double gamma)
|| (level == Ypts[j])) k++;
if (level == Ypts[j+1])
if (mpo_sign(Ypts[j] - Ypts[j+1]) == mpo_next_sign(j, n)) k++;
- else;
- else;
}
mpo_Xs[i] = (double *)malloc(sizeof(double)*k);
mpo_Ys[i] = (double *)malloc(sizeof(double)*k);
@@ -182,8 +180,6 @@ int __InitFillPolygon(double* X, double* Y, int n, double step, double gamma)
{
mpo_Xs[i][k] = Xpts[j+1]; k++;
}
- else;
- else;
}
if (k != mpo_sizes[i])
diff --git a/src/RWStl/RWStl.cxx b/src/RWStl/RWStl.cxx
index 6bee4c32..a535873c 100644
--- a/src/RWStl/RWStl.cxx
+++ b/src/RWStl/RWStl.cxx
@@ -436,7 +436,7 @@ Handle_StlMesh_Mesh RWStl::ReadAscii(const OSD_Path& aPath)
rewind(file);
// skip header
- while (getc(file) != '\n');
+ while (getc(file) != '\n') {}
#ifdef DEB
cout << "start mesh\n";
#endif
diff --git a/src/Resource/Resource_Manager.cxx b/src/Resource/Resource_Manager.cxx
index c2de0799..f2f726cc 100644
--- a/src/Resource/Resource_Manager.cxx
+++ b/src/Resource/Resource_Manager.cxx
@@ -177,7 +177,7 @@ static Standard_Integer WhatKindOfLine(OSD_File& aFile,
if (!Pos2 || Pos1 == Pos2)
return ERROR;
- for (Pos = Pos2-1; Line.Value(Pos) == '\t' || Line.Value(Pos) == ' ' ; Pos--);
+ for (Pos = Pos2-1; Line.Value(Pos) == '\t' || Line.Value(Pos) == ' ' ; Pos--) {}
aToken1 = Line.SubString(Pos1, Pos);
if (Debug)
diff --git a/src/ShapeFix/ShapeFix_ComposeShell.cxx b/src/ShapeFix/ShapeFix_ComposeShell.cxx
index f4f6cac7..0846685e 100644
--- a/src/ShapeFix/ShapeFix_ComposeShell.cxx
+++ b/src/ShapeFix/ShapeFix_ComposeShell.cxx
@@ -712,7 +712,7 @@ static void DistributeSplitPoints (const Handle(ShapeExtend_WireData) &sbwd,
params.SetValue ( i, ( isreversed ? l : f ) );
}
- for ( i=1; i <= indexes.Length() && indexes(i) < index; i++ );
+ for ( i=1; i <= indexes.Length() && indexes(i) < index; i++ ) {}
for ( Standard_Integer shift = 1; i <= indexes.Length() && indexes(i) == index; i++ ) {
while ( shift < nsplit && isreversed != (Standard_Boolean) ( values(i) > params(shift) ) ) shift++;
indexes.SetValue ( i, index + shift - 1 );
diff --git a/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx b/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx
index b8a70efb..6c137389 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx
@@ -212,7 +212,7 @@ static void CorrectSplitValues(const Handle(TColStd_HSequenceOfReal) orig3d,
}
if(new2d->Value(len3d) > Last3d) {
Standard_Integer ind; // svv #1
- for( ind = len3d; ind > 1 && !fixNew2d(ind); ind--);
+ for( ind = len3d; ind > 1 && !fixNew2d(ind); ind--) {}
Standard_Real lastFix = new2d->Value(ind);
for(i = len3d; i >= ind; i--) {
new2d->SetValue(i,lastFix);
@@ -237,7 +237,7 @@ static void CorrectSplitValues(const Handle(TColStd_HSequenceOfReal) orig3d,
}
if(new3d->Value(len2d) > Last2d) {
Standard_Integer ind; // svv #1
- for(ind = len2d; ind > 1 && !fixNew3d(ind); ind--);
+ for(ind = len2d; ind > 1 && !fixNew3d(ind); ind--) {}
Standard_Real lastFix = new3d->Value(ind);
for(i = len2d; i >= ind; i--) {
new3d->SetValue(i,lastFix);
diff --git a/src/StepData/StepData_StepWriter.cxx b/src/StepData/StepData_StepWriter.cxx
index 84e01ca2..a9b44f87 100644
--- a/src/StepData/StepData_StepWriter.cxx
+++ b/src/StepData/StepData_StepWriter.cxx
@@ -815,13 +815,13 @@ void StepData_StepWriter::Send (const TCollection_AsciiString& val)
break;
}
Standard_Integer stop = StepLong; // position of last separator
- for ( ; stop > 0 && aval.Value(stop) != ' '; stop-- );
+ for ( ; stop > 0 && aval.Value(stop) != ' '; stop-- ) {}
if ( ! stop ) {
stop = StepLong;
- for ( ; stop > 0 && aval.Value(stop) != '\\'; stop-- );
+ for ( ; stop > 0 && aval.Value(stop) != '\\'; stop-- ) {}
if ( ! stop ) {
stop = StepLong;
- for ( ; stop > 0 && aval.Value(stop) != '_'; stop-- );
+ for ( ; stop > 0 && aval.Value(stop) != '_'; stop-- ) {}
if ( ! stop ) stop = StepLong;
}
}