1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-03 14:10:33 +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:
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

View File

@@ -46,8 +46,7 @@ Adaptor2d_Curve2d::~Adaptor2d_Curve2d()
Standard_Real Adaptor2d_Curve2d::FirstParameter() const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::FirstParameter");
return 0.;
throw Standard_NotImplemented("Adaptor2d_Curve2d::FirstParameter");
}
@@ -58,8 +57,7 @@ Standard_Real Adaptor2d_Curve2d::FirstParameter() const
Standard_Real Adaptor2d_Curve2d::LastParameter() const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::LastParameter");
return 0.;
throw Standard_NotImplemented("Adaptor2d_Curve2d::LastParameter");
}
@@ -70,8 +68,7 @@ Standard_Real Adaptor2d_Curve2d::LastParameter() const
GeomAbs_Shape Adaptor2d_Curve2d::Continuity() const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::Continuity");
return GeomAbs_C0;
throw Standard_NotImplemented("Adaptor2d_Curve2d::Continuity");
}
@@ -83,8 +80,7 @@ GeomAbs_Shape Adaptor2d_Curve2d::Continuity() const
//Standard_Integer Adaptor2d_Curve2d::NbIntervals(const GeomAbs_Shape S) const
Standard_Integer Adaptor2d_Curve2d::NbIntervals(const GeomAbs_Shape ) const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::NbIntervals");
return 0;
throw Standard_NotImplemented("Adaptor2d_Curve2d::NbIntervals");
}
@@ -98,7 +94,7 @@ Standard_Integer Adaptor2d_Curve2d::NbIntervals(const GeomAbs_Shape ) const
void Adaptor2d_Curve2d::Intervals(TColStd_Array1OfReal& ,
const GeomAbs_Shape ) const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::Intervals");
throw Standard_NotImplemented("Adaptor2d_Curve2d::Intervals");
}
@@ -114,8 +110,7 @@ Handle(Adaptor2d_HCurve2d) Adaptor2d_Curve2d::Trim(const Standard_Real ,
const Standard_Real ,
const Standard_Real ) const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::Trim");
return Handle(Adaptor2d_HCurve2d)();
throw Standard_NotImplemented("Adaptor2d_Curve2d::Trim");
}
//=======================================================================
@@ -125,8 +120,7 @@ Handle(Adaptor2d_HCurve2d) Adaptor2d_Curve2d::Trim(const Standard_Real ,
Standard_Boolean Adaptor2d_Curve2d::IsClosed() const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::IsClosed");
return 0;
throw Standard_NotImplemented("Adaptor2d_Curve2d::IsClosed");
}
@@ -137,8 +131,7 @@ Standard_Boolean Adaptor2d_Curve2d::IsClosed() const
Standard_Boolean Adaptor2d_Curve2d::IsPeriodic() const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::IsPeriodic");
return 0;
throw Standard_NotImplemented("Adaptor2d_Curve2d::IsPeriodic");
}
@@ -149,8 +142,7 @@ Standard_Boolean Adaptor2d_Curve2d::IsPeriodic() const
Standard_Real Adaptor2d_Curve2d::Period() const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::Period");
return 0.;
throw Standard_NotImplemented("Adaptor2d_Curve2d::Period");
}
@@ -162,8 +154,7 @@ Standard_Real Adaptor2d_Curve2d::Period() const
//gp_Pnt2d Adaptor2d_Curve2d::Value(const Standard_Real U) const
gp_Pnt2d Adaptor2d_Curve2d::Value(const Standard_Real ) const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::Value");
return gp_Pnt2d();
throw Standard_NotImplemented("Adaptor2d_Curve2d::Value");
}
@@ -175,7 +166,7 @@ gp_Pnt2d Adaptor2d_Curve2d::Value(const Standard_Real ) const
//void Adaptor2d_Curve2d::D0(const Standard_Real U, gp_Pnt2d& P) const
void Adaptor2d_Curve2d::D0(const Standard_Real , gp_Pnt2d& ) const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::D0");
throw Standard_NotImplemented("Adaptor2d_Curve2d::D0");
}
@@ -189,7 +180,7 @@ void Adaptor2d_Curve2d::D0(const Standard_Real , gp_Pnt2d& ) const
void Adaptor2d_Curve2d::D1(const Standard_Real ,
gp_Pnt2d& , gp_Vec2d& ) const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::D1");
throw Standard_NotImplemented("Adaptor2d_Curve2d::D1");
}
@@ -203,7 +194,7 @@ void Adaptor2d_Curve2d::D1(const Standard_Real ,
void Adaptor2d_Curve2d::D2(const Standard_Real ,
gp_Pnt2d& , gp_Vec2d& , gp_Vec2d& ) const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::D2");
throw Standard_NotImplemented("Adaptor2d_Curve2d::D2");
}
@@ -217,7 +208,7 @@ void Adaptor2d_Curve2d::D2(const Standard_Real ,
void Adaptor2d_Curve2d::D3(const Standard_Real ,
gp_Pnt2d& , gp_Vec2d& , gp_Vec2d& , gp_Vec2d& ) const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::D3");
throw Standard_NotImplemented("Adaptor2d_Curve2d::D3");
}
@@ -231,8 +222,7 @@ void Adaptor2d_Curve2d::D3(const Standard_Real ,
gp_Vec2d Adaptor2d_Curve2d::DN(const Standard_Real ,
const Standard_Integer ) const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::DN");
return gp_Vec2d();
throw Standard_NotImplemented("Adaptor2d_Curve2d::DN");
}
@@ -244,8 +234,7 @@ gp_Vec2d Adaptor2d_Curve2d::DN(const Standard_Real ,
//Standard_Real Adaptor2d_Curve2d::Resolution(const Standard_Real R3d) const
Standard_Real Adaptor2d_Curve2d::Resolution(const Standard_Real ) const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::Resolution");
return 0.;
throw Standard_NotImplemented("Adaptor2d_Curve2d::Resolution");
}
@@ -256,8 +245,7 @@ Standard_Real Adaptor2d_Curve2d::Resolution(const Standard_Real ) const
GeomAbs_CurveType Adaptor2d_Curve2d::GetType() const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::GetType");
return GeomAbs_OtherCurve;
throw Standard_NotImplemented("Adaptor2d_Curve2d::GetType");
}
@@ -268,8 +256,7 @@ GeomAbs_CurveType Adaptor2d_Curve2d::GetType() const
gp_Lin2d Adaptor2d_Curve2d::Line() const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::Line");
return gp_Lin2d();
throw Standard_NotImplemented("Adaptor2d_Curve2d::Line");
}
@@ -280,8 +267,7 @@ gp_Lin2d Adaptor2d_Curve2d::Line() const
gp_Circ2d Adaptor2d_Curve2d::Circle() const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::Circle");
return gp_Circ2d();
throw Standard_NotImplemented("Adaptor2d_Curve2d::Circle");
}
@@ -292,8 +278,7 @@ gp_Circ2d Adaptor2d_Curve2d::Circle() const
gp_Elips2d Adaptor2d_Curve2d::Ellipse() const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::Ellipse");
return gp_Elips2d();
throw Standard_NotImplemented("Adaptor2d_Curve2d::Ellipse");
}
@@ -304,8 +289,7 @@ gp_Elips2d Adaptor2d_Curve2d::Ellipse() const
gp_Hypr2d Adaptor2d_Curve2d::Hyperbola() const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::Hyperbola");
return gp_Hypr2d();
throw Standard_NotImplemented("Adaptor2d_Curve2d::Hyperbola");
}
@@ -316,8 +300,7 @@ gp_Hypr2d Adaptor2d_Curve2d::Hyperbola() const
gp_Parab2d Adaptor2d_Curve2d::Parabola() const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::Parabola");
return gp_Parab2d();
throw Standard_NotImplemented("Adaptor2d_Curve2d::Parabola");
}
@@ -328,8 +311,7 @@ gp_Parab2d Adaptor2d_Curve2d::Parabola() const
Standard_Integer Adaptor2d_Curve2d::Degree() const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::Degree");
return 0;
throw Standard_NotImplemented("Adaptor2d_Curve2d::Degree");
}
@@ -340,8 +322,7 @@ Standard_Integer Adaptor2d_Curve2d::Degree() const
Standard_Boolean Adaptor2d_Curve2d::IsRational() const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::IsRational");
return 0;
throw Standard_NotImplemented("Adaptor2d_Curve2d::IsRational");
}
@@ -352,8 +333,7 @@ Standard_Boolean Adaptor2d_Curve2d::IsRational() const
Standard_Integer Adaptor2d_Curve2d::NbPoles() const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::NbPole");
return 0;
throw Standard_NotImplemented("Adaptor2d_Curve2d::NbPole");
}
@@ -364,8 +344,7 @@ Standard_Integer Adaptor2d_Curve2d::NbPoles() const
Standard_Integer Adaptor2d_Curve2d::NbKnots() const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::NbKnots");
return 0;
throw Standard_NotImplemented("Adaptor2d_Curve2d::NbKnots");
}
@@ -376,8 +355,7 @@ Standard_Integer Adaptor2d_Curve2d::NbKnots() const
Handle(Geom2d_BezierCurve) Adaptor2d_Curve2d::Bezier() const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::Bezier");
return Handle(Geom2d_BezierCurve)();
throw Standard_NotImplemented("Adaptor2d_Curve2d::Bezier");
}
@@ -388,8 +366,7 @@ Handle(Geom2d_BezierCurve) Adaptor2d_Curve2d::Bezier() const
Handle(Geom2d_BSplineCurve) Adaptor2d_Curve2d::BSpline() const
{
Standard_NotImplemented::Raise("Adaptor2d_Curve2d::BSpline");
return Handle(Geom2d_BSplineCurve)();
throw Standard_NotImplemented("Adaptor2d_Curve2d::BSpline");
}
//=======================================================================

View File

@@ -173,8 +173,7 @@ Standard_Boolean Adaptor2d_Line2d::IsPeriodic() const
Standard_Real Adaptor2d_Line2d::Period() const
{
Standard_NoSuchObject::Raise();
return 0;
throw Standard_NoSuchObject();
}
//=======================================================================
@@ -238,7 +237,7 @@ void Adaptor2d_Line2d::D3(const Standard_Real X, gp_Pnt2d& P, gp_Vec2d& V1, gp_V
//gp_Vec2d Adaptor2d_Line2d::DN(const Standard_Real U, const Standard_Integer N) const
gp_Vec2d Adaptor2d_Line2d::DN(const Standard_Real , const Standard_Integer N) const
{
if (N<=0) {Standard_OutOfRange::Raise();}
if (N<=0) {throw Standard_OutOfRange();}
if (N==1) {
return myAx2d.Direction();
}
@@ -282,8 +281,7 @@ gp_Lin2d Adaptor2d_Line2d::Line() const
gp_Circ2d Adaptor2d_Line2d::Circle() const
{
Standard_NoSuchObject::Raise();
return gp_Circ2d();
throw Standard_NoSuchObject();
}
//=======================================================================
@@ -293,8 +291,7 @@ gp_Circ2d Adaptor2d_Line2d::Circle() const
gp_Elips2d Adaptor2d_Line2d::Ellipse() const
{
Standard_NoSuchObject::Raise();
return gp_Elips2d();
throw Standard_NoSuchObject();
}
//=======================================================================
@@ -304,8 +301,7 @@ gp_Elips2d Adaptor2d_Line2d::Ellipse() const
gp_Hypr2d Adaptor2d_Line2d::Hyperbola() const
{
Standard_NoSuchObject::Raise();
return gp_Hypr2d();
throw Standard_NoSuchObject();
}
//=======================================================================
@@ -315,8 +311,7 @@ gp_Hypr2d Adaptor2d_Line2d::Hyperbola() const
gp_Parab2d Adaptor2d_Line2d::Parabola() const
{
Standard_NoSuchObject::Raise();
return gp_Parab2d();
throw Standard_NoSuchObject();
}
//=======================================================================
@@ -326,8 +321,7 @@ gp_Parab2d Adaptor2d_Line2d::Parabola() const
Standard_Integer Adaptor2d_Line2d::Degree() const
{
Standard_NoSuchObject::Raise();
return 0 ;
throw Standard_NoSuchObject();
}
//=======================================================================
//function : IsRational
@@ -336,8 +330,7 @@ Standard_Integer Adaptor2d_Line2d::Degree() const
Standard_Boolean Adaptor2d_Line2d::IsRational() const
{
Standard_NoSuchObject::Raise();
return 0 ;
throw Standard_NoSuchObject();
}
//=======================================================================
//function : NbPoles
@@ -346,8 +339,7 @@ Standard_Boolean Adaptor2d_Line2d::IsRational() const
Standard_Integer Adaptor2d_Line2d::NbPoles() const
{
Standard_NoSuchObject::Raise();
return 0 ;
throw Standard_NoSuchObject();
}
//=======================================================================
//function : NbKnots
@@ -356,8 +348,7 @@ Standard_Integer Adaptor2d_Line2d::NbPoles() const
Standard_Integer Adaptor2d_Line2d::NbKnots() const
{
Standard_NoSuchObject::Raise();
return 0 ;
throw Standard_NoSuchObject();
}
//=======================================================================
//function : Bezier
@@ -366,9 +357,7 @@ Standard_Integer Adaptor2d_Line2d::NbKnots() const
Handle(Geom2d_BezierCurve) Adaptor2d_Line2d::Bezier() const
{
Standard_NoSuchObject::Raise();
Handle(Geom2d_BezierCurve) nul;
return nul;
throw Standard_NoSuchObject();
}
//=======================================================================
@@ -378,8 +367,6 @@ Handle(Geom2d_BezierCurve) Adaptor2d_Line2d::Bezier() const
Handle(Geom2d_BSplineCurve) Adaptor2d_Line2d::BSpline() const
{
Standard_NoSuchObject::Raise();
Handle(Geom2d_BSplineCurve) nul;
return nul;
throw Standard_NoSuchObject();
}

View File

@@ -145,7 +145,7 @@ GeomAbs_Shape Adaptor2d_OffsetCurve::Continuity() const
case GeomAbs_G1: return GeomAbs_C0;
case GeomAbs_C0:
// No Continuity !!
Standard_TypeMismatch::Raise("Adaptor2d_OffsetCurve::IntervalContinuity");
throw Standard_TypeMismatch("Adaptor2d_OffsetCurve::IntervalContinuity");
break;
}
@@ -309,8 +309,7 @@ gp_Pnt2d Adaptor2d_OffsetCurve::Value(const Standard_Real U) const
return gp_Pnt2d(P.XY()+myOffset*V.XY()/Norme);
}
else {
gp_VectorWithNullMagnitude::Raise("Adaptor2d_OffsetCurve::Value");
return gp_Pnt2d();
throw gp_VectorWithNullMagnitude("Adaptor2d_OffsetCurve::Value");
}
}
else {
@@ -351,7 +350,7 @@ void Adaptor2d_OffsetCurve::D1
(V2.XY()*V3.XY())/(Norme*Norme)));
}
else {
gp_VectorWithNullMagnitude::Raise("Adaptor2d_OffsetCurve::D1");
throw gp_VectorWithNullMagnitude("Adaptor2d_OffsetCurve::D1");
}
}
else {
@@ -392,7 +391,7 @@ void Adaptor2d_OffsetCurve::D2
D1( U,P,V1);
}
else {
gp_VectorWithNullMagnitude::Raise("Adaptor2d_OffsetCurve::D2");
throw gp_VectorWithNullMagnitude("Adaptor2d_OffsetCurve::D2");
}
}
else {
@@ -412,7 +411,7 @@ void Adaptor2d_OffsetCurve::D3
(const Standard_Real ,
gp_Pnt2d& , gp_Vec2d& , gp_Vec2d& , gp_Vec2d& ) const
{
Standard_NotImplemented::Raise("Adaptor2d_OffsetCurve::D3");
throw Standard_NotImplemented("Adaptor2d_OffsetCurve::D3");
}
//=======================================================================
@@ -424,8 +423,7 @@ gp_Vec2d Adaptor2d_OffsetCurve::DN
// (const Standard_Real T, const Standard_Integer N) const
(const Standard_Real , const Standard_Integer ) const
{
Standard_NotImplemented::Raise("Adaptor2d_OffsetCurve::DN");
return gp_Vec2d();
throw Standard_NotImplemented("Adaptor2d_OffsetCurve::DN");
}
@@ -480,8 +478,7 @@ gp_Lin2d Adaptor2d_OffsetCurve::Line() const
return gp_Lin2d(P,V);
}
else {
Standard_NoSuchObject::Raise("Adaptor2d_OffsetCurve::Line");
return gp_Lin2d();
throw Standard_NoSuchObject("Adaptor2d_OffsetCurve::Line");
}
}
@@ -516,15 +513,13 @@ gp_Circ2d Adaptor2d_OffsetCurve::Circle() const
return gp_Circ2d( axes,radius);
}
else { // Cercle de rayon Nul
Standard_NoSuchObject::Raise("Adaptor2d_OffsetCurve::Circle");
throw Standard_NoSuchObject("Adaptor2d_OffsetCurve::Circle");
}
}
}
else {
Standard_NoSuchObject::Raise("Adaptor2d_OffsetCurve::Circle");
throw Standard_NoSuchObject("Adaptor2d_OffsetCurve::Circle");
}
// portage WNT
return gp_Circ2d();
}
//=======================================================================
@@ -538,10 +533,8 @@ gp_Elips2d Adaptor2d_OffsetCurve::Ellipse() const
return myCurve->Ellipse();;
}
else {
Standard_NoSuchObject::Raise("Adaptor2d_OffsetCurve:Ellipse");
throw Standard_NoSuchObject("Adaptor2d_OffsetCurve:Ellipse");
}
// portage WNT
return gp_Elips2d();
}
//=======================================================================
@@ -555,10 +548,8 @@ gp_Hypr2d Adaptor2d_OffsetCurve::Hyperbola() const
return myCurve->Hyperbola();
}
else {
Standard_NoSuchObject::Raise("Adaptor2d_OffsetCurve:Hyperbola");
throw Standard_NoSuchObject("Adaptor2d_OffsetCurve:Hyperbola");
}
// portage WNT
return gp_Hypr2d();
}
//=======================================================================
@@ -572,10 +563,8 @@ gp_Parab2d Adaptor2d_OffsetCurve::Parabola() const
return myCurve->Parabola();
}
else {
Standard_NoSuchObject::Raise("Adaptor2d_OffsetCurve:Parabola");
throw Standard_NoSuchObject("Adaptor2d_OffsetCurve:Parabola");
}
// portage WNT
return gp_Parab2d();
}
//=======================================================================
//function : Degree
@@ -590,8 +579,7 @@ Standard_Integer Adaptor2d_OffsetCurve::Degree() const
return myCurve->Degree();
}
else {
Standard_NoSuchObject::Raise("Adaptor2d_OffsetCurve::Degree");
return 0;
throw Standard_NoSuchObject("Adaptor2d_OffsetCurve::Degree");
}
}
//=======================================================================
@@ -619,8 +607,7 @@ Standard_Integer Adaptor2d_OffsetCurve::NbPoles() const
return myCurve->NbPoles();
}
else {
Standard_NoSuchObject::Raise("Adaptor2d_OffsetCurve::NbPoles");
return 0;
throw Standard_NoSuchObject("Adaptor2d_OffsetCurve::NbPoles");
}
}
@@ -635,8 +622,7 @@ Standard_Integer Adaptor2d_OffsetCurve::NbKnots() const
return myCurve->NbKnots();
}
else {
Standard_NoSuchObject::Raise("Adaptor2d_OffsetCurve::NbKnots");
return 0;
throw Standard_NoSuchObject("Adaptor2d_OffsetCurve::NbKnots");
}
}