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

40
src/FilletSurf/FilletSurf_Builder.cxx
View File

@@ -98,8 +98,7 @@ FilletSurf_ErrorTypeStatus FilletSurf_Builder::StatusError() const
Standard_Integer FilletSurf_Builder::NbSurface() const
{
if (IsDone()!=FilletSurf_IsNotOk) return myIntBuild.NbSurface();
StdFail_NotDone::Raise("FilletSurf_Builder::NbSurface");
return 0;
throw StdFail_NotDone("FilletSurf_Builder::NbSurface");
}
//=======================================================================
@@ -109,7 +108,7 @@ Standard_Integer FilletSurf_Builder::NbSurface() const
const Handle(Geom_Surface)& FilletSurf_Builder::SurfaceFillet(const Standard_Integer Index) const
{
if ( (Index<1)||(Index>NbSurface())) Standard_OutOfRange::Raise("FilletSurf_Builder::SurfaceFillet");
if ( (Index<1)||(Index>NbSurface())) throw Standard_OutOfRange("FilletSurf_Builder::SurfaceFillet");
return myIntBuild.SurfaceFillet(Index);
}
@@ -120,7 +119,7 @@ const Handle(Geom_Surface)& FilletSurf_Builder::SurfaceFillet(const Standard_Int
Standard_Real FilletSurf_Builder::TolApp3d(const Standard_Integer Index) const
{
if ( (Index<1)||(Index>NbSurface()))
Standard_OutOfRange::Raise("FilletSurf_Builder::TolApp3d");
throw Standard_OutOfRange("FilletSurf_Builder::TolApp3d");
return myIntBuild.TolApp3d(Index);
}
@@ -131,7 +130,7 @@ Standard_Real FilletSurf_Builder::TolApp3d(const Standard_Integer Index) const
const TopoDS_Face& FilletSurf_Builder::SupportFace1(const Standard_Integer Index) const
{
if ( (Index<1)||(Index>NbSurface()))
Standard_OutOfRange::Raise("FilletSurf_Builder::SupportFace1");
throw Standard_OutOfRange("FilletSurf_Builder::SupportFace1");
return myIntBuild.SupportFace1(Index);
}
@@ -142,7 +141,7 @@ const TopoDS_Face& FilletSurf_Builder::SupportFace1(const Standard_Integer Index
const TopoDS_Face& FilletSurf_Builder::SupportFace2(const Standard_Integer Index) const
{
if ( (Index<1)||(Index>NbSurface()))
Standard_OutOfRange::Raise("FilletSurf_Builder::SupportFace2");
throw Standard_OutOfRange("FilletSurf_Builder::SupportFace2");
return myIntBuild.SupportFace2(Index);
}
@@ -154,7 +153,7 @@ const TopoDS_Face& FilletSurf_Builder::SupportFace2(const Standard_Integer Index
const Handle(Geom_Curve)& FilletSurf_Builder::CurveOnFace1(const Standard_Integer Index) const
{
if ( (Index<1)||(Index>NbSurface()))
Standard_OutOfRange::Raise("FilletSurf_Builder::CurveOnFace1");
throw Standard_OutOfRange("FilletSurf_Builder::CurveOnFace1");
return myIntBuild.CurveOnFace1(Index);
}
@@ -165,7 +164,7 @@ const Handle(Geom_Curve)& FilletSurf_Builder::CurveOnFace1(const Standard_Intege
const Handle(Geom_Curve)& FilletSurf_Builder::CurveOnFace2(const Standard_Integer Index) const
{
if ( (Index<1)||(Index>NbSurface()))
Standard_OutOfRange::Raise("FilletSurf_Builder::CurveOnFace2");
throw Standard_OutOfRange("FilletSurf_Builder::CurveOnFace2");
return myIntBuild.CurveOnFace2(Index);
}
@@ -176,7 +175,7 @@ const Handle(Geom_Curve)& FilletSurf_Builder::CurveOnFace2(const Standard_Intege
const Handle(Geom2d_Curve)& FilletSurf_Builder::PCurveOnFace1(const Standard_Integer Index) const
{
if ( (Index<1)||(Index>NbSurface()))
Standard_OutOfRange::Raise( "FilletSurf_Builder::PCurveOnFace1");
throw Standard_OutOfRange( "FilletSurf_Builder::PCurveOnFace1");
return myIntBuild.PCurveOnFace1(Index);
}
@@ -187,7 +186,7 @@ const Handle(Geom2d_Curve)& FilletSurf_Builder::PCurveOnFace1(const Standard_Int
const Handle(Geom2d_Curve)& FilletSurf_Builder::PCurve1OnFillet(const Standard_Integer Index) const
{
if ( (Index<1)||(Index>NbSurface()))
Standard_OutOfRange::Raise("FilletSurf_Builder::PCurve1OnFillet");
throw Standard_OutOfRange("FilletSurf_Builder::PCurve1OnFillet");
return myIntBuild.PCurve1OnFillet(Index);
}
@@ -198,7 +197,7 @@ const Handle(Geom2d_Curve)& FilletSurf_Builder::PCurve1OnFillet(const Standard_I
const Handle(Geom2d_Curve)& FilletSurf_Builder::PCurveOnFace2(const Standard_Integer Index) const
{
if ( (Index<1)||(Index>NbSurface()))
Standard_OutOfRange::Raise("FilletSurf_Builder::PCurveOnFace2");
throw Standard_OutOfRange("FilletSurf_Builder::PCurveOnFace2");
return myIntBuild.PCurveOnFace2(Index);
}
@@ -209,7 +208,7 @@ const Handle(Geom2d_Curve)& FilletSurf_Builder::PCurveOnFace2(const Standard_Int
const Handle(Geom2d_Curve)& FilletSurf_Builder::PCurve2OnFillet(const Standard_Integer Index) const
{
if ( (Index<1)||(Index>NbSurface()))
Standard_OutOfRange::Raise("FilletSurf_Builder::PCurve2OnFillet");
throw Standard_OutOfRange("FilletSurf_Builder::PCurve2OnFillet");
return myIntBuild.PCurve2OnFillet(Index);
}
@@ -220,7 +219,7 @@ const Handle(Geom2d_Curve)& FilletSurf_Builder::PCurve2OnFillet(const Standard_I
Standard_Real FilletSurf_Builder::FirstParameter() const
{
if (IsDone()==FilletSurf_IsNotOk)
StdFail_NotDone::Raise("FilletSurf_Builder::FirstParameter");
throw StdFail_NotDone("FilletSurf_Builder::FirstParameter");
return myIntBuild.FirstParameter();
}
@@ -231,7 +230,7 @@ Standard_Real FilletSurf_Builder::FirstParameter() const
Standard_Real FilletSurf_Builder::LastParameter() const
{
if (IsDone()==FilletSurf_IsNotOk)
StdFail_NotDone::Raise("FilletSurf_Builder::LastParameter");
throw StdFail_NotDone("FilletSurf_Builder::LastParameter");
return myIntBuild.LastParameter();
}
@@ -248,7 +247,7 @@ Standard_Real FilletSurf_Builder::LastParameter() const
FilletSurf_StatusType FilletSurf_Builder::StartSectionStatus() const
{
if (IsDone()==FilletSurf_IsNotOk)
StdFail_NotDone::Raise("FilletSurf_Builder::StartSectionStatus" );
throw StdFail_NotDone("FilletSurf_Builder::StartSectionStatus" );
return myIntBuild.StartSectionStatus();
}
@@ -265,7 +264,7 @@ FilletSurf_StatusType FilletSurf_Builder::StartSectionStatus() const
FilletSurf_StatusType FilletSurf_Builder::EndSectionStatus() const
{
if (IsDone()==FilletSurf_IsNotOk)
StdFail_NotDone::Raise("FilletSurf_Builder::StartSectionStatus");
throw StdFail_NotDone("FilletSurf_Builder::StartSectionStatus");
return myIntBuild.EndSectionStatus();
}
@@ -291,9 +290,8 @@ void FilletSurf_Builder::Simulate()
Standard_Integer FilletSurf_Builder::NbSection(const Standard_Integer IndexSurf) const
{
if (IsDone()==FilletSurf_IsNotOk)
StdFail_NotDone::Raise("FilletSurf_Builder::NbSection)");
else if ( (IndexSurf<1)||(IndexSurf>NbSurface())) Standard_OutOfRange::Raise
("FilletSurf_Builder::NbSection");
throw StdFail_NotDone("FilletSurf_Builder::NbSection)");
else if ( (IndexSurf<1)||(IndexSurf>NbSurface())) throw Standard_OutOfRange("FilletSurf_Builder::NbSection");
return myIntBuild.NbSection(IndexSurf);
}
@@ -308,10 +306,10 @@ void FilletSurf_Builder::Section(const Standard_Integer IndexSurf,
Handle(Geom_TrimmedCurve)& Circ) const
{
if ((IndexSurf<1)||(IndexSurf>NbSurface()))
Standard_OutOfRange::Raise("FilletSurf_Builder::Section NbSurface");
throw Standard_OutOfRange("FilletSurf_Builder::Section NbSurface");
else if ((IndexSec<1)||(IndexSec>NbSection(IndexSurf)))
Standard_OutOfRange::Raise("FilletSurf_Builder::Section NbSection");
throw Standard_OutOfRange("FilletSurf_Builder::Section NbSection");
else myIntBuild.Section(IndexSurf, IndexSec,Circ);
}

14
src/FilletSurf/FilletSurf_InternalBuilder.cxx
View File

@@ -325,12 +325,10 @@ Standard_Boolean
{
Handle(ChFiDS_SurfData) Data = SeqData(1);
Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine);
if(fsp.IsNull()) Standard_ConstructionError::Raise
("PerformSurf : this is not the spine of a fillet");
if(fsp.IsNull()) throw Standard_ConstructionError("PerformSurf : this is not the spine of a fillet");
Handle(BRepBlend_Line) lin;
TopAbs_Orientation Or = S1->ChangeSurface().Face().Orientation();
if(!fsp->IsConstant()) Standard_ConstructionError::Raise
("PerformSurf : no variable radiuses");
if(!fsp->IsConstant()) throw Standard_ConstructionError("PerformSurf : no variable radiuses");
// Standard_Boolean maybesingular; //pour scinder les Surfdata singulieres
BRepBlend_ConstRad Func(S1,S2,Guide);
@@ -370,7 +368,7 @@ Standard_Boolean
Standard_False, Data->ChangeVertexLastOnS2(), tolesp);
}
done = CompleteData(Data,Func,lin,S1,S2,Or,0,0,0,0);
if(!done) Standard_Failure::Raise("PerformSurf : Failed approximation!");
if(!done) throw Standard_Failure("PerformSurf : Failed approximation!");
// maybesingular = (Func.GetMinimalDistance()<=100*tolapp3d);
Standard_Boolean ok = Standard_False;
if(!Forward){
@@ -414,17 +412,17 @@ Standard_Boolean
void FilletSurf_InternalBuilder::PerformSurf (ChFiDS_SequenceOfSurfData& , const Handle(ChFiDS_HElSpine)& , const Handle(ChFiDS_Spine)& , const Standard_Integer , const Handle(BRepAdaptor_HSurface)& , const Handle(Adaptor3d_TopolTool)& , const Handle(BRepAdaptor_HCurve2d)& , const Handle(BRepAdaptor_HSurface)& , const Handle(BRepAdaptor_HCurve2d)& , Standard_Boolean& , const Handle(BRepAdaptor_HSurface)& , const Handle(Adaptor3d_TopolTool)& , const TopAbs_Orientation , const Standard_Real , const Standard_Real , const Standard_Real , Standard_Real& , Standard_Real& , const Standard_Boolean , const Standard_Boolean , const Standard_Boolean , const Standard_Boolean , const Standard_Boolean , const Standard_Boolean , const math_Vector& )
{
Standard_DomainError::Raise("BlendFunc_CSConstRad::Section : Not implemented");
throw Standard_DomainError("BlendFunc_CSConstRad::Section : Not implemented");
}
void FilletSurf_InternalBuilder::PerformSurf (ChFiDS_SequenceOfSurfData& , const Handle(ChFiDS_HElSpine)& , const Handle(ChFiDS_Spine)& , const Standard_Integer , const Handle(BRepAdaptor_HSurface)& , const Handle(Adaptor3d_TopolTool)& , const TopAbs_Orientation , const Handle(BRepAdaptor_HSurface)& , const Handle(Adaptor3d_TopolTool)& , const Handle(BRepAdaptor_HCurve2d)& , const Handle(BRepAdaptor_HSurface)& , const Handle(BRepAdaptor_HCurve2d)& , Standard_Boolean& , const Standard_Real , const Standard_Real , const Standard_Real , Standard_Real& , Standard_Real& , const Standard_Boolean , const Standard_Boolean , const Standard_Boolean , const Standard_Boolean , const Standard_Boolean , const Standard_Boolean , const math_Vector& )
{
Standard_DomainError::Raise("BlendFunc_CSConstRad::Section : Not implemented");
throw Standard_DomainError("BlendFunc_CSConstRad::Section : Not implemented");
}
void FilletSurf_InternalBuilder::PerformSurf (ChFiDS_SequenceOfSurfData& , const Handle(ChFiDS_HElSpine)& , const Handle(ChFiDS_Spine)& , const Standard_Integer , const Handle(BRepAdaptor_HSurface)& , const Handle(Adaptor3d_TopolTool)& , const Handle(BRepAdaptor_HCurve2d)& , const Handle(BRepAdaptor_HSurface)& , const Handle(BRepAdaptor_HCurve2d)& , Standard_Boolean& , const TopAbs_Orientation , const Handle(BRepAdaptor_HSurface)& , const Handle(Adaptor3d_TopolTool)& , const Handle(BRepAdaptor_HCurve2d)& , const Handle(BRepAdaptor_HSurface)& , const Handle(BRepAdaptor_HCurve2d)& , Standard_Boolean& , const TopAbs_Orientation , const Standard_Real , const Standard_Real , const Standard_Real , Standard_Real& , Standard_Real& , const Standard_Boolean , const Standard_Boolean , const Standard_Boolean , const Standard_Boolean , const Standard_Boolean , const Standard_Boolean , const Standard_Boolean , const math_Vector& )
{
Standard_DomainError::Raise("BlendFunc_CSConstRad::Section : Not implemented");
throw Standard_DomainError("BlendFunc_CSConstRad::Section : Not implemented");
}
Standard_Boolean FilletSurf_InternalBuilder::Done() const