mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-09-08 14:17:06 +03:00
0026937: Eliminate NO_CXX_EXCEPTION macro support
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:
@@ -48,7 +48,7 @@ Standard_Real Draft::Angle(const TopoDS_Face& F,
|
||||
if (TypeS != STANDARD_TYPE(Geom_Plane) &&
|
||||
TypeS != STANDARD_TYPE(Geom_ConicalSurface) &&
|
||||
TypeS != STANDARD_TYPE(Geom_CylindricalSurface)) {
|
||||
Standard_DomainError::Raise();
|
||||
throw Standard_DomainError();
|
||||
}
|
||||
|
||||
Standard_Real Angle;
|
||||
@@ -68,7 +68,7 @@ Standard_Real Draft::Angle(const TopoDS_Face& F,
|
||||
gp_Cylinder Cy(Handle(Geom_CylindricalSurface)::DownCast(S)->Cylinder());
|
||||
Standard_Real testdir = D.Dot(Cy.Axis().Direction());
|
||||
if (Abs(testdir) <= 1.-Precision::Angular()) {
|
||||
Standard_DomainError::Raise();
|
||||
throw Standard_DomainError();
|
||||
}
|
||||
Angle = 0.;
|
||||
}
|
||||
@@ -76,7 +76,7 @@ Standard_Real Draft::Angle(const TopoDS_Face& F,
|
||||
gp_Cone Co(Handle(Geom_ConicalSurface)::DownCast(S)->Cone());
|
||||
Standard_Real testdir = D.Dot(Co.Axis().Direction());
|
||||
if (Abs(testdir) <= 1.-Precision::Angular()) {
|
||||
Standard_DomainError::Raise();
|
||||
throw Standard_DomainError();
|
||||
}
|
||||
Standard_Real umin,umax,vmin,vmax;
|
||||
BRepTools::UVBounds(F,umin,umax,vmin,vmax);
|
||||
|
@@ -111,7 +111,7 @@ Standard_Boolean Draft_Modification::Add(const TopoDS_Face& F,
|
||||
const Standard_Boolean Flag)
|
||||
{
|
||||
if (!badShape.IsNull()) {
|
||||
Standard_ConstructionError::Raise();
|
||||
throw Standard_ConstructionError();
|
||||
}
|
||||
|
||||
if (myComp) {
|
||||
@@ -130,7 +130,7 @@ Standard_Boolean Draft_Modification::Add(const TopoDS_Face& F,
|
||||
void Draft_Modification::Remove(const TopoDS_Face& F)
|
||||
{
|
||||
if (!myFMap.Contains(F) || myComp) {
|
||||
Standard_NoSuchObject::Raise();
|
||||
throw Standard_NoSuchObject();
|
||||
}
|
||||
|
||||
conneF.Clear();
|
||||
@@ -229,10 +229,10 @@ const TopoDS_Shape& Draft_Modification::ProblematicShape() const
|
||||
const TopTools_ListOfShape & Draft_Modification::ConnectedFaces(const TopoDS_Face& F)
|
||||
{
|
||||
if (!myFMap.Contains(F)) {
|
||||
Standard_NoSuchObject::Raise();
|
||||
throw Standard_NoSuchObject();
|
||||
}
|
||||
if (!IsDone()) {
|
||||
StdFail_NotDone::Raise();
|
||||
throw StdFail_NotDone();
|
||||
}
|
||||
conneF.Clear();
|
||||
curFace = myFMap.FindFromKey(F).RootFace();
|
||||
@@ -259,7 +259,7 @@ const TopTools_ListOfShape & Draft_Modification::ConnectedFaces(const TopoDS_Fac
|
||||
const TopTools_ListOfShape & Draft_Modification::ModifiedFaces()
|
||||
{
|
||||
if (!badShape.IsNull()) {
|
||||
StdFail_NotDone::Raise();
|
||||
throw StdFail_NotDone();
|
||||
}
|
||||
conneF.Clear();
|
||||
|
||||
@@ -289,7 +289,7 @@ Standard_Boolean Draft_Modification::NewSurface(const TopoDS_Face& F,
|
||||
Standard_Boolean& RevWires,
|
||||
Standard_Boolean& RevFace)
|
||||
{
|
||||
if (!IsDone()) {Standard_DomainError::Raise();}
|
||||
if (!IsDone()) {throw Standard_DomainError();}
|
||||
|
||||
if (!myFMap.Contains(F) || !myFMap.FindFromKey(F).NewGeometry()) {
|
||||
return Standard_False;
|
||||
@@ -319,7 +319,7 @@ Standard_Boolean Draft_Modification::NewCurve(const TopoDS_Edge& E,
|
||||
TopLoc_Location& L,
|
||||
Standard_Real& Tol)
|
||||
{
|
||||
if (!IsDone()) {Standard_DomainError::Raise();}
|
||||
if (!IsDone()) {throw Standard_DomainError();}
|
||||
|
||||
if (!myEMap.Contains(E))
|
||||
return Standard_False;
|
||||
@@ -347,7 +347,7 @@ Standard_Boolean Draft_Modification::NewPoint(const TopoDS_Vertex& V,
|
||||
gp_Pnt& P,
|
||||
Standard_Real& Tol)
|
||||
{
|
||||
if (!IsDone()) {Standard_DomainError::Raise();};
|
||||
if (!IsDone()) {throw Standard_DomainError();};
|
||||
|
||||
if (!myVMap.Contains(V)) {
|
||||
return Standard_False;
|
||||
@@ -372,7 +372,7 @@ Standard_Boolean Draft_Modification::NewCurve2d(const TopoDS_Edge& E,
|
||||
Standard_Real& Tol)
|
||||
{
|
||||
|
||||
if (!IsDone()) {Standard_DomainError::Raise();};
|
||||
if (!IsDone()) {throw Standard_DomainError();};
|
||||
|
||||
if (!myEMap.Contains(E)) {
|
||||
return Standard_False;
|
||||
@@ -479,7 +479,7 @@ Standard_Boolean Draft_Modification::NewParameter(const TopoDS_Vertex& V,
|
||||
Standard_Real& Tol)
|
||||
{
|
||||
|
||||
if (!IsDone()) {Standard_DomainError::Raise();};
|
||||
if (!IsDone()) {throw Standard_DomainError();};
|
||||
|
||||
if (!myVMap.Contains(V)) {
|
||||
return Standard_False;
|
||||
|
@@ -691,7 +691,7 @@ Standard_Boolean Draft_Modification::Propagate ()
|
||||
|
||||
void Draft_Modification::Perform ()
|
||||
{
|
||||
if (!badShape.IsNull()) Standard_ConstructionError::Raise();
|
||||
if (!badShape.IsNull()) throw Standard_ConstructionError();
|
||||
|
||||
if (!myComp) {
|
||||
myComp = Standard_True;
|
||||
@@ -2066,7 +2066,7 @@ static Standard_Real Parameter(const Handle(Geom_Curve)& C,
|
||||
GeomAdaptor_Curve TheCurve(C);
|
||||
Extrema_ExtPC myExtPC(P,TheCurve);
|
||||
if (!myExtPC.IsDone()) {
|
||||
Standard_Failure::Raise("Draft_Modification_1::Parameter: ExtremaPC not done.");
|
||||
throw Standard_Failure("Draft_Modification_1::Parameter: ExtremaPC not done.");
|
||||
}
|
||||
if (myExtPC.NbExt() >= 1) {
|
||||
Standard_Real Dist2, Dist2Min = myExtPC.SquareDistance(1);
|
||||
|
@@ -85,7 +85,7 @@ Standard_Real Draft_VertexInfo::Parameter (const TopoDS_Edge& E)
|
||||
return itp.Value();
|
||||
}
|
||||
}
|
||||
Standard_DomainError::Raise(); return 0;
|
||||
throw Standard_DomainError();
|
||||
}
|
||||
|
||||
|
||||
@@ -103,7 +103,7 @@ Standard_Real& Draft_VertexInfo::ChangeParameter (const TopoDS_Edge& E)
|
||||
return itp.Value();
|
||||
}
|
||||
}
|
||||
Standard_DomainError::Raise(); return itp.Value();
|
||||
throw Standard_DomainError();
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user