more macro cleanup

This commit is contained in:
Michael Scire 2019-06-17 15:26:24 -07:00
parent 8e810f0618
commit 777984476e
2 changed files with 5 additions and 6 deletions

View File

@ -58,9 +58,7 @@ extern "C" {
({ \
const Result _tmp_r_try_cleanup_rc = res_expr; \
if (R_FAILED(_tmp_r_try_cleanup_rc)) { \
do { \
cleanup_expr \
} while (0); \
({ cleanup_expr }); \
return _tmp_r_try_cleanup_rc; \
} \
})

View File

@ -58,4 +58,5 @@ ScopeGuard<F> operator+(ScopeGuardOnExit, F&& f) {
#define ANONYMOUS_VARIABLE(pref) CONCATENATE(pref, __LINE__)
#endif
#define ON_SCOPE_EXIT auto ANONYMOUS_VARIABLE(SCOPE_EXIT_STATE_) = ScopeGuardOnExit() + [&]()
#define SCOPE_GUARD ScopeGuardOnExit() + [&]()
#define ON_SCOPE_EXIT auto ANONYMOUS_VARIABLE(SCOPE_EXIT_STATE_) = SCOPE_GUARD