take the address of the member in wxON_BLOCK_EXIT_OBJ macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
3c58949394
commit
2bb3c0c0dd
@ -336,7 +336,7 @@ typedef const wxScopeGuardImplBase& wxScopeGuard;
|
||||
wxScopeGuard n = wxMakeObjGuard(o, m); \
|
||||
wxPrivateUse(n)
|
||||
#define wxON_BLOCK_EXIT_OBJ0(o, m) \
|
||||
wxON_BLOCK_EXIT_OBJ0_IMPL(wxGuardName, o, m)
|
||||
wxON_BLOCK_EXIT_OBJ0_IMPL(wxGuardName, o, &m)
|
||||
|
||||
#define wxON_BLOCK_EXIT1_IMPL(n, f, p1) \
|
||||
wxScopeGuard n = wxMakeGuard(f, p1); \
|
||||
@ -348,7 +348,7 @@ typedef const wxScopeGuardImplBase& wxScopeGuard;
|
||||
wxScopeGuard n = wxMakeObjGuard(o, m, p1); \
|
||||
wxPrivateUse(n)
|
||||
#define wxON_BLOCK_EXIT_OBJ1(o, m, p1) \
|
||||
wxON_BLOCK_EXIT_OBJ1_IMPL(wxGuardName, o, m, p1)
|
||||
wxON_BLOCK_EXIT_OBJ1_IMPL(wxGuardName, o, &m, p1)
|
||||
|
||||
#define wxON_BLOCK_EXIT2_IMPL(n, f, p1, p2) \
|
||||
wxScopeGuard n = wxMakeGuard(f, p1, p2); \
|
||||
@ -360,6 +360,6 @@ typedef const wxScopeGuardImplBase& wxScopeGuard;
|
||||
wxScopeGuard n = wxMakeObjGuard(o, m, p1, p2); \
|
||||
wxPrivateUse(n)
|
||||
#define wxON_BLOCK_EXIT_OBJ2(o, m, p1, p2) \
|
||||
wxON_BLOCK_EXIT_OBJ2_IMPL(wxGuardName, o, m, p1, p2)
|
||||
wxON_BLOCK_EXIT_OBJ2_IMPL(wxGuardName, o, &m, p1, p2)
|
||||
|
||||
#endif // _WX_SCOPEGUARD_H_
|
||||
|
Loading…
Reference in New Issue
Block a user