diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-09 21:35:10 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-10 11:25:47 +0200 |
| commit | 9bb254fc85eea7615cf8b9fa3700754fbd4c971c (patch) | |
| tree | 96966587eee7453845fae3ec4c0868adbb48148c /include/tools/link.hxx | |
| parent | 4d2a9bc3a63f682520e73f0c89c23cc87cbdef36 (diff) | |
NOINSTANCE is implied now in IMPL_STATIC_LINK...
Change-Id: Ifb032457d6c1b279c4183282ef2b271c706dd71a
Diffstat (limited to 'include/tools/link.hxx')
| -rw-r--r-- | include/tools/link.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/tools/link.hxx b/include/tools/link.hxx index e8337cc227f9..45e72980d7fd 100644 --- a/include/tools/link.hxx +++ b/include/tools/link.hxx @@ -53,14 +53,14 @@ } \ sal_IntPtr Class::Member(SAL_UNUSED_PARAMETER void *) -#define IMPL_STATIC_LINK_NOINSTANCE(Class, Member, ArgType, ArgName) \ +#define IMPL_STATIC_LINK(Class, Member, ArgType, ArgName) \ sal_IntPtr Class::LinkStub##Member(void * instance, void * data) { \ return Member( \ static_cast<Class *>(instance), static_cast<ArgType>(data)); \ } \ sal_IntPtr Class::Member(SAL_UNUSED_PARAMETER Class *, ArgType ArgName) -#define IMPL_STATIC_LINK_NOINSTANCE_NOARG(Class, Member) \ +#define IMPL_STATIC_LINK_NOARG(Class, Member) \ sal_IntPtr Class::LinkStub##Member(void * instance, void * data) { \ return Member(static_cast<Class *>(instance), data); \ } \ @@ -95,14 +95,14 @@ } \ RetType Class::Member(SAL_UNUSED_PARAMETER ArgType) -#define IMPL_STATIC_LINK_NOINSTANCE_TYPED( \ +#define IMPL_STATIC_LINK_TYPED( \ Class, Member, ArgType, ArgName, RetType) \ RetType Class::LinkStub##Member(void * instance, ArgType data) { \ return Member(static_cast<Class *>(instance), data); \ } \ RetType Class::Member(SAL_UNUSED_PARAMETER Class *, ArgType ArgName) -#define IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED( \ +#define IMPL_STATIC_LINK_NOARG_TYPED( \ Class, Member, ArgType, RetType) \ RetType Class::LinkStub##Member(void * instance, ArgType data) { \ return Member(static_cast<Class *>(instance), data); \ |