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

5
src/BRepLib/BRepLib.cxx
View File

@@ -1959,12 +1959,13 @@ static void EncodeRegularity(const TopoDS_Shape& theShape,
BRepLib::EncodeRegularity(E, F1, F2, theTolAng);
}
}
catch (Standard_Failure) {
catch (Standard_Failure const& anException) {
#ifdef OCCT_DEBUG
cout << "Warning: Exception in BRepLib::EncodeRegularity(): ";
Standard_Failure::Caught()->Print(cout);
anException.Print(cout);
cout << endl;
#endif
(void)anException;
}
}

2
src/BRepLib/BRepLib_Command.cxx
View File

@@ -49,7 +49,7 @@ Standard_Boolean BRepLib_Command::IsDone()const
void BRepLib_Command::Check()const
{
if (!myDone)
StdFail_NotDone::Raise("BRep_API: command not done");
throw StdFail_NotDone("BRep_API: command not done");
}

14
src/BRepLib/BRepLib_FuseEdges.cxx
View File

@@ -187,7 +187,7 @@ static void MakeClosedCurve(Handle(Geom_Curve)& C, const gp_Pnt& PF,
porig = aPrj.Point().Parameter();
}
else {
Standard_ConstructionError::Raise("FuseEdges : Projection failed for closed curve");
throw Standard_ConstructionError("FuseEdges : Projection failed for closed curve");
}
}
@@ -217,7 +217,7 @@ BRepLib_FuseEdges::BRepLib_FuseEdges(const TopoDS_Shape& theShape,
myResultEdgesDone(Standard_False),myNbConnexEdge(0), myConcatBSpl(Standard_False)
{
// if (theShape.ShapeType() != TopAbs_SHELL && theShape.ShapeType() != TopAbs_SOLID)
// Standard_ConstructionError::Raise("FuseEdges");
// throw Standard_ConstructionError("FuseEdges");
Standard_NullObject_Raise_if(theShape.IsNull(),"FuseEdges");
myMapFaces.Clear();
@@ -471,7 +471,7 @@ void BRepLib_FuseEdges::BuildListResultEdges()
aTC = new Geom_TrimmedCurve(aC, f, l);
if (!Concat.Add(aTC, Precision::Confusion())) {
// cannot merge curves
Standard_ConstructionError::Raise("FuseEdges : Concatenation failed");
throw Standard_ConstructionError("FuseEdges : Concatenation failed");
}
}
C = Concat.BSplineCurve();
@@ -490,7 +490,7 @@ void BRepLib_FuseEdges::BuildListResultEdges()
gp_Pnt aPf = C->Value(f);
gp_Pnt aPl = C->Value(l);
if(aPf.Distance(aPl) > Precision::Confusion()) {
Standard_ConstructionError::Raise("FuseEdges : Curve must be closed");
throw Standard_ConstructionError("FuseEdges : Curve must be closed");
}
gp_Pnt PF = BRep_Tool::Pnt(VF);
if(PF.Distance(aPf) > Precision::Confusion()) {
@@ -499,7 +499,7 @@ void BRepLib_FuseEdges::BuildListResultEdges()
//
ME.Init(C, VF, VL, f, l);
if (!ME.IsDone()) {
Standard_ConstructionError::Raise("FuseEdges : MakeEdge failed for closed curve");
throw Standard_ConstructionError("FuseEdges : MakeEdge failed for closed curve");
}
}
else {
@@ -521,10 +521,10 @@ void BRepLib_FuseEdges::BuildListResultEdges()
ME.Init(ExtC,VF,VL);
if (!ME.IsDone())
Standard_ConstructionError::Raise("FuseEdges : Fusion failed");
throw Standard_ConstructionError("FuseEdges : Fusion failed");
}
else
Standard_ConstructionError::Raise("FuseEdges : Fusion failed");
throw Standard_ConstructionError("FuseEdges : Fusion failed");
}
NewEdge = ME.Edge();