OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0023934: Compiler warnings in MS VC++ 10

Browse Source 
Elimination of compiler warnings
- ExprIntrp: generated file ExprIntrp.tab.c and related WOK scripts removed from the sources
- ExprIntrp, StepFile: added missing declarations and casts; warnings caused by Flex and Bison code suppressed for MSVC compuler by #pragma
- OSD: dummy #includes added to files containing no code for Windows, to avoid warning on empty file
- PLib: piece of code contained in PLib_ChangeDim.gxx included explicitly in cxx and cleaned
- Other places: some casts added to avoid warnings
This commit is contained in:
abv 2013-09-18 09:13:42 +04:00
parent 498ce76bde
commit 105aae761e
39 changed files with 264 additions and 1600 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ApproxInt/ApproxInt_ImpPrmSvSurfaces.gxx
View File

@ -62,11 +62,7 @@ void ApproxInt_ImpPrmSvSurfaces::Pnt(const Standard_Real u1,
Standard_Real tu2=u2;
Standard_Real tv1=v1;
Standard_Real tv2=v2;
#ifdef DEB
Standard_Boolean t=this->Compute(tu1,tv1,tu2,tv2,aP,aT,aTS1,aTS2);
#else
this->Compute(tu1,tv1,tu2,tv2,aP,aT,aTS1,aTS2);
#endif
P=MyPnt;
}
//--------------------------------------------------------------------------------

4
src/ApproxInt/ApproxInt_PrmPrmSvSurfaces.gxx
View File

@ -223,11 +223,7 @@ void ApproxInt_PrmPrmSvSurfaces::Pnt(const Standard_Real u1,
Standard_Real tu2=u2;
Standard_Real tv1=v1;
Standard_Real tv2=v2;
#ifdef DEB
Standard_Boolean t=this->Compute(tu1,tv1,tu2,tv2,aP,aT,aTS1,aTS2);
#else
this->Compute(tu1,tv1,tu2,tv2,aP,aT,aTS1,aTS2);
#endif
P=MyPnt;
}
//--------------------------------------------------------------------------------

2
src/Aspect/Aspect.cxx
View File

@ -113,7 +113,7 @@ Standard_PCharacter pstring;
estring.SetValue(i,c);
} else if( (c > Standard_ExtCharacter(0x0020)) &&
(c <= Standard_ExtCharacter(0x007F)) ) {
c += Standard_ExtCharacter(0xFEE0);
c += Standard_ExtCharacter((unsigned short)0xFEE0);
estring.SetValue(i,c);
}
}

1
src/BSplCLib/BSplCLib_2.cxx
View File

@ -45,6 +45,7 @@ struct BSplCLib_DataContainer
{
BSplCLib_DataContainer(Standard_Integer Degree)
{
(void)Degree; // avoid compiler warning
Standard_OutOfRange_Raise_if (Degree > BSplCLib::MaxDegree() ||
BSplCLib::MaxDegree() > 25,
"BSplCLib: bspline degree is greater than maximum supported");

1
src/BSplCLib/BSplCLib_CurveComputation.gxx
View File

@ -38,6 +38,7 @@ struct BSplCLib_DataContainer
{
BSplCLib_DataContainer(Standard_Integer Degree)
{
(void)Degree; // avoid compiler warning
Standard_OutOfRange_Raise_if (Degree > BSplCLib::MaxDegree() ||
BSplCLib::MaxDegree() > 25,
"BSplCLib: bspline degree is greater than maximum supported");

1
src/BSplSLib/BSplSLib.cxx
View File

@ -53,6 +53,7 @@ struct BSplSLib_DataContainer
{
BSplSLib_DataContainer (Standard_Integer UDegree, Standard_Integer VDegree)
{
(void)UDegree; (void)VDegree; // just to avoid compiler warning in Release mode
Standard_OutOfRange_Raise_if (UDegree > BSplCLib::MaxDegree() ||
VDegree > BSplCLib::MaxDegree() || BSplCLib::MaxDegree() > 25,
"BSplSLib: bspline degree is greater than maximum supported");

4
src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
View File

@ -265,7 +265,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read
aDocumentPos = anIS.tellg();
anIS.seekg((streampos) aShapeSectionPos);
CheckShapeSection((streampos)aShapeSectionPos, anIS);
CheckShapeSection(aShapeSectionPos, anIS);
// Read Shapes
BinLDrivers_DocumentSection aCurSection;
ReadShapeSection (aCurSection, anIS, Standard_False);
@ -497,7 +497,7 @@ void BinLDrivers_DocumentRetrievalDriver::CheckShapeSection(
{
if(!IS.eof()) {
#if defined(WNT) || defined(HAVE_IOSTREAM)
const Storage_Position endPos = IS.rdbuf()->pubseekoff(0L, std::ios_base::end, std::ios_base::in);
const std::streamoff endPos = IS.rdbuf()->pubseekoff(0L, std::ios_base::end, std::ios_base::in);
#else
const Storage_Position endPos = IS.rdbuf()->seekoff(0L, unsafe_ios::end, unsafe_ios::in);
#endif

2
src/BinMNaming/BinMNaming_NamedShapeDriver.cxx
View File

@ -298,7 +298,7 @@ void BinMNaming_NamedShapeDriver::ReadShapeSection (Standard_IStream& theIS)
{
// check section title string; note that some versions of OCCT (up to 6.3.1)
// might avoid writing shape section if it is empty
Standard_Size aPos = theIS.tellg();
std::streamoff aPos = theIS.tellg();
TCollection_AsciiString aSectionTitle;
theIS >> aSectionTitle;
if(aSectionTitle.Length() > 0 && aSectionTitle == SHAPESET) {

8
src/ExprIntrp/ExprIntrp.lex
View File

@ -22,6 +22,7 @@
%option yywrap
%{
#include <ExprIntrp.tab.h>
#define YY_SKIP_YYWRAP
static YY_BUFFER_STATE ExprIntrp_bufstring;
@ -29,6 +30,8 @@ static YY_BUFFER_STATE ExprIntrp_bufstring;
void ExprIntrp_SetResult();
void ExprIntrp_SetDegree();
int ExprIntrlex (void);
void ExprIntrp_start_string(char* str)
{
ExprIntrp_bufstring = ExprIntrp_scan_string(str);
@ -45,6 +48,11 @@ int yywrap()
return 1;
}
// disable MSVC warnings in flex code
#ifdef _MSC_VER
#pragma warning(disable:4131 4244 4273 4127)
#endif
%}
%%
" " {;}

1250
src/ExprIntrp/ExprIntrp.tab.c
View File

File diff suppressed because it is too large Load Diff

9
src/ExprIntrp/ExprIntrp.yacc
View File

@ -63,6 +63,15 @@ extern void ExprIntrp_Sumator();
extern void ExprIntrp_VariableIdentifier();
extern void ExprIntrp_Productor();
extern void ExprIntrp_EndOfEqual();
extern void ExprIntrperror(char* msg);
extern int ExprIntrplex(void);
// disable MSVC warnings in bison code
#ifdef _MSC_VER
#pragma warning(disable:4131 4244)
#endif
%}
%token SUMOP MINUSOP DIVIDEOP EXPOP MULTOP PARENTHESIS BRACKET ENDPARENTHESIS ENDBRACKET VALUE IDENTIFIER COMMA DIFFERENTIAL DERIVATE DERIVKEY ASSIGNOP DEASSIGNKEY EQUALOP RELSEPARATOR CONSTKEY SUMKEY PRODKEY

77
src/ExprIntrp/ExprIntrp_Replace.tcl
View File

@ -1,77 +0,0 @@
# Copyright (c) 1999-2012 OPEN CASCADE SAS
#
# The content of this file is subject to the Open CASCADE Technology Public
# License Version 6.5 (the "License"). You may not use the content of this file
# except in compliance with the License. Please obtain a copy of the License
# at http://www.opencascade.org and read it completely before using this file.
#
# The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
# main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
#
# The Original Code and all software distributed under the License is
# distributed on an "AS IS" basis, without warranty of any kind, and the
# Initial Developer hereby disclaims all such warranties, including without
# limitation, any warranties of merchantability, fitness for a particular
# purpose or non-infringement. Please see the License for the specific terms
# and conditions governing the rights and limitations under the License.
proc ExprIntrp_Replace:AdmFileType {} {
return "dbadmfile";
}
proc ExprIntrp_Replace:OutputDirTypeName {} {
return "dbtmpfile";
}
proc ExprIntrp_Replace:HandleInputFile { ID } {
scan $ID "%\[^:\]:%\[^:\]:%\[^:\]" unit type name
switch $name {
ExprIntrp.tab.c {return 1;}
default {
return 0;
}
}
}
proc ExprIntrp_Replace:Execute { unit args } {
msgprint -i -c "ExprIntrp_Replace::Execute" "Copying of ExprIntrp includes $unit $args "
global tcl_interactive
set tcl_interactive 1
package require Wokutils
if { [wokparam -e %Station $unit] != "wnt" } {
set copycmd "cp -p "
set replstr "/"
} else {
set copycmd "cmd /c copy"
set replstr "\\\\\\\\"
}
set sourcename ExprIntrp.tab.c
set name ExprIntrp.tab.c
set source [woklocate -p ExprIntrp:source:$sourcename [wokinfo -N $unit]]
set vistarget [woklocate -p ExprIntrp:privinclude [wokinfo -N $unit]]$name
# set target [wokinfo -p ExprIntrp:privinclude:$name [wokinfo -N $unit]]
msgprint -i -c "$source "
regsub -all "/" " $source $vistarget" $replstr TheArgs
msgprint -i -c "ExprIntrp_Replace::Execute" "Copy $source to $vistarget"
if { [file exist $vistarget] && [wokparam -e %Station ] != "wnt" } {
eval exec "chmod u+w $vistarget"
}
eval exec "$copycmd $TheArgs"
return 0;
}

30
src/ExprIntrp/ExprIntrp_WOKSteps.edl
View File

@ -1,30 +0,0 @@
-- Created on: 2000-06-29
-- Created by: Atelier CAS2000
-- Copyright (c) 2000-2012 OPEN CASCADE SAS
--
-- The content of this file is subject to the Open CASCADE Technology Public
-- License Version 6.5 (the "License"). You may not use the content of this file
-- except in compliance with the License. Please obtain a copy of the License
-- at http://www.opencascade.org and read it completely before using this file.
--
-- The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
-- main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
--
-- The Original Code and all software distributed under the License is
-- distributed on an "AS IS" basis, without warranty of any kind, and the
-- Initial Developer hereby disclaims all such warranties, including without
-- limitation, any warranties of merchantability, fitness for a particular
-- purpose or non-infringement. Please see the License for the specific terms
-- and conditions governing the rights and limitations under the License.
@ifnotdefined ( %ExprIntrp_WOKSteps_EDL) then
@set %ExprIntrp_WOKSteps_EDL = "";
--- Insert your stuff Here
@set %CASCADESamplesJni_WOKSteps_EDL = "";
@string %WOKSteps_XcppGroup += "xcpp.repl";
@set %WOKSteps_xcpp_repl = "*ExprIntrp_Replace(xcpp.header)";
@endif;

4
src/ExprIntrp/ExprIntrp_yacclex.cxx
View File

@ -39,7 +39,7 @@ extern "C" void ExprIntrp_SetResult()
extern "C" void ExprIntrp_SetDegree()
{
ExprIntrp_degree = strlen(ExprIntrptext);
ExprIntrp_degree = (int)strlen(ExprIntrptext);
}
int ExprIntrp_GetDegree()
@ -50,5 +50,5 @@ int ExprIntrp_GetDegree()
int ExprIntrp_GetResult(char *s)
{
strcpy(s,ExprIntrp_curres);
return strlen(ExprIntrp_curres);
return (int)strlen(ExprIntrp_curres);
}

3
src/ExprIntrp/FILES
View File

@ -1,10 +1,7 @@
ExprIntrp_CMPLRS.edl
ExprIntrp_WOKSteps.edl
ExprIntrp.lex
ExprIntrp.yacc
ExprIntrp_yaccanal.hxx
ExprIntrp_yaccintrf.cxx
ExprIntrp_yaccintrf.hxx
ExprIntrp_yacclex.cxx
ExprIntrp_Replace.tcl
ExprIntrp.tab.c

8
src/Extrema/Extrema_GLocateExtCC.gxx
View File

@ -30,14 +30,6 @@ Extrema_GLocateExtCC::Extrema_GLocateExtCC (const Curve1& C1,
const Standard_Real U0,
const Standard_Real V0)
{
#ifdef DEB
GeomAbs_CurveType type1 = Tool1::GetType(C1);
GeomAbs_CurveType type2 = Tool2::GetType(C2);
#else
Tool1::GetType(C1);
Tool2::GetType(C2);
#endif
Standard_Real TolU = C1.Resolution(Precision::Confusion());
Standard_Real TolV = C2.Resolution(Precision::Confusion());
Extrema_POnCurv P1, P2;

7
src/Extrema/Extrema_GLocateExtCC2d.gxx
View File

@ -37,13 +37,6 @@ Extrema_GLocateExtCC2d::Extrema_GLocateExtCC2d (const Curve1& C1,
const Standard_Real U0,
const Standard_Real V0)
{
#ifdef DEB
GeomAbs_CurveType type1 = Tool1::GetType(C1);
GeomAbs_CurveType type2 = Tool2::GetType(C2);
#else
Tool1::GetType(C1);
Tool2::GetType(C2);
#endif
Standard_Real TolU = Tool1::Resolution(C1, Precision::Confusion());
Standard_Real TolV = Tool2::Resolution(C2, Precision::Confusion());
Extrema_POnCurv2d P1, P2;

5
src/Extrema/Extrema_GLocateExtPC.gxx
View File

@ -113,11 +113,6 @@ void Extrema_GLocateExtPC::Perform(const ThePoint& P,
const Standard_Real U0)
{
Standard_Integer i, i1, i2, inter;
#ifdef DEB
Standard_Real Tol = TheCurveTool::Resolution(*((TheCurve*)myC), Precision::Confusion());
#else
TheCurveTool::Resolution(*((TheCurve*)myC), Precision::Confusion());
#endif
Standard_Real Par, valU, valU2 = RealLast(),
local_u0 ;
Standard_Real myintuinf=0, myintusup=0;

3
src/Geom2dAPI/Geom2dAPI_InterCurveCurve.cxx
View File

@ -225,8 +225,7 @@ void Geom2dAPI_InterCurveCurve::Segment (const Standard_Integer Index,
Handle(Geom2d_Curve)&) const
{
Standard_NotImplemented::Raise(" ");
(void)Index; // avoid compiler warning in Release mode
Standard_OutOfRange_Raise_if(Index < 0 || Index > NbSegments(),
"Geom2dAPI_InterCurveCurve::Segment");
}

8
src/Intf/Intf_InterferencePolygonPolyhedron.gxx
View File

@ -986,8 +986,8 @@ void Intf_InterferencePolygonPolyhedron::Intersect
//-- Si cette distance est inferieure a Tolerance, on cree un SP.
//--
//-- printf("\nIntf_InterferencePolygPolyh : dBegTri=%g dEndTri=%g Tolerance=%g\n",dBegTri,dEndTri,Tolerance);
if(1 || (Abs(dBegTri) <= Tolerance)
|| (Abs(dEndTri) <= Tolerance)) {
// if(Abs(dBegTri) <= Tolerance || Abs(dEndTri) <= Tolerance)
{
gp_Vec VecPol(BegO,EndO);
Standard_Real NVecPol = VecPol.Magnitude();
gp_Dir DirPol(VecPol);
@ -1268,8 +1268,8 @@ void Intf_InterferencePolygonPolyhedron::Intersect (const gp_Pnt& BegO,
//-- Si cette distance est inferieure a Tolerance, on cree un SP.
//--
//-- printf("\nIntf_InterferencePolygPolyh : dBegTri=%g dEndTri=%g Tolerance=%g\n",dBegTri,dEndTri,Tolerance);
if(1 || (Abs(dBegTri) <= Tolerance)
|| (Abs(dEndTri) <= Tolerance)) {
// if (Abs(dBegTri) <= Tolerance || Abs(dEndTri) <= Tolerance)
{
gp_Vec VecPol(BegO,EndO);
Standard_Real NVecPol = VecPol.Magnitude();
gp_Dir DirPol(VecPol);

2
src/LDOM/LDOM_XmlReader.cxx
View File

@ -145,7 +145,7 @@ LDOM_XmlReader::RecordType LDOM_XmlReader::ReadRecord
else {
myIStream.read (&myBuffer[aBytesRest],
XML_BUFFER_SIZE - aBytesRest);
aNBytes = myIStream.gcount();
aNBytes = (Standard_Size)myIStream.gcount();
}
if (aNBytes == 0)
myEOF = Standard_True; // END-OF-FILE

1
src/LProp/LProp_CLProps.gxx
View File

@ -215,6 +215,7 @@ void LProp_CLProps::Tangent (Dir& D)
Standard_Real LProp_CLProps::Curvature ()
{
Standard_Boolean isDefined = IsTangentDefined();
(void)isDefined; // trick to avoid compiler warning on variable unised in Release mode; note that IsTangentDefined() must be called always
LProp_NotDefined_Raise_if(!isDefined,
"LProp_CLProps::CurvatureNotDefined()");

5
src/OSD/OSD_Cmailbox.c
View File

@ -549,4 +549,9 @@ write_mailbox(int *boxid, char *box_name, char *message, int length)
return (0);
}
}
#else
// to avoid compiler warning on empty file
#include "string.h"
#endif

5
src/OSD/OSD_Csemaphore.c
View File

@ -317,4 +317,9 @@ osd_alarm_(int sec,RETSIGTYPE (*_alarm)())
#endif /* __hpux */
#else
// to avoid compiler warning on empty file
#include "string.h"
#endif /* WNT */

5
src/OSD/OSD_Csharedmemory.c
View File

@ -119,4 +119,9 @@ int remove_sharedmemory(int *shmid, char *section_name)
if (status < 0) return 0;
else return 1;
}
#else
// to avoid compiler warning on empty file
#include "string.h"
#endif

8
src/OSD/OSD_MAllocHook.cxx
View File

@ -85,9 +85,11 @@ OSD_MAllocHook::CollectBySize* OSD_MAllocHook::GetCollectBySize()
static long getRequestNum(void* pvData, long lRequest, size_t& theSize)
{
#if _MSC_VER == 1500 /* VS 2008 */
#ifdef _DEBUG /* in Release, _CrtIsValidHeapPointer is always 1 */
if (_CrtIsValidHeapPointer(pvData))
#endif
{
#if _MSC_VER == 1500 // VS 2008
#define nNoMansLandSize 4
// the header struct is taken from crt/src/dbgint.h
struct _CrtMemBlockHeader
@ -105,8 +107,10 @@ static long getRequestNum(void* pvData, long lRequest, size_t& theSize)
_CrtMemBlockHeader* aHeader = ((_CrtMemBlockHeader*)pvData)-1;
theSize = aHeader->nDataSize;
return aHeader->lRequest;
#endif
}
#else
(void)pvData; (void)theSize; // avoid compiler warning on unused arg
#endif
return lRequest;
}

6
src/OpenGl/OpenGl_GraphicDriver_Export.cxx
View File

@ -42,9 +42,9 @@ Standard_Boolean OpenGl_GraphicDriver::Export (const Standard_CString theFileNam
const Graphic3d_CView& theView,
const Aspect_CLayer2d& theLayerUnder,
const Aspect_CLayer2d& theLayerOver,
const Standard_Real thePrecision,
const Standard_Address theProgressBarFunc,
const Standard_Address theProgressObject)
const Standard_Real /*thePrecision*/,
const Standard_Address /*theProgressBarFunc*/,
const Standard_Address /*theProgressObject*/)
{
// gl2psBeginPage() will call OpenGL functions
// so we should activate correct GL context before redraw scene call

2
src/OpenGl/OpenGl_Text.cxx
View File

@ -133,7 +133,7 @@ namespace
// Standard GL2PS's alignment isn't used, because it doesn't work correctly
// for all formats, therefore alignment is calculated manually relative
// to the bottom-left corner, which corresponds to the GL2PS_TEXT_BL value
gl2psTextOpt (theText.ToCString(), aPsFont, theHeight, GL2PS_TEXT_BL, theAspect.Angle());
gl2psTextOpt (theText.ToCString(), aPsFont, (GLshort)theHeight, GL2PS_TEXT_BL, theAspect.Angle());
}
#endif

2
src/OpenGl/OpenGl_Workspace_2.cxx
View File

@ -284,7 +284,7 @@ static bool imageStretchDC(HDC theDstDC, FipHandle theImage, int theOffsetX,
theHeight, 0, 0, widthPx, heightPx, aDataPtr,
aBitmapData, DIB_RGB_COLORS, SRCCOPY);
if (aPassed != heightPx)
if ((unsigned)aPassed != heightPx)
return false;
return true;

1
src/PLib/FILES
View File

@ -1,3 +1,2 @@
PLib_ChangeDim.gxx
PLib_JacobiPolynomial_0.hxx
PLib_CMPLRS.edl

188
src/PLib/PLib.cxx
View File

@ -29,31 +29,185 @@
#include <Standard_ConstructionError.hxx>
#include <GeomAbs_Shape.hxx>
#include <math_Gauss.hxx>
#include <math.hxx>
// To convert points array into Real ..
// *********************************
#define Dimension_gen 2
#define Array1OfPoints TColgp_Array1OfPnt2d
#define Point gp_Pnt2d
//=======================================================================
//function : SetPoles
//purpose :
//=======================================================================
#include <PLib_ChangeDim.gxx>
void PLib::SetPoles(const TColgp_Array1OfPnt2d& Poles,
TColStd_Array1OfReal& FP)
{
Standard_Integer j = FP .Lower();
Standard_Integer PLower = Poles.Lower();
Standard_Integer PUpper = Poles.Upper();
for (Standard_Integer i = PLower; i <= PUpper; i++) {
const gp_Pnt2d& P = Poles(i);
FP(j) = P.Coord(1); j++;
FP(j) = P.Coord(2); j++;
}
}
#undef Dimension_gen
#undef Array1OfPoints
#undef Point
//=======================================================================
//function : SetPoles
//purpose :
//=======================================================================
#define Dimension_gen 3
#define Array1OfPoints TColgp_Array1OfPnt
#define Point gp_Pnt
void PLib::SetPoles(const TColgp_Array1OfPnt2d& Poles,
const TColStd_Array1OfReal& Weights,
TColStd_Array1OfReal& FP)
{
Standard_Integer j = FP .Lower();
Standard_Integer PLower = Poles.Lower();
Standard_Integer PUpper = Poles.Upper();
for (Standard_Integer i = PLower; i <= PUpper; i++) {
Standard_Real w = Weights(i);
const gp_Pnt2d& P = Poles(i);
FP(j) = P.Coord(1) * w; j++;
FP(j) = P.Coord(2) * w; j++;
FP(j) = w; j++;
}
}
#include <PLib_ChangeDim.gxx>
//=======================================================================
//function : GetPoles
//purpose :
//=======================================================================
#undef Dimension_gen
#undef Array1OfPoints
#undef Point
void PLib::GetPoles(const TColStd_Array1OfReal& FP,
TColgp_Array1OfPnt2d& Poles)
{
Standard_Integer j = FP .Lower();
Standard_Integer PLower = Poles.Lower();
Standard_Integer PUpper = Poles.Upper();
for (Standard_Integer i = PLower; i <= PUpper; i++) {
gp_Pnt2d& P = Poles(i);
P.SetCoord(1,FP(j)); j++;
P.SetCoord(2,FP(j)); j++;
}
}
#include <math_Gauss.hxx>
#include <math.hxx>
//=======================================================================
//function : GetPoles
//purpose :
//=======================================================================
void PLib::GetPoles(const TColStd_Array1OfReal& FP,
TColgp_Array1OfPnt2d& Poles,
TColStd_Array1OfReal& Weights)
{
Standard_Integer j = FP .Lower();
Standard_Integer PLower = Poles.Lower();
Standard_Integer PUpper = Poles.Upper();
for (Standard_Integer i = PLower; i <= PUpper; i++) {
Standard_Real w = FP(j + 2);
Weights(i) = w;
gp_Pnt2d& P = Poles(i);
P.SetCoord(1,FP(j) / w); j++;
P.SetCoord(2,FP(j) / w); j++;
j++;
}
}
//=======================================================================
//function : SetPoles
//purpose :
//=======================================================================
void PLib::SetPoles(const TColgp_Array1OfPnt& Poles,
TColStd_Array1OfReal& FP)
{
Standard_Integer j = FP .Lower();
Standard_Integer PLower = Poles.Lower();
Standard_Integer PUpper = Poles.Upper();
for (Standard_Integer i = PLower; i <= PUpper; i++) {
const gp_Pnt& P = Poles(i);
FP(j) = P.Coord(1); j++;
FP(j) = P.Coord(2); j++;
FP(j) = P.Coord(3); j++;
}
}
//=======================================================================
//function : SetPoles
//purpose :
//=======================================================================
void PLib::SetPoles(const TColgp_Array1OfPnt& Poles,
const TColStd_Array1OfReal& Weights,
TColStd_Array1OfReal& FP)
{
Standard_Integer j = FP .Lower();
Standard_Integer PLower = Poles.Lower();
Standard_Integer PUpper = Poles.Upper();
for (Standard_Integer i = PLower; i <= PUpper; i++) {
Standard_Real w = Weights(i);
const gp_Pnt& P = Poles(i);
FP(j) = P.Coord(1) * w; j++;
FP(j) = P.Coord(2) * w; j++;
FP(j) = P.Coord(3) * w; j++;
FP(j) = w; j++;
}
}
//=======================================================================
//function : GetPoles
//purpose :
//=======================================================================
void PLib::GetPoles(const TColStd_Array1OfReal& FP,
TColgp_Array1OfPnt& Poles)
{
Standard_Integer j = FP .Lower();
Standard_Integer PLower = Poles.Lower();
Standard_Integer PUpper = Poles.Upper();
for (Standard_Integer i = PLower; i <= PUpper; i++) {
gp_Pnt& P = Poles(i);
P.SetCoord(1,FP(j)); j++;
P.SetCoord(2,FP(j)); j++;
P.SetCoord(3,FP(j)); j++;
}
}
//=======================================================================
//function : GetPoles
//purpose :
//=======================================================================
void PLib::GetPoles(const TColStd_Array1OfReal& FP,
TColgp_Array1OfPnt& Poles,
TColStd_Array1OfReal& Weights)
{
Standard_Integer j = FP .Lower();
Standard_Integer PLower = Poles.Lower();
Standard_Integer PUpper = Poles.Upper();
for (Standard_Integer i = PLower; i <= PUpper; i++) {
Standard_Real w = FP(j + 3);
Weights(i) = w;
gp_Pnt& P = Poles(i);
P.SetCoord(1,FP(j) / w); j++;
P.SetCoord(2,FP(j) / w); j++;
P.SetCoord(3,FP(j) / w); j++;
j++;
}
}
// specialized allocator
namespace
{
class BinomAllocator
{
@ -120,8 +274,6 @@ private:
};
namespace
{
// we do not call BSplCLib here to avoid Cyclic dependency detection by WOK
//static BinomAllocator THE_BINOM (BSplCLib::MaxDegree() + 1);
static BinomAllocator THE_BINOM (25 + 1);

160
src/PLib/PLib_ChangeDim.gxx
View File

@ -1,160 +0,0 @@
// Created on: 1995-09-01
// Created by: Laurent BOURESCHE
// Copyright (c) 1995-1999 Matra Datavision
// Copyright (c) 1999-2012 OPEN CASCADE SAS
//
// The content of this file is subject to the Open CASCADE Technology Public
// License Version 6.5 (the "License"). You may not use the content of this file
// except in compliance with the License. Please obtain a copy of the License
// at http://www.opencascade.org and read it completely before using this file.
//
// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
//
// The Original Code and all software distributed under the License is
// distributed on an "AS IS" basis, without warranty of any kind, and the
// Initial Developer hereby disclaims all such warranties, including without
// limitation, any warranties of merchantability, fitness for a particular
// purpose or non-infringement. Please see the License for the specific terms
// and conditions governing the rights and limitations under the License.
#define No_Standard_RangeError
#define No_Standard_OutOfRange
//=======================================================================
//function : SetPoles
//purpose :
//=======================================================================
void PLib::SetPoles(const Array1OfPoints& Poles,
TColStd_Array1OfReal& FP)
{
Standard_Integer i;
Standard_Integer j = FP .Lower();
Standard_Integer PLower = Poles.Lower();
Standard_Integer PUpper = Poles.Upper();
if (Dimension_gen == 3) {
for (i = PLower; i <= PUpper; i++) {
const Point& P = Poles(i);
FP(j) = P.Coord(1); j++;
FP(j) = P.Coord(2); j++;
FP(j) = P.Coord(3); j++;
}
}
else {
for (i = PLower; i <= PUpper; i++) {
const Point& P = Poles(i);
FP(j) = P.Coord(1); j++;
FP(j) = P.Coord(2); j++;
}
}
}
//=======================================================================
//function : SetPoles
//purpose :
//=======================================================================
void PLib::SetPoles(const Array1OfPoints& Poles,
const TColStd_Array1OfReal& Weights,
TColStd_Array1OfReal& FP)
{
Standard_Real w;
Standard_Integer i;
Standard_Integer j = FP .Lower();
Standard_Integer PLower = Poles.Lower();
Standard_Integer PUpper = Poles.Upper();
if (Dimension_gen == 3) {
for (i = PLower; i <= PUpper; i++) {
w = Weights(i);
const Point& P = Poles(i);
FP(j) = P.Coord(1) * w; j++;
FP(j) = P.Coord(2) * w; j++;
FP(j) = P.Coord(3) * w; j++;
FP(j) = w; j++;
}
}
else {
for (i = PLower; i <= PUpper; i++) {
w = Weights(i);
const Point& P = Poles(i);
FP(j) = P.Coord(1) * w; j++;
FP(j) = P.Coord(2) * w; j++;
FP(j) = w; j++;
}
}
}
//=======================================================================
//function : GetPoles
//purpose :
//=======================================================================
void PLib::GetPoles(const TColStd_Array1OfReal& FP,
Array1OfPoints& Poles)
{
Standard_Integer i;
Standard_Integer j = FP .Lower();
Standard_Integer PLower = Poles.Lower();
Standard_Integer PUpper = Poles.Upper();
if (Dimension_gen == 3) {
for (i = PLower; i <= PUpper; i++) {
Point& P = Poles(i);
P.SetCoord(1,FP(j)); j++;
P.SetCoord(2,FP(j)); j++;
P.SetCoord(3,FP(j)); j++;
}
}
else {
for (i = PLower; i <= PUpper; i++) {
Point& P = Poles(i);
P.SetCoord(1,FP(j)); j++;
P.SetCoord(2,FP(j)); j++;
}
}
}
//=======================================================================
//function : GetPoles
//purpose :
//=======================================================================
void PLib::GetPoles(const TColStd_Array1OfReal& FP,
Array1OfPoints& Poles,
TColStd_Array1OfReal& Weights)
{
Standard_Real w;
Standard_Integer i;
Standard_Integer j = FP .Lower();
Standard_Integer PLower = Poles.Lower();
Standard_Integer PUpper = Poles.Upper();
if (Dimension_gen == 3) {
for (i = PLower; i <= PUpper; i++) {
Weights(i) = w = FP(j + 3);
Point& P = Poles(i);
P.SetCoord(1,FP(j) / w); j++;
P.SetCoord(2,FP(j) / w); j++;
P.SetCoord(3,FP(j) / w); j++;
j++;
}
}
else {
for (i = PLower; i <= PUpper; i++) {
Weights(i) = w = FP(j + 2);
Point& P = Poles(i);
P.SetCoord(1,FP(j) / w); j++;
P.SetCoord(2,FP(j) / w); j++;
j++;
}
}
}

2
src/QANCollection/QANCollection4.cxx
View File

@ -59,7 +59,9 @@ static Standard_Integer QANColStdAllocator1(Draw_Interpretor& di, Standard_Integ
elem_type aDummy;
allocator_type::reference aRef = aDummy;
(void)aRef; // avoid compiler warning on unused
allocator_type::const_reference aConstRef = aDummy;
(void)aConstRef; // avoid compiler warning on unused
if ( sizeof (allocator_type::size_type) == sizeof (size_t) ) {
di << "size_type : OK\n";
} else {

10
src/StepFile/recfile.pc
View File

@ -93,9 +93,11 @@ void rec_settext(char* s)
char* rec_newtext(char* r)
/* routine utilitaire creant une chaine dynamique a partir d'un char[] */
{
char* savrestext; char* s0;
char* savrestext;
char* s0;
savrestext = restext;
rec_restext(r,strlen(r)); s0 = restext;
rec_restext(r,(int)strlen(r));
s0 = restext;
restext = savrestext;
return (s0);
}
@ -396,7 +398,9 @@ void rec_print(struct rec* unrec)
if (modeprint < 2) return ;
curarg = unrec->first ;
while (curarg != NULL) {
numa ++; argl = strlen(curarg->val) + 18; numl += argl;
numa ++;
argl = (int)strlen(curarg->val) + 18;
numl += argl;
if (numl > 132) { printf("\n"); numl = argl; }
printf (" - Arg.%d[%c%c] : %s",
numa,argtype1[curarg->type],argtype2[curarg->type],curarg->val);

5
src/StepFile/step.lex
View File

@ -45,6 +45,11 @@ void rec_typarg(int argtype);
void resultat () /* Resultat alloue dynamiquement, "jete" une fois lu */
{ if (modcom == 0) rec_restext(yytext,yyleng); }
// disable MSVC warnings in flex code
#ifdef _MSC_VER
#pragma warning(disable:4131 4244 4273 4267 4127)
#endif
%}
%%
" " {;}

6
src/StepFile/step.yacc
View File

@ -54,6 +54,12 @@
#define alloca malloc
#endif
// disable MSVC warnings in flex code
#ifdef _MSC_VER
#pragma warning(disable:4244 4131)
#endif
%}
%%
/* N.B. : les commentaires sont filtres par LEX */

6
src/TCollection/TCollection_ExtendedString.cxx
View File

@ -139,7 +139,7 @@ TCollection_ExtendedString::TCollection_ExtendedString
{
if (astring) {
if(!isMultiByte) {
mylength = strlen( astring );
mylength = (int)strlen( astring );
mystring = Allocate((mylength+1)*2);
for (int i = 0 ; i < mylength ; i++)
mystring[i] = ToExtCharacter(astring[i]);
@ -235,7 +235,7 @@ TCollection_ExtendedString::TCollection_ExtendedString
union {int bid ;
char t [13];} CHN ;
Sprintf(&CHN.t[0],"%d",aValue);
mylength = strlen(CHN.t);
mylength = (int)strlen(CHN.t);
mystring = Allocate((mylength+1)*2);
for (int i = 0 ; i < mylength ; i++) mystring[i] = ToExtCharacter(CHN.t[i]);
mystring[mylength] = '\0';
@ -250,7 +250,7 @@ TCollection_ExtendedString::TCollection_ExtendedString
union {int bid ;
char t [50];} CHN ;
Sprintf(&CHN.t[0],"%g",aValue);
mylength = strlen( CHN.t );
mylength = (int)strlen( CHN.t );
mystring = Allocate((mylength+1)*2);
for (int i = 0 ; i < mylength ; i++) mystring[i] = ToExtCharacter(CHN.t[i]);
mystring[mylength] = '\0';

15
src/TopOpeBRepDS/TopOpeBRepDS_Curve.cxx
View File

@ -353,15 +353,11 @@ void TopOpeBRepDS_Curve::ChangeIsWalk(const Standard_Boolean B)
//purpose :
//=======================================================================
#ifdef DEB
Standard_OStream& TopOpeBRepDS_Curve::Dump (Standard_OStream& OS,
const Standard_Integer index,
#ifdef DEB
const Standard_Boolean compact)const
#else
const Standard_Boolean)const
#endif
{
#ifdef DEB
OS<<"Curve : "; if (index != 0) OS<<index<<" ";
if (!Curve().IsNull()) {
TopOpeBRepDS_Dumper::Print(Curve(),OS,compact);
@ -386,10 +382,17 @@ Standard_OStream& TopOpeBRepDS_Curve::Dump (Standard_OStream& OS,
if (!I2.IsNull()) DSCI(I2)->DumpPCurve(OS,compact);
else OS<<" is null";
OS<<endl;
#endif
return OS;
}
#else
Standard_OStream& TopOpeBRepDS_Curve::Dump (Standard_OStream& OS,
const Standard_Integer,
const Standard_Boolean)const
{
return OS;
}
#endif
//=======================================================================

4
src/TopOpeBRepTool/TopOpeBRepTool_CORRISO.cxx
View File

@ -50,7 +50,7 @@ Standard_EXPORT TopTools_IndexedMapOfOrientedShape STATIC_PURGE_mapeds;
static void FUN_RaiseError()
{
#ifdef DEB
Standard_Boolean trc = TopOpeBRepTool_GettraceCORRISO();
// Standard_Boolean trc = TopOpeBRepTool_GettraceCORRISO();
FUN_REINIT();
// if (trc) cout <<"*********failure in CORRISO***********\n";
#endif
@ -156,6 +156,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::Init(const TopoDS_Shape& S)
const TopoDS_Edge& E = TopoDS::Edge(ex.Current());
#ifdef DEB
Standard_Integer iE = STATIC_PURGE_mapeds.Add(E);
(void)iE; // avoid warning
#ifdef DRAW
if (trc) {TCollection_AsciiString aa = TCollection_AsciiString("e"); FUN_tool_draw(aa,E,iE);}
#endif
@ -180,6 +181,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::Init(const TopoDS_Shape& S)
const TopoDS_Vertex& v = TopoDS::Vertex(exv.Current());
#ifdef DEB
Standard_Integer iE = STATIC_PURGE_mapeds.Add(E);
(void)iE; // avoid warning
#ifdef DRAW
if (trc) {TCollection_AsciiString bb = TCollection_AsciiString("v"); FUN_tool_draw(bb,v,iv);}
#endif