mika/Atmosphere-libs
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere-libs.git synced 2025-08-10 17:39:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

more macro cleanup

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/stratosphere/results/utilities.h
View File

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

7
include/stratosphere/scope_guard.hpp
View File

@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* Scope guard logic lovingly taken from Andrei Alexandrescu's "Systemic Error Handling in C++" */ /* Scope guard logic lovingly taken from Andrei Alexandrescu's "Systemic Error Handling in C++" */
#pragma once #pragma once
@ -28,7 +28,7 @@ public:
ScopeGuard(F f) : f(std::move(f)), active(true) { } ScopeGuard(F f) : f(std::move(f)), active(true) { }
~ScopeGuard() { if (active) { f(); } } ~ScopeGuard() { if (active) { f(); } }
void Cancel() { active = false; } void Cancel() { active = false; }
ScopeGuard() = delete; ScopeGuard() = delete;
ScopeGuard(const ScopeGuard &) = delete; ScopeGuard(const ScopeGuard &) = delete;
ScopeGuard& operator=(const ScopeGuard&) = delete; ScopeGuard& operator=(const ScopeGuard&) = delete;
@ -58,4 +58,5 @@ ScopeGuard<F> operator+(ScopeGuardOnExit, F&& f) {
#define ANONYMOUS_VARIABLE(pref) CONCATENATE(pref, __LINE__) #define ANONYMOUS_VARIABLE(pref) CONCATENATE(pref, __LINE__)
#endif #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