mirror of
https://github.com/Open-Cascade-SAS/OCCT.git
synced 2026-09-09 22:28:13 +08:00
Coding - Refactor HArray and HSequence Definitions (#962)
- Replaced custom DEFINE_HARRAY1 and DEFINE_HSEQUENCE macros with typedefs to NCollection_HArray1 and NCollection_HSequence for various data types across multiple files. - Updated header files in the following modules: - HLRAlgo - TKShHealing - TKBRep - TKG2d - TKG3d - TKGeomBase - TKMeshVS - TKV3d - This change improves consistency and reduces the complexity of the codebase by utilizing the standard NCollection templates.
This commit is contained in:
@@ -19,8 +19,6 @@
|
||||
|
||||
#include <AppDef_MultiPointConstraint.hxx>
|
||||
#include <AppDef_Array1OfMultiPointConstraint.hxx>
|
||||
#include <NCollection_DefineHArray1.hxx>
|
||||
|
||||
DEFINE_HARRAY1(AppDef_HArray1OfMultiPointConstraint, AppDef_Array1OfMultiPointConstraint)
|
||||
|
||||
#include <NCollection_HArray1.hxx>
|
||||
typedef NCollection_HArray1<AppDef_MultiPointConstraint> AppDef_HArray1OfMultiPointConstraint;
|
||||
#endif
|
||||
|
||||
@@ -18,8 +18,6 @@
|
||||
#define AppParCurves_HArray1OfConstraintCouple_HeaderFile
|
||||
|
||||
#include <AppParCurves_Array1OfConstraintCouple.hxx>
|
||||
#include <NCollection_DefineHArray1.hxx>
|
||||
|
||||
DEFINE_HARRAY1(AppParCurves_HArray1OfConstraintCouple, AppParCurves_Array1OfConstraintCouple)
|
||||
|
||||
#include <NCollection_HArray1.hxx>
|
||||
typedef NCollection_HArray1<AppParCurves_ConstraintCouple> AppParCurves_HArray1OfConstraintCouple;
|
||||
#endif
|
||||
|
||||
@@ -19,8 +19,6 @@
|
||||
|
||||
#include <AppParCurves_MultiBSpCurve.hxx>
|
||||
#include <AppParCurves_Array1OfMultiBSpCurve.hxx>
|
||||
#include <NCollection_DefineHArray1.hxx>
|
||||
|
||||
DEFINE_HARRAY1(AppParCurves_HArray1OfMultiBSpCurve, AppParCurves_Array1OfMultiBSpCurve)
|
||||
|
||||
#include <NCollection_HArray1.hxx>
|
||||
typedef NCollection_HArray1<AppParCurves_MultiBSpCurve> AppParCurves_HArray1OfMultiBSpCurve;
|
||||
#endif
|
||||
|
||||
@@ -19,8 +19,6 @@
|
||||
|
||||
#include <AppParCurves_MultiCurve.hxx>
|
||||
#include <AppParCurves_Array1OfMultiCurve.hxx>
|
||||
#include <NCollection_DefineHArray1.hxx>
|
||||
|
||||
DEFINE_HARRAY1(AppParCurves_HArray1OfMultiCurve, AppParCurves_Array1OfMultiCurve)
|
||||
|
||||
#include <NCollection_HArray1.hxx>
|
||||
typedef NCollection_HArray1<AppParCurves_MultiCurve> AppParCurves_HArray1OfMultiCurve;
|
||||
#endif
|
||||
|
||||
@@ -19,8 +19,6 @@
|
||||
|
||||
#include <AppParCurves_MultiPoint.hxx>
|
||||
#include <AppParCurves_Array1OfMultiPoint.hxx>
|
||||
#include <NCollection_DefineHArray1.hxx>
|
||||
|
||||
DEFINE_HARRAY1(AppParCurves_HArray1OfMultiPoint, AppParCurves_Array1OfMultiPoint)
|
||||
|
||||
#include <NCollection_HArray1.hxx>
|
||||
typedef NCollection_HArray1<AppParCurves_MultiPoint> AppParCurves_HArray1OfMultiPoint;
|
||||
#endif
|
||||
|
||||
@@ -19,8 +19,6 @@
|
||||
|
||||
#include <Adaptor3d_Surface.hxx>
|
||||
#include <Approx_Array1OfAdHSurface.hxx>
|
||||
#include <NCollection_DefineHArray1.hxx>
|
||||
|
||||
DEFINE_HARRAY1(Approx_HArray1OfAdHSurface, Approx_Array1OfAdHSurface)
|
||||
|
||||
#include <NCollection_HArray1.hxx>
|
||||
typedef NCollection_HArray1<Handle(Adaptor3d_Surface)> Approx_HArray1OfAdHSurface;
|
||||
#endif
|
||||
|
||||
@@ -18,8 +18,6 @@
|
||||
#define Approx_HArray1OfGTrsf2d_HeaderFile
|
||||
|
||||
#include <Approx_Array1OfGTrsf2d.hxx>
|
||||
#include <NCollection_DefineHArray1.hxx>
|
||||
|
||||
DEFINE_HARRAY1(Approx_HArray1OfGTrsf2d, Approx_Array1OfGTrsf2d)
|
||||
|
||||
#include <NCollection_HArray1.hxx>
|
||||
typedef NCollection_HArray1<gp_GTrsf2d> Approx_HArray1OfGTrsf2d;
|
||||
#endif
|
||||
|
||||
@@ -18,8 +18,6 @@
|
||||
#define Extrema_HArray1OfPOnCurv_HeaderFile
|
||||
|
||||
#include <Extrema_Array1OfPOnCurv.hxx>
|
||||
#include <NCollection_DefineHArray1.hxx>
|
||||
|
||||
DEFINE_HARRAY1(Extrema_HArray1OfPOnCurv, Extrema_Array1OfPOnCurv)
|
||||
|
||||
#include <NCollection_HArray1.hxx>
|
||||
typedef NCollection_HArray1<Extrema_POnCurv> Extrema_HArray1OfPOnCurv;
|
||||
#endif
|
||||
|
||||
@@ -19,8 +19,6 @@
|
||||
|
||||
#include <Extrema_POnCurv2d.hxx>
|
||||
#include <Extrema_Array1OfPOnCurv2d.hxx>
|
||||
#include <NCollection_DefineHArray1.hxx>
|
||||
|
||||
DEFINE_HARRAY1(Extrema_HArray1OfPOnCurv2d, Extrema_Array1OfPOnCurv2d)
|
||||
|
||||
#include <NCollection_HArray1.hxx>
|
||||
typedef NCollection_HArray1<Extrema_POnCurv2d> Extrema_HArray1OfPOnCurv2d;
|
||||
#endif
|
||||
|
||||
@@ -18,8 +18,6 @@
|
||||
#define Extrema_HArray1OfPOnSurf_HeaderFile
|
||||
|
||||
#include <Extrema_Array1OfPOnSurf.hxx>
|
||||
#include <NCollection_DefineHArray1.hxx>
|
||||
|
||||
DEFINE_HARRAY1(Extrema_HArray1OfPOnSurf, Extrema_Array1OfPOnSurf)
|
||||
|
||||
#include <NCollection_HArray1.hxx>
|
||||
typedef NCollection_HArray1<Extrema_POnSurf> Extrema_HArray1OfPOnSurf;
|
||||
#endif
|
||||
|
||||
@@ -19,8 +19,6 @@
|
||||
|
||||
#include <Extrema_POnCurv.hxx>
|
||||
#include <Extrema_Array2OfPOnCurv.hxx>
|
||||
#include <NCollection_DefineHArray2.hxx>
|
||||
|
||||
DEFINE_HARRAY2(Extrema_HArray2OfPOnCurv, Extrema_Array2OfPOnCurv)
|
||||
|
||||
#include <NCollection_HArray2.hxx>
|
||||
typedef NCollection_HArray2<Extrema_POnCurv> Extrema_HArray2OfPOnCurv;
|
||||
#endif
|
||||
|
||||
@@ -19,8 +19,6 @@
|
||||
|
||||
#include <Extrema_POnCurv2d.hxx>
|
||||
#include <Extrema_Array2OfPOnCurv2d.hxx>
|
||||
#include <NCollection_DefineHArray2.hxx>
|
||||
|
||||
DEFINE_HARRAY2(Extrema_HArray2OfPOnCurv2d, Extrema_Array2OfPOnCurv2d)
|
||||
|
||||
#include <NCollection_HArray2.hxx>
|
||||
typedef NCollection_HArray2<Extrema_POnCurv2d> Extrema_HArray2OfPOnCurv2d;
|
||||
#endif
|
||||
|
||||
@@ -19,8 +19,6 @@
|
||||
|
||||
#include <Extrema_POnSurf.hxx>
|
||||
#include <Extrema_Array2OfPOnSurf.hxx>
|
||||
#include <NCollection_DefineHArray2.hxx>
|
||||
|
||||
DEFINE_HARRAY2(Extrema_HArray2OfPOnSurf, Extrema_Array2OfPOnSurf)
|
||||
|
||||
#include <NCollection_HArray2.hxx>
|
||||
typedef NCollection_HArray2<Extrema_POnSurf> Extrema_HArray2OfPOnSurf;
|
||||
#endif
|
||||
|
||||
@@ -19,8 +19,6 @@
|
||||
|
||||
#include <TColStd_HArray1OfInteger.hxx>
|
||||
#include <FEmTool_AssemblyTable.hxx>
|
||||
#include <NCollection_DefineHArray2.hxx>
|
||||
|
||||
DEFINE_HARRAY2(FEmTool_HAssemblyTable, FEmTool_AssemblyTable)
|
||||
|
||||
#include <NCollection_HArray2.hxx>
|
||||
typedef NCollection_HArray2<Handle(TColStd_HArray1OfInteger)> FEmTool_HAssemblyTable;
|
||||
#endif
|
||||
|
||||
@@ -18,8 +18,6 @@
|
||||
#define ProjLib_HSequenceOfHSequenceOfPnt_HeaderFile
|
||||
|
||||
#include <ProjLib_SequenceOfHSequenceOfPnt.hxx>
|
||||
#include <NCollection_DefineHSequence.hxx>
|
||||
|
||||
DEFINE_HSEQUENCE(ProjLib_HSequenceOfHSequenceOfPnt, ProjLib_SequenceOfHSequenceOfPnt)
|
||||
|
||||
#include <NCollection_HSequence.hxx>
|
||||
typedef NCollection_HSequence<Handle(TColgp_HSequenceOfPnt)> ProjLib_HSequenceOfHSequenceOfPnt;
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user