mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-19 13:40:49 +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:
@@ -52,7 +52,7 @@ Handle(Standard_Transient) Plugin::Load (const Standard_GUID& aGUID,
|
||||
aMsg << theResource.ToCString() << endl;
|
||||
if (theVerbose)
|
||||
cout << "could not find the resource:" << theResource.ToCString() << endl;
|
||||
Plugin_Failure::Raise(aMsg);
|
||||
throw Plugin_Failure(aMsg.str().c_str());
|
||||
}
|
||||
|
||||
TCollection_AsciiString thePluginLibrary("");
|
||||
@@ -78,7 +78,7 @@ Handle(Standard_Transient) Plugin::Load (const Standard_GUID& aGUID,
|
||||
aMsg << error.ToCString();
|
||||
if (theVerbose)
|
||||
cout << "could not open: " << PluginResource->Value(theResource.ToCString())<< " ; reason: "<< error.ToCString() << endl;
|
||||
Plugin_Failure::Raise(aMsg);
|
||||
throw Plugin_Failure(aMsg.str().c_str());
|
||||
}
|
||||
f = theSharedLibrary.DlSymb("PLUGINFACTORY");
|
||||
if( f == NULL ) {
|
||||
@@ -86,7 +86,7 @@ Handle(Standard_Transient) Plugin::Load (const Standard_GUID& aGUID,
|
||||
Standard_SStream aMsg; aMsg << "could not find the factory in:";
|
||||
aMsg << PluginResource->Value(theResource.ToCString());
|
||||
aMsg << error.ToCString();
|
||||
Plugin_Failure::Raise(aMsg);
|
||||
throw Plugin_Failure(aMsg.str().c_str());
|
||||
}
|
||||
theMapOfFunctions.Bind(pid,f);
|
||||
}
|
||||
|
@@ -27,7 +27,7 @@ DEFINE_STANDARD_HANDLE(Plugin_Failure, Standard_Failure)
|
||||
|
||||
#if !defined No_Exception && !defined No_Plugin_Failure
|
||||
#define Plugin_Failure_Raise_if(CONDITION, MESSAGE) \
|
||||
if (CONDITION) Plugin_Failure::Raise(MESSAGE);
|
||||
if (CONDITION) throw Plugin_Failure(MESSAGE);
|
||||
#else
|
||||
#define Plugin_Failure_Raise_if(CONDITION, MESSAGE)
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user