mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-29 14:00: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:
@@ -352,7 +352,7 @@ Standard_Integer Resource_Manager::Integer(const Standard_CString aResourceName)
|
||||
TCollection_AsciiString n("Value of resource `");
|
||||
n+= aResourceName;
|
||||
n+= "` is not an integer";
|
||||
Standard_TypeMismatch::Raise(n.ToCString());
|
||||
throw Standard_TypeMismatch(n.ToCString());
|
||||
}
|
||||
return Result.IntegerValue();
|
||||
}
|
||||
@@ -369,7 +369,7 @@ Standard_Real Resource_Manager::Real(const Standard_CString aResourceName) cons
|
||||
TCollection_AsciiString n("Value of resource `");
|
||||
n+= aResourceName;
|
||||
n+= "` is not a real";
|
||||
Standard_TypeMismatch::Raise(n.ToCString());
|
||||
throw Standard_TypeMismatch(n.ToCString());
|
||||
}
|
||||
return Result.RealValue();
|
||||
}
|
||||
@@ -386,8 +386,7 @@ Standard_CString Resource_Manager::Value(const Standard_CString aResource) const
|
||||
return myUserMap(Resource).ToCString();
|
||||
if (myRefMap.IsBound(Resource))
|
||||
return myRefMap(Resource).ToCString();
|
||||
Resource_NoSuchResource::Raise(aResource);
|
||||
return ("");
|
||||
throw Resource_NoSuchResource(aResource);
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
|
@@ -27,7 +27,7 @@ DEFINE_STANDARD_HANDLE(Resource_NoSuchResource, Standard_NoSuchObject)
|
||||
|
||||
#if !defined No_Exception && !defined No_Resource_NoSuchResource
|
||||
#define Resource_NoSuchResource_Raise_if(CONDITION, MESSAGE) \
|
||||
if (CONDITION) Resource_NoSuchResource::Raise(MESSAGE);
|
||||
if (CONDITION) throw Resource_NoSuchResource(MESSAGE);
|
||||
#else
|
||||
#define Resource_NoSuchResource_Raise_if(CONDITION, MESSAGE)
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user