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

0026584: Eliminate compile warnings obtained by building occt with vc14: declaration of local variable hides class member

Browse Source 
Eliminated warning "declaration of variable hides class member"
This commit is contained in:
ski 2015-08-18 14:47:04 +03:00 committed by bugmaster
parent 1dfe71a62b
commit 747f90db8a
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/NCollection/NCollection_CellFilter.hxx
View File

@ -291,8 +291,8 @@ protected:
//! Assignment operator: ensure that list is not deleted twice //! Assignment operator: ensure that list is not deleted twice
void operator = (const Cell& theOther) void operator = (const Cell& theOther)
{ {
Standard_Integer myDim = Standard_Integer(theOther.index.Size()); Standard_Integer aDim = Standard_Integer(theOther.index.Size());
for(Standard_Integer anIdx = 0; anIdx < myDim; anIdx++) for(Standard_Integer anIdx = 0; anIdx < aDim; anIdx++)
index[anIdx] = theOther.index[anIdx]; index[anIdx] = theOther.index[anIdx];
Objects = theOther.Objects; Objects = theOther.Objects;
@ -311,8 +311,8 @@ protected:
//! Compare cell with other one //! Compare cell with other one
Standard_Boolean IsEqual (const Cell& theOther) const Standard_Boolean IsEqual (const Cell& theOther) const
{ {
Standard_Integer myDim = Standard_Integer(theOther.index.Size()); Standard_Integer aDim = Standard_Integer(theOther.index.Size());
for (int i=0; i < myDim; i++) for (int i=0; i < aDim; i++)
if ( index[i] != theOther.index[i] ) return Standard_False; if ( index[i] != theOther.index[i] ) return Standard_False;
return Standard_True; return Standard_True;
} }
@ -321,10 +321,10 @@ protected:
Standard_Integer HashCode (const Standard_Integer theUpper) const Standard_Integer HashCode (const Standard_Integer theUpper) const
{ {
// number of bits per each dimension in the hash code // number of bits per each dimension in the hash code
Standard_Integer myDim = Standard_Integer(index.Size()); Standard_Integer aDim = Standard_Integer(index.Size());
const Standard_Size aShiftBits = (BITS(long)-1) / myDim; const Standard_Size aShiftBits = (BITS(long)-1) / aDim;
long aCode=0; long aCode=0;
for (int i=0; i < myDim; i++) for (int i=0; i < aDim; i++)
aCode = ( aCode << aShiftBits ) ^ index[i]; aCode = ( aCode << aShiftBits ) ^ index[i];
return (unsigned)aCode % theUpper; return (unsigned)aCode % theUpper;
} }

12
src/math/math_GlobOptMin.cxx
View File

@ -266,11 +266,11 @@ Standard_Boolean math_GlobOptMin::computeLocalExtremum(const math_Vector& thePnt
//Newton method //Newton method
if (dynamic_cast<math_MultipleVarFunctionWithHessian*>(myFunc)) if (dynamic_cast<math_MultipleVarFunctionWithHessian*>(myFunc))
{ {
math_MultipleVarFunctionWithHessian* myTmp = math_MultipleVarFunctionWithHessian* aTmp =
dynamic_cast<math_MultipleVarFunctionWithHessian*> (myFunc); dynamic_cast<math_MultipleVarFunctionWithHessian*> (myFunc);
math_NewtonMinimum newtonMinimum(*myTmp); math_NewtonMinimum newtonMinimum(*aTmp);
newtonMinimum.SetBoundary(myGlobA, myGlobB); newtonMinimum.SetBoundary(myGlobA, myGlobB);
newtonMinimum.Perform(*myTmp, thePnt); newtonMinimum.Perform(*aTmp, thePnt);
if (newtonMinimum.IsDone()) if (newtonMinimum.IsDone())
{ {
@ -283,10 +283,10 @@ Standard_Boolean math_GlobOptMin::computeLocalExtremum(const math_Vector& thePnt
// BFGS method used. // BFGS method used.
if (dynamic_cast<math_MultipleVarFunctionWithGradient*>(myFunc)) if (dynamic_cast<math_MultipleVarFunctionWithGradient*>(myFunc))
{ {
math_MultipleVarFunctionWithGradient* myTmp = math_MultipleVarFunctionWithGradient* aTmp =
dynamic_cast<math_MultipleVarFunctionWithGradient*> (myFunc); dynamic_cast<math_MultipleVarFunctionWithGradient*> (myFunc);
math_BFGS bfgs(myTmp->NbVariables()); math_BFGS bfgs(aTmp->NbVariables());
bfgs.Perform(*myTmp, thePnt); bfgs.Perform(*aTmp, thePnt);
if (bfgs.IsDone()) if (bfgs.IsDone())
{ {
bfgs.Location(theOutPnt); bfgs.Location(theOutPnt);