From 9bb254fc85eea7615cf8b9fa3700754fbd4c971c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 9 May 2015 21:35:10 +0200 Subject: NOINSTANCE is implied now in IMPL_STATIC_LINK... Change-Id: Ifb032457d6c1b279c4183282ef2b271c706dd71a --- include/tools/link.hxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/tools/link.hxx') 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(instance), static_cast(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(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(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(instance), data); \ -- cgit