Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

core: CATCH_ENTRY_NO_RETURN made parameterless, CATCH_ENTRY_NO_RETURN_CUSTOM added

Browse source
This commit is contained in:
sowle 2019-11-21 16:44:42 +03:00
parent 69143d8288
commit 3455811cc3
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
contrib/epee/include/misc_helpers.h
View file

@ -77,7 +77,7 @@
/// @details Useful within a dtor - but only if nested within another try block
/// (since we can still potentially throw here). See NESTED_*ENTRY()
/// @todo Exception dispatcher class
#define CATCH_ENTRY_NO_RETURN(location, custom_code) } \
#define CATCH_ENTRY_NO_RETURN_CUSTOM(location, custom_code) } \
catch(const std::exception& ex) \
{ \
(void)(ex); \
@ -90,6 +90,7 @@
custom_code; \
}
#define CATCH_ENTRY_NO_RETURN() CATCH_ENTRY_NO_RETURN_CUSTOM(LOCATION_SS, (void)0)
#define CATCH_ENTRY_WITH_FORWARDING_EXCEPTION() } \
catch(const std::exception& ex) \
@ -108,7 +109,7 @@
#define NESTED_TRY_ENTRY() try { TRY_ENTRY();
#define NESTED_CATCH_ENTRY(location) \
CATCH_ENTRY_NO_RETURN(location, {}); \
CATCH_ENTRY_NO_RETURN_CUSTOM(location, {}); \
} catch (...) {}