OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +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

30
src/GeomConvert/GeomConvert.cxx
View File

@@ -121,10 +121,10 @@ Handle(Geom_BSplineCurve) GeomConvert::SplitBSplineCurve
{
Standard_Integer TheFirst = C->FirstUKnotIndex ();
Standard_Integer TheLast = C->LastUKnotIndex ();
if (FromK1 == ToK2) Standard_DomainError::Raise();
if (FromK1 == ToK2) throw Standard_DomainError();
Standard_Integer FirstK = Min (FromK1, ToK2);
Standard_Integer LastK = Max (FromK1, ToK2);
if (FirstK < TheFirst || LastK > TheLast) Standard_DomainError::Raise();
if (FirstK < TheFirst || LastK > TheLast) throw Standard_DomainError();
Handle(Geom_BSplineCurve) C1
= Handle(Geom_BSplineCurve)::DownCast(C->Copy ());
@@ -378,9 +378,9 @@ Handle(Geom_BSplineCurve) GeomConvert::CurveToBSplineCurve
MaxSegments, MaxDegree);
if (ApprCOffs.HasResult())
TheCurve = ApprCOffs.Curve();
else Standard_ConstructionError::Raise();
else throw Standard_ConstructionError();
}
else { Standard_DomainError::Raise("No such curve"); }
else { throw Standard_DomainError("No such curve"); }
}
else {
@@ -390,7 +390,7 @@ Handle(Geom_BSplineCurve) GeomConvert::CurveToBSplineCurve
TheConic->MajorRadius(), TheConic->MinorRadius());
/* if (Parameterisation == Convert_TgtThetaOver2_1 ||
Parameterisation == Convert_TgtThetaOver2_2) {
Standard_DomainError::Raise(); }
throw Standard_DomainError(); }
else if ( Parameterisation == Convert_QuasiAngular) {
Convert_EllipseToBSplineCurve Convert (E2d,
@@ -414,7 +414,7 @@ Handle(Geom_BSplineCurve) GeomConvert::CurveToBSplineCurve
gp_Circ2d C2d (gp::OX2d(), TheConic->Radius());
/* if (Parameterisation == Convert_TgtThetaOver2_1 ||
Parameterisation == Convert_TgtThetaOver2_2) {
Standard_DomainError::Raise(); }
throw Standard_DomainError(); }
else if ( Parameterisation == Convert_QuasiAngular) {
Convert_CircleToBSplineCurve Convert (C2d,
@@ -467,9 +467,9 @@ Handle(Geom_BSplineCurve) GeomConvert::CurveToBSplineCurve
MaxSegments, MaxDegree);
if (ApprCOffs.HasResult())
TheCurve = ApprCOffs.Curve();
else Standard_ConstructionError::Raise();
else throw Standard_ConstructionError();
}
else { Standard_DomainError::Raise("No such curve"); }
else { throw Standard_DomainError("No such curve"); }
}
return TheCurve;
@@ -816,7 +816,7 @@ private:
PreLast,First,
Standard_True,Standard_True);
if (Cont<GeomAbs_C0)
Standard_ConstructionError::Raise("GeomConvert curves not C0") ;
throw Standard_ConstructionError("GeomConvert curves not C0") ;
else{
if (Cont>=GeomAbs_G1)
tabG1(i-1)=Standard_True; //True=G1 continuity
@@ -941,7 +941,7 @@ private:
fusion=C.Add(Curve1,
local_tolerance(j-1)); //merge of two consecutive curves
if (fusion==Standard_False)
Standard_ConstructionError::Raise("GeomConvert Concatenation Error") ;
throw Standard_ConstructionError("GeomConvert Concatenation Error") ;
Curve2=C.BSplineCurve();
}
Curve2->SetPeriodic();
@@ -967,7 +967,7 @@ private:
GeomConvert_CompCurveToBSplineCurve C (ArrayOfConcatenated->Value(i));
fusion=C.Add(Curve1,ArrayOfToler(j-1)); //merge of two consecutive curves
if (fusion==Standard_False)
Standard_ConstructionError::Raise("GeomConvert Concatenation Error") ;
throw Standard_ConstructionError("GeomConvert Concatenation Error") ;
ArrayOfConcatenated->SetValue(i,C.BSplineCurve());
}
}
@@ -1040,7 +1040,7 @@ void GeomConvert::ConcatC1(TColGeom_Array1OfBSplineCurve& ArrayOfCurv
local_tolerance(i-1),
AngularTolerance);
if (Cont<GeomAbs_C0)
Standard_ConstructionError::Raise("GeomConvert curves not C0");
throw Standard_ConstructionError("GeomConvert curves not C0");
else{
if (Cont>=GeomAbs_G1)
tabG1(i-1)=Standard_True; //True=G1 continuity
@@ -1176,7 +1176,7 @@ void GeomConvert::ConcatC1(TColGeom_Array1OfBSplineCurve& ArrayOfCurv
fusion=C.Add(Curve1,
local_tolerance(j-1)); //merge of two consecutive curves
if (fusion==Standard_False)
Standard_ConstructionError::Raise("GeomConvert Concatenation Error") ;
throw Standard_ConstructionError("GeomConvert Concatenation Error") ;
Curve2=C.BSplineCurve();
}
}
@@ -1221,7 +1221,7 @@ void GeomConvert::ConcatC1(TColGeom_Array1OfBSplineCurve& ArrayOfCurv
GeomConvert_CompCurveToBSplineCurve C (ArrayOfConcatenated->Value(i));
fusion=C.Add(Curve1, local_tolerance(j-1), Standard_True);
if (fusion==Standard_False)
Standard_ConstructionError::Raise("GeomConvert Concatenation Error");
throw Standard_ConstructionError("GeomConvert Concatenation Error");
ArrayOfConcatenated->SetValue(i,C.BSplineCurve());
}
}
@@ -1252,7 +1252,7 @@ void GeomConvert::C0BSplineToC1BSplineCurve(Handle(Geom_BSplineCurve)& BS,
for (i=1;i<ArrayOfConcatenated->Length();i++){
fusion=C.Add(ArrayOfConcatenated->Value(i),tolerance);
if (fusion==Standard_False)
Standard_ConstructionError::Raise("GeomConvert Concatenation Error") ;
throw Standard_ConstructionError("GeomConvert Concatenation Error") ;
}
}
BS=C.BSplineCurve();

14
src/GeomConvert/GeomConvert_1.cxx
View File

@@ -132,13 +132,13 @@ Handle(Geom_BSplineSurface) GeomConvert::SplitBSplineSurface
Standard_Integer FirstV = S->FirstVKnotIndex ();
Standard_Integer LastU = S->LastUKnotIndex ();
Standard_Integer LastV = S->LastVKnotIndex ();
if (FromUK1 == ToUK2 || FromVK1 == ToVK2) Standard_DomainError::Raise();
if (FromUK1 == ToUK2 || FromVK1 == ToVK2) throw Standard_DomainError();
Standard_Integer FirstUK = Min (FromUK1, ToUK2);
Standard_Integer LastUK = Max (FromUK1, ToUK2);
Standard_Integer FirstVK = Min (FromVK1, ToVK2);
Standard_Integer LastVK = Max (FromVK1, ToVK2);
if (FirstUK < FirstU || LastUK > LastU ||
FirstVK < FirstV || LastVK > LastV) { Standard_DomainError::Raise(); }
FirstVK < FirstV || LastVK > LastV) { throw Standard_DomainError(); }
Handle(Geom_BSplineSurface) S1= Handle(Geom_BSplineSurface)::DownCast(S->Copy());
@@ -173,7 +173,7 @@ Handle(Geom_BSplineSurface) GeomConvert::SplitBSplineSurface
const Standard_Boolean USplit,
const Standard_Boolean SameOrientation )
{
if (FromK1 == ToK2) Standard_DomainError::Raise();
if (FromK1 == ToK2) throw Standard_DomainError();
Handle(Geom_BSplineSurface) S1 = Handle(Geom_BSplineSurface)::DownCast(S->Copy());
@@ -184,7 +184,7 @@ Handle(Geom_BSplineSurface) GeomConvert::SplitBSplineSurface
Standard_Integer LastU = S->LastUKnotIndex ();
Standard_Integer FirstUK = Min (FromK1, ToK2);
Standard_Integer LastUK = Max (FromK1, ToK2);
if (FirstUK < FirstU || LastUK > LastU) Standard_DomainError::Raise();
if (FirstUK < FirstU || LastUK > LastU) throw Standard_DomainError();
S1->Segment( S1->UKnot(FirstUK),
S1->UKnot(LastUK),
@@ -205,7 +205,7 @@ Handle(Geom_BSplineSurface) GeomConvert::SplitBSplineSurface
Standard_Integer LastV = S->LastVKnotIndex ();
Standard_Integer FirstVK = Min (FromK1, ToK2);
Standard_Integer LastVK = Max (FromK1, ToK2);
if (FirstVK < FirstV || LastVK > LastV) Standard_DomainError::Raise();
if (FirstVK < FirstV || LastVK > LastV) throw Standard_DomainError();
S1->Segment( S1->UKnot(S1->FirstUKnotIndex()),
S1->UKnot(S1->LastUKnotIndex()),
@@ -280,7 +280,7 @@ Handle(Geom_BSplineSurface) GeomConvert::SplitBSplineSurface
const Standard_Boolean SameOrientation )
{
if (Abs (FromParam1 - ToParam2) <= Abs(ParametricTolerance)) {
Standard_DomainError::Raise();
throw Standard_DomainError();
}
Handle(Geom_BSplineSurface) NewSurface
= Handle(Geom_BSplineSurface)::DownCast(S->Copy());
@@ -341,7 +341,7 @@ Handle(Geom_BSplineSurface) GeomConvert::SurfaceToBSplineSurface
Precision::IsPositiveInfinite(ULast) ||
Precision::IsNegativeInfinite(VFirst) ||
Precision::IsPositiveInfinite(VLast) ) {
Standard_DomainError::Raise("");
throw Standard_DomainError("");
}
Handle(Geom_BSplineSurface) TheSurface;

2
src/GeomConvert/GeomConvert_BSplineCurveKnotSplitting.cxx
View File

@@ -32,7 +32,7 @@ const Standard_Integer ContinuityRange
) {
if (ContinuityRange < 0) Standard_RangeError::Raise();
if (ContinuityRange < 0) throw Standard_RangeError();
Standard_Integer FirstIndex = BasisCurve->FirstUKnotIndex();
Standard_Integer LastIndex = BasisCurve->LastUKnotIndex();

4
src/GeomConvert/GeomConvert_BSplineCurveToBezierCurve.cxx
View File

@@ -53,7 +53,7 @@ GeomConvert_BSplineCurveToBezierCurve::GeomConvert_BSplineCurveToBezierCurve
const Standard_Real ParametricTolerance)
{
if (U2 - U1 < ParametricTolerance)
Standard_DomainError::Raise("GeomConvert_BSplineCurveToBezierSurface");
throw Standard_DomainError("GeomConvert_BSplineCurveToBezierSurface");
Standard_Real Uf = U1, Ul = U2;
Standard_Real PTol = ParametricTolerance/2 ;
@@ -87,7 +87,7 @@ Handle(Geom_BezierCurve) GeomConvert_BSplineCurveToBezierCurve::Arc
(const Standard_Integer Index)
{
if ( Index < 1 || Index > myCurve->NbKnots()-1) {
Standard_OutOfRange::Raise("GeomConvert_BSplineCurveToBezierCurve");
throw Standard_OutOfRange("GeomConvert_BSplineCurveToBezierCurve");
}
Standard_Integer Deg = myCurve->Degree();

2
src/GeomConvert/GeomConvert_BSplineSurfaceKnotSplitting.cxx
View File

@@ -35,7 +35,7 @@ const Standard_Integer VContinuityRange
if (UContinuityRange < 0 || VContinuityRange < 0) {
Standard_RangeError::Raise();
throw Standard_RangeError();
}
Standard_Integer FirstUIndex = BasisSurface->FirstUKnotIndex ();

4
src/GeomConvert/GeomConvert_BSplineSurfaceToBezierSurface.cxx
View File

@@ -58,7 +58,7 @@ GeomConvert_BSplineSurfaceToBezierSurface::GeomConvert_BSplineSurfaceToBezierSur
{
if ( (U2 - U1 < ParametricTolerance) ||
(V2 - V1 < ParametricTolerance) )
Standard_DomainError::Raise("GeomConvert_BSplineSurfaceToBezierSurface");
throw Standard_DomainError("GeomConvert_BSplineSurfaceToBezierSurface");
Standard_Real Uf=U1, Ul=U2, Vf=V1, Vl=V2, PTol = ParametricTolerance/2;
Standard_Integer I1, I2;
@@ -106,7 +106,7 @@ Handle(Geom_BezierSurface) GeomConvert_BSplineSurfaceToBezierSurface::Patch
{
if (UIndex < 1 || UIndex > mySurface->NbUKnots()-1 ||
VIndex < 1 || VIndex > mySurface->NbVKnots()-1 ) {
Standard_OutOfRange::Raise("GeomConvert_BSplineSurfaceToBezierSurface");
throw Standard_OutOfRange("GeomConvert_BSplineSurfaceToBezierSurface");
}
Standard_Integer UDeg = mySurface->UDegree();
Standard_Integer VDeg = mySurface->VDegree();

4
src/GeomConvert/GeomConvert_CompBezierSurfacesToBSplineSurface.cxx
View File

@@ -255,7 +255,7 @@ GeomConvert_CompBezierSurfacesToBSplineSurface(
decu = 3;
break;
default:
Standard_ConstructionError::Raise(
throw Standard_ConstructionError(
"GeomConvert_CompBezierSurfacesToBSpl:: UContinuity error");
}
@@ -273,7 +273,7 @@ GeomConvert_CompBezierSurfacesToBSplineSurface(
decv = 3;
break;
default:
Standard_ConstructionError::Raise(
throw Standard_ConstructionError(
"GeomConvert_CompBezierSurfacesToBSpl:: VContinuity error");
}