1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00

0032352: Coding Rules - clean up code from compatibility hacks with pre-C++11 compilers

Removed usage of std::auto_ptr.
opencascade::std workarounds for VS2008 have been dropped, when possible.
OCCT_NO_RVALUE_REFERENCE workaround for VS2008 has been removed.
This commit is contained in:
kgv
2021-12-02 15:51:11 +03:00
committed by smoskvin
parent 30fa5f6713
commit 65acdce54c
64 changed files with 174 additions and 354 deletions

View File

@@ -823,19 +823,20 @@ TopAbs_State IntTools_FClass2d::TestOnRestriction
}
} //for (;;)
}
//=======================================================================
//function : Destroy
//purpose :
//function : ~IntTools_FClass2d
//purpose :
//=======================================================================
void IntTools_FClass2d::Destroy()
{
Standard_Integer nbtabclass = TabClass.Length();
for(Standard_Integer d=1; d<=nbtabclass;d++) {
if(TabClass(d)) {
IntTools_FClass2d::~IntTools_FClass2d()
{
Standard_Integer nbtabclass = TabClass.Length();
for (Standard_Integer d = 1; d <= nbtabclass; d++)
{
if (TabClass(d))
{
delete ((CSLib_Class2d *)TabClass(d));
TabClass(d)=NULL;
}
}
}

View File

@@ -40,61 +40,38 @@ public:
DEFINE_STANDARD_ALLOC
//! Empty constructor
Standard_EXPORT IntTools_FClass2d();
//! Initializes algorithm by the face F
//! and tolerance Tol
Standard_EXPORT IntTools_FClass2d(const TopoDS_Face& F, const Standard_Real Tol);
//! Initializes algorithm by the face F
//! and tolerance Tol
Standard_EXPORT void Init (const TopoDS_Face& F, const Standard_Real Tol);
//! Returns state of infinite 2d point relatively to (0, 0)
Standard_EXPORT TopAbs_State PerformInfinitePoint() const;
//! Returns state of the 2d point Puv.
//! If RecadreOnPeriodic is true (defalut value),
//! If RecadreOnPeriodic is true (default value),
//! for the periodic surface 2d point, adjusted to period, is
//! classified.
Standard_EXPORT TopAbs_State Perform (const gp_Pnt2d& Puv, const Standard_Boolean RecadreOnPeriodic = Standard_True) const;
//! Destructor
Standard_EXPORT void Destroy();
~IntTools_FClass2d()
{
Destroy();
}
Standard_EXPORT ~IntTools_FClass2d();
//! Test a point with +- an offset (Tol) and returns
//! On if some points are OUT an some are IN
//! (Caution: Internal use . see the code for more details)
Standard_EXPORT TopAbs_State TestOnRestriction (const gp_Pnt2d& Puv, const Standard_Real Tol, const Standard_Boolean RecadreOnPeriodic = Standard_True) const;
Standard_EXPORT Standard_Boolean IsHole() const;
protected:
private:
BRepTopAdaptor_SeqOfPtr TabClass;
TColStd_SequenceOfInteger TabOrien;
Standard_Real Toluv;
@@ -109,22 +86,8 @@ private:
Standard_Real Vmax;
Standard_Boolean myIsHole;
#ifdef _MSC_VER
#if _MSC_VER < 1600
mutable std::auto_ptr<BRepClass_FaceExplorer> myFExplorer;
#else
mutable std::unique_ptr<BRepClass_FaceExplorer> myFExplorer;
#endif
#else
mutable std::unique_ptr<BRepClass_FaceExplorer> myFExplorer;
#endif
};
#endif // _IntTools_FClass2d_HeaderFile