Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-31 13:50:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Common: Fix SCOPE_EXIT to actually create unique identifiers.

Browse source
This commit is contained in:
Yuri Kunde Schlesner 2015-01-11 13:32:31 -02:00
parent afc416c607
commit fc11aff955
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/common/common_funcs.h
View file

@ -31,6 +31,10 @@ template<> struct CompileTimeAssert<true> {};
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
/// Textually concatenates two tokens. The double-expansion is required by the C preprocessor.
#define CONCAT2(x, y) DO_CONCAT2(x, y)
#define DO_CONCAT2(x, y) x ## y
#ifndef _MSC_VER #ifndef _MSC_VER
#include <errno.h> #include <errno.h>

4
src/common/scope_exit.h
View file

@ -4,6 +4,8 @@
#pragma once #pragma once
#include "common/common_funcs.h"
namespace detail { namespace detail {
template <typename Func> template <typename Func>
struct ScopeExitHelper { struct ScopeExitHelper {
@ -34,4 +36,4 @@ namespace detail {
* } * }
* \endcode * \endcode
*/ */
#define SCOPE_EXIT(body) auto scope_exit_helper_##__LINE__ = detail::ScopeExit([&]() body) #define SCOPE_EXIT(body) auto CONCAT2(scope_exit_helper_, __LINE__) = detail::ScopeExit([&]() body)