OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-03 14:10:33 +03:00
Code Activity

0026937: Eliminate NO_CXX_EXCEPTION macro support

Browse Source 
Macro NO_CXX_EXCEPTION was removed from code.
Method Raise() was replaced by explicit throw statement.
Method Standard_Failure::Caught() was replaced by normal C++mechanism of exception transfer.
Method Standard_Failure::Caught() is deprecated now.
Eliminated empty constructors.
Updated samples.
Eliminate empty method ChangeValue from NCollection_Map class.
Removed not operable methods from NCollection classes.
This commit is contained in:
ski
2017-02-02 16:35:21 +03:00
committed by apn
parent 0c63f2f8b9
commit 9775fa6110
1146 changed files with 4860 additions and 6183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/BRepPrim/BRepPrim_Cone.cxx
View File

@@ -40,11 +40,11 @@ BRepPrim_Cone::BRepPrim_Cone(const Standard_Real Angle,
myRadius(Radius)
{
if (Height < Precision::Confusion())
Standard_DomainError::Raise("cone with null height");
throw Standard_DomainError("cone with null height");
if (myHalfAngle*Height < Precision::Confusion())
Standard_DomainError::Raise("cone with null angle");
throw Standard_DomainError("cone with null angle");
if ((M_PI/2 - myHalfAngle)*Height < Precision::Confusion())
Standard_DomainError::Raise("cone with angle > PI/2");
throw Standard_DomainError("cone with angle > PI/2");
// cut at top
VMax(Height / Cos(myHalfAngle));
@@ -63,7 +63,7 @@ BRepPrim_Cone::BRepPrim_Cone(const Standard_Real Angle) :
myRadius(0.)
{
if ((Angle < 0) || (Angle > M_PI/2))
Standard_DomainError::Raise("cone with angle <0 or > PI/2");
throw Standard_DomainError("cone with angle <0 or > PI/2");
VMin(0.);
SetMeridian();
}
@@ -81,7 +81,7 @@ BRepPrim_Cone::BRepPrim_Cone(const Standard_Real Angle,
myRadius(0.)
{
if ((Angle < 0) || (Angle > M_PI/2))
Standard_DomainError::Raise("cone with angle <0 or > PI/2");
throw Standard_DomainError("cone with angle <0 or > PI/2");
VMin(0.);
SetMeridian();
}
@@ -97,7 +97,7 @@ BRepPrim_Cone::BRepPrim_Cone(const Standard_Real Angle,
myHalfAngle(Angle)
{
if ((Angle < 0) || (Angle > M_PI/2))
Standard_DomainError::Raise("cone with angle <0 or > PI/2");
throw Standard_DomainError("cone with angle <0 or > PI/2");
VMin(0.);
SetMeridian();
}
@@ -190,11 +190,11 @@ void BRepPrim_Cone::SetParameters(const Standard_Real R1,
{
if (((R1 != 0) && (R1 < Precision::Confusion())) ||
((R2 != 0) && (R2 < Precision::Confusion())))
Standard_DomainError::Raise("cone with negative or too small radius");
throw Standard_DomainError("cone with negative or too small radius");
if (Abs(R1-R2) < Precision::Confusion())
Standard_DomainError::Raise("cone with two identic radii");
throw Standard_DomainError("cone with two identic radii");
if (H < Precision::Confusion())
Standard_DomainError::Raise("cone with negative or null height");
throw Standard_DomainError("cone with negative or null height");
myRadius = R1;
myHalfAngle = ATan((R2 - R1) / H);

12
src/BRepPrim/BRepPrim_FaceBuilder.cxx
View File

@@ -93,12 +93,12 @@ void BRepPrim_FaceBuilder::Init(const BRep_Builder& B,
Standard_Real USMin,USMax,VSMin,VSMax;
S->Bounds(USMin,USMax,VSMin,VSMax);
if (UMin >= UMax) Standard_ConstructionError::Raise("BRepPrim_FaceBuilder");
if (VMin >= VMax) Standard_ConstructionError::Raise("BRepPrim_FaceBuilder");
if (UMin < USMin) Standard_ConstructionError::Raise("BRepPrim_FaceBuilder");
if (UMax > USMax) Standard_ConstructionError::Raise("BRepPrim_FaceBuilder");
if (VMin < VSMin) Standard_ConstructionError::Raise("BRepPrim_FaceBuilder");
if (VMax > VSMax) Standard_ConstructionError::Raise("BRepPrim_FaceBuilder");
if (UMin >= UMax) throw Standard_ConstructionError("BRepPrim_FaceBuilder");
if (VMin >= VMax) throw Standard_ConstructionError("BRepPrim_FaceBuilder");
if (UMin < USMin) throw Standard_ConstructionError("BRepPrim_FaceBuilder");
if (UMax > USMax) throw Standard_ConstructionError("BRepPrim_FaceBuilder");
if (VMin < VSMin) throw Standard_ConstructionError("BRepPrim_FaceBuilder");
if (VMax > VSMax) throw Standard_ConstructionError("BRepPrim_FaceBuilder");
// Make the vertices
B.MakeVertex(myVertex[0],S->Value(UMin,VMin),Precision::Confusion());

26
src/BRepPrim/BRepPrim_GWedge.cxx
View File

@@ -67,7 +67,7 @@ static Standard_Integer BRepPrim_Wedge_NumDir2
{
Standard_Integer i1 = BRepPrim_Wedge_NumDir1(d1);
Standard_Integer i2 = BRepPrim_Wedge_NumDir1(d2);
if ( i1/2 == i2/2 ) Standard_DomainError::Raise();
if ( i1/2 == i2/2 ) throw Standard_DomainError();
return tab[i1][i2];
}
@@ -86,7 +86,7 @@ static Standard_Integer BRepPrim_Wedge_NumDir3
Standard_Integer i3 = BRepPrim_Wedge_NumDir1(d3);
if (( i1/2 == i2/2 ) ||
( i2/2 == i3/2 ) ||
( i3/2 == i1/2 )) Standard_DomainError::Raise();
( i3/2 == i1/2 )) throw Standard_DomainError();
return val[i1]+val[i2]+val[i3];
}
@@ -102,13 +102,13 @@ static void BRepPrim_Wedge_Check(const Standard_Boolean V[],
{
Standard_Integer i;
for (i = 0; i < NBVERTICES; i++)
if (V[i]) Standard_DomainError::Raise();
if (V[i]) throw Standard_DomainError();
for (i = 0; i < NBEDGES; i++)
if (E[i]) Standard_DomainError::Raise();
if (E[i]) throw Standard_DomainError();
for (i = 0; i < NBWIRES; i++)
if (W[i]) Standard_DomainError::Raise();
if (W[i]) throw Standard_DomainError();
for (i = 0; i < NBFACES; i++)
if (F[i]) Standard_DomainError::Raise();
if (F[i]) throw Standard_DomainError();
}
//=======================================================================
@@ -161,7 +161,7 @@ BRepPrim_GWedge::BRepPrim_GWedge (const BRepPrim_Builder& B,
if ( ( dx <= Precision::Confusion() ) ||
( dy <= Precision::Confusion() ) ||
( dz <= Precision::Confusion() ) )
Standard_DomainError::Raise();
throw Standard_DomainError();
BRepPrim_Wedge_Init(ShellBuilt,VerticesBuilt,EdgesBuilt,
WiresBuilt,FacesBuilt);
}
@@ -195,7 +195,7 @@ BRepPrim_GWedge::BRepPrim_GWedge (const BRepPrim_Builder& B,
( dy <= Precision::Confusion() ) ||
( dz <= Precision::Confusion() ) ||
( ltx < 0 ) )
Standard_DomainError::Raise();
throw Standard_DomainError();
BRepPrim_Wedge_Init(ShellBuilt,VerticesBuilt,EdgesBuilt,
WiresBuilt,FacesBuilt);
}
@@ -236,7 +236,7 @@ BRepPrim_GWedge::BRepPrim_GWedge (const BRepPrim_Builder& B,
( ZMax-ZMin <= Precision::Confusion() ) ||
( Z2Max-Z2Min < 0 ) ||
( X2Max-X2Min < 0 ) )
Standard_DomainError::Raise();
throw Standard_DomainError();
BRepPrim_Wedge_Init(ShellBuilt,VerticesBuilt,EdgesBuilt,
WiresBuilt,FacesBuilt);
}
@@ -658,7 +658,7 @@ gp_Lin BRepPrim_GWedge::Line
(const BRepPrim_Direction d1,
const BRepPrim_Direction d2)
{
if (!HasEdge(d1,d2)) Standard_DomainError::Raise();
if (!HasEdge(d1,d2)) throw Standard_DomainError();
Standard_Integer i = BRepPrim_Wedge_NumDir2(d1,d2);
@@ -799,7 +799,7 @@ const TopoDS_Edge& BRepPrim_GWedge::Edge
(const BRepPrim_Direction d1,
const BRepPrim_Direction d2)
{
if (!HasEdge(d1,d2)) Standard_DomainError::Raise();
if (!HasEdge(d1,d2)) throw Standard_DomainError();
Standard_Integer i = BRepPrim_Wedge_NumDir2(d1,d2);
@@ -894,7 +894,7 @@ gp_Pnt BRepPrim_GWedge::Point
const BRepPrim_Direction d2,
const BRepPrim_Direction d3)
{
if (!HasVertex(d1,d2,d3)) Standard_DomainError::Raise();
if (!HasVertex(d1,d2,d3)) throw Standard_DomainError();
Standard_Integer i = BRepPrim_Wedge_NumDir3(d1,d2,d3);
@@ -969,7 +969,7 @@ const TopoDS_Vertex& BRepPrim_GWedge::Vertex
const BRepPrim_Direction d2,
const BRepPrim_Direction d3)
{
if (!HasVertex(d1,d2,d3)) Standard_DomainError::Raise();
if (!HasVertex(d1,d2,d3)) throw Standard_DomainError();
Standard_Integer i = BRepPrim_Wedge_NumDir3(d1,d2,d3);

8
src/BRepPrim/BRepPrim_OneAxis.cxx
View File

@@ -81,13 +81,13 @@ static void BRepPrim_OneAxis_Check(const Standard_Boolean V[],
{
Standard_Integer i;
for (i = 0; i < NBVERTICES; i++)
if (V[i]) Standard_DomainError::Raise();
if (V[i]) throw Standard_DomainError();
for (i = 0; i < NBEDGES; i++)
if (E[i]) Standard_DomainError::Raise();
if (E[i]) throw Standard_DomainError();
for (i = 0; i < NBWIRES; i++)
if (W[i]) Standard_DomainError::Raise();
if (W[i]) throw Standard_DomainError();
for (i = 0; i < NBFACES; i++)
if (F[i]) Standard_DomainError::Raise();
if (F[i]) throw Standard_DomainError();
}
//=======================================================================