github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-01-31 00:38:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Disable internal error catching and allow swig to do the error catching itself

Browse Source 
See https://github.com/CoolProp/CoolProp/issues/282

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-12-04 17:00:54 -05:00
parent cf58ba6ca6
commit 32ccb78250
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/CoolProp.cpp
View File

@@ -307,11 +307,9 @@ double Props1SI(const std::string &FluidName, const std::string &Output)
double PropsSI(const std::string &Output, const std::string &Name1, double Prop1, const std::string &Name2, double Prop2, const std::string &Ref)
{
std::string backend, fluid;
#if !defined(PROPSSI_NO_ERROR_CATCH)
#if !defined(NO_ERROR_CATCHING)
// In this function the error catching happens;
try{
#else
std::cout << "macro is on; error checking disabled in PropsSI" << std::endl;
#endif
// BEGIN OF TRY
// Here is the real code that is inside the try block
@@ -320,7 +318,7 @@ double PropsSI(const std::string &Output, const std::string &Name1, double Prop1
if (get_debug_level() > 1){ std::cout << format("_PropsSI will return %g",val) << std::endl; }
return val;
// END OF TRY
#if !defined(PROPSSI_NO_ERROR_CATCH)
#if !defined(NO_ERROR_CATCHING)
}
catch(const std::exception& e){
set_error_string(e.what() + format(" : PropsSI(\"%s\",\"%s\",%0.10g,\"%s\",%0.10g,\"%s\")",Output.c_str(),Name1.c_str(), Prop1, Name2.c_str(), Prop2, Ref.c_str()));