mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-09-03 14:10:33 +03:00
0027772: Foundation Classes - define Standard_Boolean using C++ type "bool" instead of "unsigned int"
Code has been updated to remove no-op casts and implicit casts to Standard_Boolean. Places of inproper use of Standard_Boolean instead of Standard_Integer have been corrected: - Bnd_Box, Bnd_Box2d Bit flags are now defined as private enum - HLRAlgo_BiPoint, HLRAlgo_EdgesBlock, HLRBRep_EdgeData, HLRBRep_FaceData Bit flags are now defined as enum - HLRAlgo_EdgeStatus, HLRBRep_BiPnt2D, HLRBRep_BiPoint Bit flags are now defined as bool fields - HLRAlgo_PolyData Bit flags are now defined as Standard_Integer - OSD_DirectoryIterator, OSD_FileIterator Boolean flag is now defined as Standard_Boolean - ShapeAnalysis_Surface::SurfaceNewton() now returns Standard_Integer (values 0, 1 or 3) - ChFi2d_FilletAlgo now uses TColStd_SequenceOfBoolean instead of TColStd_SequenceOfInteger for storing boolean flags Method IFSelect_Dispatch::PacketsCount() has been dropped from interface. ShapeFix_Solid::Status() has been fixed to decode requested status instead of returning integer value. TopOpeBRepBuild_Builder1 now defines map storing Standard_Boolean values instead of Standard_Integer. Persistence for Standard_Boolean type has been corrected to keep backward compatibility: - BinMDataStd, BinTools, FSD_BinaryFile Broken Draw Harness commands vdisplaymode and verasemode have been removed. BRepMesh_FastDiscretFace::initDataStructure() - workaround old gcc limitations BRepMesh_IncrementalMesh::clear() - avoid ambiguity
This commit is contained in:
kgv
abv
@@ -34,69 +34,80 @@ public:
|
||||
|
||||
DEFINE_STANDARD_ALLOC
|
||||
|
||||
|
||||
HLRAlgo_BiPoint();
|
||||
|
||||
HLRAlgo_BiPoint() {}
|
||||
|
||||
Standard_EXPORT HLRAlgo_BiPoint(const Standard_Real X1, const Standard_Real Y1, const Standard_Real Z1, const Standard_Real X2, const Standard_Real Y2, const Standard_Real Z2, const Standard_Real XT1, const Standard_Real YT1, const Standard_Real ZT1, const Standard_Real XT2, const Standard_Real YT2, const Standard_Real ZT2, const Standard_Integer Index, const Standard_Boolean reg1, const Standard_Boolean regn, const Standard_Boolean outl, const Standard_Boolean intl);
|
||||
|
||||
Standard_EXPORT HLRAlgo_BiPoint(const Standard_Real X1, const Standard_Real Y1, const Standard_Real Z1, const Standard_Real X2, const Standard_Real Y2, const Standard_Real Z2, const Standard_Real XT1, const Standard_Real YT1, const Standard_Real ZT1, const Standard_Real XT2, const Standard_Real YT2, const Standard_Real ZT2, const Standard_Integer Index, const Standard_Boolean flag);
|
||||
Standard_EXPORT HLRAlgo_BiPoint(const Standard_Real X1, const Standard_Real Y1, const Standard_Real Z1, const Standard_Real X2, const Standard_Real Y2, const Standard_Real Z2, const Standard_Real XT1, const Standard_Real YT1, const Standard_Real ZT1, const Standard_Real XT2, const Standard_Real YT2, const Standard_Real ZT2, const Standard_Integer Index, const Standard_Integer flag);
|
||||
|
||||
Standard_EXPORT HLRAlgo_BiPoint(const Standard_Real X1, const Standard_Real Y1, const Standard_Real Z1, const Standard_Real X2, const Standard_Real Y2, const Standard_Real Z2, const Standard_Real XT1, const Standard_Real YT1, const Standard_Real ZT1, const Standard_Real XT2, const Standard_Real YT2, const Standard_Real ZT2, const Standard_Integer Index, const Standard_Integer i1, const Standard_Integer i1p1, const Standard_Integer i1p2, const Standard_Boolean reg1, const Standard_Boolean regn, const Standard_Boolean outl, const Standard_Boolean intl);
|
||||
|
||||
Standard_EXPORT HLRAlgo_BiPoint(const Standard_Real X1, const Standard_Real Y1, const Standard_Real Z1, const Standard_Real X2, const Standard_Real Y2, const Standard_Real Z2, const Standard_Real XT1, const Standard_Real YT1, const Standard_Real ZT1, const Standard_Real XT2, const Standard_Real YT2, const Standard_Real ZT2, const Standard_Integer Index, const Standard_Integer i1, const Standard_Integer i1p1, const Standard_Integer i1p2, const Standard_Boolean flag);
|
||||
Standard_EXPORT HLRAlgo_BiPoint(const Standard_Real X1, const Standard_Real Y1, const Standard_Real Z1, const Standard_Real X2, const Standard_Real Y2, const Standard_Real Z2, const Standard_Real XT1, const Standard_Real YT1, const Standard_Real ZT1, const Standard_Real XT2, const Standard_Real YT2, const Standard_Real ZT2, const Standard_Integer Index, const Standard_Integer i1, const Standard_Integer i1p1, const Standard_Integer i1p2, const Standard_Integer flag);
|
||||
|
||||
Standard_EXPORT HLRAlgo_BiPoint(const Standard_Real X1, const Standard_Real Y1, const Standard_Real Z1, const Standard_Real X2, const Standard_Real Y2, const Standard_Real Z2, const Standard_Real XT1, const Standard_Real YT1, const Standard_Real ZT1, const Standard_Real XT2, const Standard_Real YT2, const Standard_Real ZT2, const Standard_Integer Index, const Standard_Integer i1, const Standard_Integer i1p1, const Standard_Integer i1p2, const Standard_Integer i2, const Standard_Integer i2p1, const Standard_Integer i2p2, const Standard_Boolean reg1, const Standard_Boolean regn, const Standard_Boolean outl, const Standard_Boolean intl);
|
||||
|
||||
Standard_EXPORT HLRAlgo_BiPoint(const Standard_Real X1, const Standard_Real Y1, const Standard_Real Z1, const Standard_Real X2, const Standard_Real Y2, const Standard_Real Z2, const Standard_Real XT1, const Standard_Real YT1, const Standard_Real ZT1, const Standard_Real XT2, const Standard_Real YT2, const Standard_Real ZT2, const Standard_Integer Index, const Standard_Integer i1, const Standard_Integer i1p1, const Standard_Integer i1p2, const Standard_Integer i2, const Standard_Integer i2p1, const Standard_Integer i2p2, const Standard_Boolean flag);
|
||||
|
||||
Standard_Boolean Rg1Line() const;
|
||||
|
||||
void Rg1Line (const Standard_Boolean B);
|
||||
|
||||
Standard_Boolean RgNLine() const;
|
||||
|
||||
void RgNLine (const Standard_Boolean B);
|
||||
|
||||
Standard_Boolean OutLine() const;
|
||||
|
||||
void OutLine (const Standard_Boolean B);
|
||||
|
||||
Standard_Boolean IntLine() const;
|
||||
|
||||
void IntLine (const Standard_Boolean B);
|
||||
|
||||
Standard_Boolean Hidden() const;
|
||||
|
||||
void Hidden (const Standard_Boolean B);
|
||||
|
||||
Standard_Address Indices() const;
|
||||
|
||||
Standard_Address Coordinates() const;
|
||||
Standard_EXPORT HLRAlgo_BiPoint(const Standard_Real X1, const Standard_Real Y1, const Standard_Real Z1, const Standard_Real X2, const Standard_Real Y2, const Standard_Real Z2, const Standard_Real XT1, const Standard_Real YT1, const Standard_Real ZT1, const Standard_Real XT2, const Standard_Real YT2, const Standard_Real ZT2, const Standard_Integer Index, const Standard_Integer i1, const Standard_Integer i1p1, const Standard_Integer i1p2, const Standard_Integer i2, const Standard_Integer i2p1, const Standard_Integer i2p2, const Standard_Integer flag);
|
||||
|
||||
Standard_Boolean Rg1Line() const { return (myIndices[9] & EMskRg1Line) != 0; }
|
||||
|
||||
void Rg1Line (const Standard_Boolean B)
|
||||
{
|
||||
if (B) myIndices[9] |= EMskRg1Line;
|
||||
else myIndices[9] &= ~EMskRg1Line;
|
||||
}
|
||||
|
||||
Standard_Boolean RgNLine() const { return (myIndices[9] & EMskRgNLine) != 0; }
|
||||
|
||||
void RgNLine (const Standard_Boolean B)
|
||||
{
|
||||
if (B) myIndices[9] |= EMskRgNLine;
|
||||
else myIndices[9] &= ~EMskRgNLine;
|
||||
}
|
||||
|
||||
Standard_Boolean OutLine() const { return (myIndices[9] & EMskOutLine) != 0; }
|
||||
|
||||
void OutLine (const Standard_Boolean B)
|
||||
{
|
||||
if (B) myIndices[9] |= EMskOutLine;
|
||||
else myIndices[9] &= ~EMskOutLine;
|
||||
}
|
||||
|
||||
Standard_Boolean IntLine() const { return (myIndices[9] & EMskIntLine) != 0; }
|
||||
|
||||
void IntLine (const Standard_Boolean B)
|
||||
{
|
||||
if (B) myIndices[9] |= EMskIntLine;
|
||||
else myIndices[9] &= ~EMskIntLine;
|
||||
}
|
||||
|
||||
Standard_Boolean Hidden() const { return (myIndices[9] & EMskHidden) != 0; }
|
||||
|
||||
void Hidden (const Standard_Boolean B)
|
||||
{
|
||||
if (B) myIndices[9] |= EMskHidden;
|
||||
else myIndices[9] &= ~EMskHidden;
|
||||
}
|
||||
|
||||
Standard_Address Indices() const { return const_cast<Standard_Integer* >(myIndices); }
|
||||
|
||||
Standard_Address Coordinates() const { return const_cast<Standard_Real* >(myCoordinates); }
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
|
||||
|
||||
enum EMskFlags
|
||||
{
|
||||
EMskRg1Line = 1,
|
||||
EMskRgNLine = 2,
|
||||
EMskOutLine = 4,
|
||||
EMskIntLine = 8,
|
||||
EMskHidden = 16
|
||||
};
|
||||
|
||||
private:
|
||||
|
||||
|
||||
|
||||
Standard_Integer myIndices[10];
|
||||
Standard_Real myCoordinates[12];
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
||||
#include <HLRAlgo_BiPoint.lxx>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#endif // _HLRAlgo_BiPoint_HeaderFile
|
||||
|
||||
Reference in New Issue
Block a user