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

Coding - Resolving C26498 warning

Browse Source 
C26498 - marking variables constexpr to improve performance
This commit is contained in:
dpasukhi 2024-09-09 18:23:10 +00:00
parent 09a69618da
commit 4ab54d60ef
12 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.cxx
View File

@ -43,7 +43,7 @@ static Standard_Integer
IntersectionOfSets( const NCollection_List<Standard_Integer>& theSet1,
const NCollection_List<Standard_Integer>& theSet2)
{
const Standard_Integer anIntMax = IntegerLast();
constexpr Standard_Integer anIntMax = IntegerLast();
Standard_Integer aRetVal = anIntMax;
for(NCollection_List<Standard_Integer>::Iterator
anIt1 = theSet1.begin().Iterator();

4
src/Bnd/Bnd_Box.cxx
View File

@ -720,7 +720,7 @@ static Standard_Boolean IsSegmentOut(Standard_Real x1,Standard_Real y1,
Standard_Real xs1,Standard_Real ys1,
Standard_Real xs2,Standard_Real ys2)
{
Standard_Real eps = RealSmall();
constexpr Standard_Real eps = RealSmall();
Standard_Real xsmin = Min (xs1, xs2);
Standard_Real xsmax = Max (xs1, xs2);
Standard_Real ysmin = Min (ys1, ys2);
@ -765,7 +765,7 @@ Standard_Boolean Bnd_Box::IsOut(const gp_Pnt& P1, const gp_Pnt& P2, const gp_Dir
if (IsWhole()) return Standard_False;
else if (IsVoid()) return Standard_True;
Standard_Real eps = RealSmall();
constexpr Standard_Real eps = RealSmall();
Standard_Real myXmin, myYmin, myZmin, myXmax, myYmax, myZmax;
Get (myXmin, myYmin, myZmin, myXmax, myYmax, myZmax);

2
src/BndLib/BndLib_AddSurface.cxx
View File

@ -180,7 +180,7 @@ static void TreatInfinitePlane(const gp_Pln &aPlane,
{
// Get 3 coordinate axes of the plane.
const gp_Dir &aNorm = aPlane.Axis().Direction();
const Standard_Real anAngularTol = RealEpsilon();
constexpr Standard_Real anAngularTol = RealEpsilon();
// Get location of the plane as its barycenter
gp_Pnt aLocation = BaryCenter(aPlane, aUMin, aUMax, aVMin, aVMax);

4
src/GccAna/GccAna_Lin2dTanPer.cxx
View File

@ -99,7 +99,7 @@ GccAna_Lin2dTanPer::
IntAna2d_AnaIntersection Intp(linsol(1),TheCircle);
if (Intp.IsDone()) {
if (!Intp.IsEmpty()) {
Standard_Real maxdist = RealLast();
constexpr Standard_Real maxdist = RealLast();
for (Standard_Integer i = 1 ; i <= Intp.NbPoints() ; i++) {
if (Intp.Point(i).Value().Distance(ThePnt) < maxdist) {
pntint2sol(1) = Intp.Point(i).Value();
@ -244,7 +244,7 @@ GccAna_Lin2dTanPer::
IntAna2d_AnaIntersection Intp(linsol(NbrSol),TheCircle);
if (Intp.IsDone()) {
if (!Intp.IsEmpty()) {
Standard_Real maxdist = RealLast();
constexpr Standard_Real maxdist = RealLast();
for (Standard_Integer i = 1 ; i <= Intp.NbPoints() ; i++) {
if (Intp.Point(i).Value().Distance(pnttg1sol(NbrSol)) < maxdist) {
pntint2sol(NbrSol) = Intp.Point(i).Value();

8
src/Graphic3d/Graphic3d_Structure.cxx
View File

@ -668,8 +668,8 @@ Bnd_Box Graphic3d_Structure::MinMaxValues (const Standard_Boolean theToIgnoreInf
aResult.Update (aBox.CornerMin().x(), aBox.CornerMin().y(), aBox.CornerMin().z(),
aBox.CornerMax().x(), aBox.CornerMax().y(), aBox.CornerMax().z());
Standard_Real aLimMin = ShortRealFirst() + 1.0;
Standard_Real aLimMax = ShortRealLast() - 1.0;
constexpr Standard_Real aLimMin = ShortRealFirst() + 1.0;
constexpr Standard_Real aLimMax = ShortRealLast() - 1.0;
gp_Pnt aMin = aResult.CornerMin();
gp_Pnt aMax = aResult.CornerMax();
if (aMin.X() < aLimMin && aMin.Y() < aLimMin && aMin.Z() < aLimMin
@ -847,8 +847,8 @@ void Graphic3d_Structure::Transforms (const gp_Trsf& theTrsf,
const Standard_Real theX, const Standard_Real theY, const Standard_Real theZ,
Standard_Real& theNewX, Standard_Real& theNewY, Standard_Real& theNewZ)
{
const Standard_Real aRL = RealLast();
const Standard_Real aRF = RealFirst();
constexpr Standard_Real aRL = RealLast();
constexpr Standard_Real aRF = RealFirst();
theNewX = theX;
theNewY = theY;
theNewZ = theZ;

2
src/IntTools/IntTools_FaceFace.cxx
View File

@ -977,7 +977,7 @@ void IntTools_FaceFace::MakeCurve(const Standard_Integer Index,
fprm=aSeqFprm(i);
lprm=aSeqLprm(i);
//
Standard_Real aRealEpsilon=RealEpsilon();
constexpr Standard_Real aRealEpsilon=RealEpsilon();
if (Abs(fprm) > aRealEpsilon || Abs(lprm-2.*M_PI) > aRealEpsilon) {
//==============================================
////

4
src/LocOpe/LocOpe_CSIntersector.cxx
View File

@ -89,8 +89,8 @@ void LocOpe_CSIntersector::Perform(const LocOpe_SequenceOfLin& Slin)
myPoints =
(LocOpe_SequenceOfPntFace *) new LocOpe_SequenceOfPntFace[myNbelem];
Standard_Real binf = RealFirst();
Standard_Real bsup = RealLast();
constexpr Standard_Real binf = RealFirst();
constexpr Standard_Real bsup = RealLast();
TopExp_Explorer exp(myShape,TopAbs_FACE);
for (; exp.More(); exp.Next()) {
const TopoDS_Face& theface = TopoDS::Face(exp.Current());

3
src/MeshVS/MeshVS_NodalColorPrsBuilder.cxx
View File

@ -79,7 +79,8 @@ public:
static inline Standard_Integer getNearestPow2( Standard_Integer theValue )
{
// Precaution against overflow
Standard_Integer aHalfMax = IntegerLast() >> 1, aRes = 1;
constexpr Standard_Integer aHalfMax = IntegerLast() >> 1;
Standard_Integer aRes = 1;
if ( theValue > aHalfMax ) theValue = aHalfMax;
while ( aRes < theValue ) aRes <<= 1;
return aRes;

28
src/QABugs/QABugs_11.cxx
View File

@ -2187,10 +2187,20 @@ static Standard_Integer OCC6143 (Draw_Interpretor& di, Standard_Integer argc, co
di << "(Integer) Overflow...";
//std::cout.flush();
di << "\n";
Standard_Integer res, i=IntegerLast();
res = i + 1;
//++++ std::cout << " -- "<<res<<"="<<i<<"+1 Does not Caught... KO"<< std::endl;
//++++ Succes = Standard_False;
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Winteger-overflow"
#elif defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Woverflow"
#endif
constexpr Standard_Integer i=IntegerLast();
Standard_Integer res = i + 1;
#if defined(__clang__)
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
di << "Not caught: " << i << " + 1 = " << res << ", still OK\n";
}
catch(Standard_Overflow const&) {
@ -2212,8 +2222,8 @@ static Standard_Integer OCC6143 (Draw_Interpretor& di, Standard_Integer argc, co
di << "(Real) Overflow...";
//std::cout.flush();
di << "\n";
Standard_Real res, r=RealLast();
res = r * r;
constexpr Standard_Real r = RealLast();
Standard_Real res = r * r;
(void)sin(1.); //this function tests FPU flags and raises signal (tested on LINUX).
@ -2244,8 +2254,8 @@ static Standard_Integer OCC6143 (Draw_Interpretor& di, Standard_Integer argc, co
di << "(Real) Underflow";
//std::cout.flush();
di << "\n";
Standard_Real res, r = RealSmall();
res = r * r;
constexpr Standard_Real r = RealSmall();
Standard_Real res = r * r;
//res = res + 1.;
//++++ std::cout<<"-- "<<res<<"="<<r<<"*"<<r<<" Does not Caught... KO"<<std::endl;
//++++ Succes = Standard_False;
@ -4540,7 +4550,7 @@ Standard_Integer OCC17424 (Draw_Interpretor& di, Standard_Integer argc, const ch
gp_Dir dir(X_Dir, Y_Dir, Z_Dir);
gp_Lin ray(origin, dir);
Standard_Real PSup = RealLast();
constexpr Standard_Real PSup = RealLast();
intersector.PerformNearest(ray, PInf, PSup);
if (intersector.NbPnt() != 0)
{

5
src/Standard/Standard_ShortReal.hxx
View File

@ -60,9 +60,8 @@ constexpr Standard_ShortReal ShortRealEpsilon()
//-------------------------------------------------------------------
// ShortRealFirst : Returns the minimum negative value of a ShortReal
//-------------------------------------------------------------------
inline Standard_ShortReal ShortRealFirst()
{ Standard_ShortReal MaxFloatTmp = -FLT_MAX;
return MaxFloatTmp; }
constexpr Standard_ShortReal ShortRealFirst()
{ return -FLT_MAX; }
//-------------------------------------------------------------------
// ShortRealFirst10Exp : Returns the minimum value of exponent(base 10) of

3
src/TopOpeBRepTool/TopOpeBRepTool_ShapeTool.cxx
View File

@ -566,7 +566,8 @@ Standard_Real TopOpeBRepTool_ShapeTool::EdgeData
C = BL.Curvature();
// xpu150399 cto900R4
Standard_Real tol1 = Epsilon(0.), tol2 = RealLast();
const Standard_Real tol1 = Epsilon(0.);
constexpr Standard_Real tol2 = RealLast();
Standard_Real tolm = Max(tol,Max(tol1,tol2));
if ( Abs(C) > tolm ) BL.Normal(N);

2
src/math/math_BissecNewton.cxx
View File

@ -67,7 +67,7 @@ void math_BissecNewton::Perform(math_FunctionWithDerivative& F,
return;
}
// Modified by Sergey KHROMOV - Wed Jan 22 12:06:45 2003 Begin
Standard_Real aFTol = RealEpsilon();
constexpr Standard_Real aFTol = RealEpsilon();
// if(fl * fh >= 0.0) {
if(fl * fh > aFTol*aFTol) {