From bd0b3e60979f776c5a2719dac4a2db67c8d427dc Mon Sep 17 00:00:00 2001 From: abv Date: Fri, 25 Oct 2013 06:43:43 +0400 Subject: [PATCH] Eliminate newly appeared warnings --- src/BOPAlgo/BOPAlgo_Builder_2.cxx | 1 - src/Graphic3d/Graphic3d_ShaderObject.cxx | 2 +- src/OSD/OSD_Disk.cxx | 3 ++- src/OpenGl/OpenGl_ShaderProgram.cxx | 2 +- src/TDataStd/TDataStd_NamedData.cxx | 12 ++++++------ src/VrmlData/VrmlData_IndexedFaceSet.cxx | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/BOPAlgo/BOPAlgo_Builder_2.cxx b/src/BOPAlgo/BOPAlgo_Builder_2.cxx index 341ea4fca5..b1099581af 100644 --- a/src/BOPAlgo/BOPAlgo_Builder_2.cxx +++ b/src/BOPAlgo/BOPAlgo_Builder_2.cxx @@ -97,7 +97,6 @@ void BOPAlgo_Builder::BuildSplitFaces() { Standard_Boolean bHasFaceInfo, bIsClosed, bIsDegenerated, bToReverse; Standard_Integer i, j, k, aNbS, aNbPBIn, aNbPBOn, aNbPBSc, aNbAV, nSp; - Standard_Boolean bRunParallel; Standard_Size aNbBF; TopoDS_Face aFF, aFSD; TopoDS_Edge aSp, aEE; diff --git a/src/Graphic3d/Graphic3d_ShaderObject.cxx b/src/Graphic3d/Graphic3d_ShaderObject.cxx index f83ab1002c..57f47258b3 100644 --- a/src/Graphic3d/Graphic3d_ShaderObject.cxx +++ b/src/Graphic3d/Graphic3d_ShaderObject.cxx @@ -59,7 +59,7 @@ Handle(Graphic3d_ShaderObject) Graphic3d_ShaderObject::CreateFromFile (const Gra } aFile.Open (OSD_ReadOnly, OSD_Protection()); - aFile.Read (aShader->mySource, aFile.Size()); + aFile.Read (aShader->mySource, (int)aFile.Size()); aFile.Close(); return aShader; diff --git a/src/OSD/OSD_Disk.cxx b/src/OSD/OSD_Disk.cxx index 0de301fe6f..a6a3cc150b 100755 --- a/src/OSD/OSD_Disk.cxx +++ b/src/OSD/OSD_Disk.cxx @@ -415,7 +415,7 @@ static void __fastcall _osd_wnt_set_disk_name ( TCollection_AsciiString& result, } /* end if */ if ( k == 0 ) - + { if ( path.Name ().UsefullLength () == 0 && path.Extension ().UsefullLength () == 0 ) goto badPath; @@ -427,6 +427,7 @@ static void __fastcall _osd_wnt_set_disk_name ( TCollection_AsciiString& result, dir += path.Extension (); } // end else + } if ( dir.Value ( dir.UsefullLength () ) != TEXT( '\\' ) ) dir += TEXT( "\\" ); diff --git a/src/OpenGl/OpenGl_ShaderProgram.cxx b/src/OpenGl/OpenGl_ShaderProgram.cxx index 8aee2a7fc2..7a7ffcd646 100644 --- a/src/OpenGl/OpenGl_ShaderProgram.cxx +++ b/src/OpenGl/OpenGl_ShaderProgram.cxx @@ -290,7 +290,7 @@ Standard_Boolean OpenGl_ShaderProgram::Initialize (const Handle(OpenGl_Context)& TCollection_AsciiString aDeclarations; aDeclFile.Open (OSD_ReadOnly, OSD_Protection()); - aDeclFile.Read (aDeclarations, aDeclFile.Size()); + aDeclFile.Read (aDeclarations, (int)aDeclFile.Size()); aDeclFile.Close(); for (Graphic3d_ShaderObjectList::Iterator anIter (theShaders); diff --git a/src/TDataStd/TDataStd_NamedData.cxx b/src/TDataStd/TDataStd_NamedData.cxx index 3d58c4630b..41b6a1f864 100755 --- a/src/TDataStd/TDataStd_NamedData.cxx +++ b/src/TDataStd/TDataStd_NamedData.cxx @@ -793,11 +793,11 @@ void TDataStd_NamedData::Paste (const Handle(TDF_Attribute)& Into, Standard_OStream& TDataStd_NamedData::Dump (Standard_OStream& anOS) const { anOS << "NamedData: "; - anOS << "\tIntegers = " << HasIntegers() ? myIntegers->Map().Extent() : 0; - anOS << "\tReals = " << HasReals() ? myReals->Map().Extent() : 0; - anOS << "\tStrings = " << HasStrings() ? myStrings->Map().Extent() : 0; - anOS << "\tBytes = " << HasBytes() ? myBytes->Map().Extent() : 0; - anOS << "\tArraysOfIntegers = " << HasArraysOfIntegers() ? myArraysOfIntegers->Map().Extent() : 0; - anOS << "\tArraysOfReals = " << HasArraysOfReals() ? myArraysOfReals->Map().Extent() : 0; + anOS << "\tIntegers = " << (HasIntegers() ? myIntegers->Map().Extent() : 0); + anOS << "\tReals = " << (HasReals() ? myReals->Map().Extent() : 0); + anOS << "\tStrings = " << (HasStrings() ? myStrings->Map().Extent() : 0); + anOS << "\tBytes = " << (HasBytes() ? myBytes->Map().Extent() : 0); + anOS << "\tArraysOfIntegers = " << (HasArraysOfIntegers() ? myArraysOfIntegers->Map().Extent() : 0); + anOS << "\tArraysOfReals = " << (HasArraysOfReals() ? myArraysOfReals->Map().Extent() : 0); return anOS; } diff --git a/src/VrmlData/VrmlData_IndexedFaceSet.cxx b/src/VrmlData/VrmlData_IndexedFaceSet.cxx index 42ecd032a7..e1f128ca6f 100755 --- a/src/VrmlData/VrmlData_IndexedFaceSet.cxx +++ b/src/VrmlData/VrmlData_IndexedFaceSet.cxx @@ -93,7 +93,7 @@ const Handle(TopoDS_TShape)& VrmlData_IndexedFaceSet::TShape () NCollection_DataMap mapNodeId; // Count non-degenerated triangles - const int nNodes = myCoords->Length(); + const int nNodes = (int)myCoords->Length(); for (i = 0; i < (int)myNbPolygons; i++) { const Standard_Integer * arrIndice; if (Polygon(i, arrIndice) == 3) { -- 2.20.1