diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
| commit | 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch) | |
| tree | e55ab4706654d10a5f9b75acfdecec72fda804c3 /include/tools | |
| parent | 36efdec23b86fe28c79fe672bb6862fb57b6e09a (diff) | |
Remove _TYPED suffix from tools/link.hxx macros
...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually
typed Link" to distinguish the new, typed versions from the old, untyped ones,
but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173
"remove untyped Link<>" removed the old versions.
Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c
Diffstat (limited to 'include/tools')
| -rw-r--r-- | include/tools/link.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/tools/link.hxx b/include/tools/link.hxx index f46e84e7c578..8b65be4755dd 100644 --- a/include/tools/link.hxx +++ b/include/tools/link.hxx @@ -24,42 +24,42 @@ #include <sal/types.h> -#define DECL_LINK_TYPED(Member, ArgType, RetType) \ +#define DECL_LINK(Member, ArgType, RetType) \ static RetType LinkStub##Member(void *, ArgType); \ RetType Member(ArgType) -#define DECL_STATIC_LINK_TYPED(Class, Member, ArgType, RetType) \ +#define DECL_STATIC_LINK(Class, Member, ArgType, RetType) \ static RetType LinkStub##Member(void *, ArgType); \ static RetType Member(Class *, ArgType) -#define DECL_DLLPRIVATE_LINK_TYPED(Member, ArgType, RetType) \ +#define DECL_DLLPRIVATE_LINK(Member, ArgType, RetType) \ SAL_DLLPRIVATE static RetType LinkStub##Member(void *, ArgType); \ SAL_DLLPRIVATE RetType Member(ArgType) -#define DECL_DLLPRIVATE_STATIC_LINK_TYPED(Class, Member, ArgType, RetType) \ +#define DECL_DLLPRIVATE_STATIC_LINK(Class, Member, ArgType, RetType) \ SAL_DLLPRIVATE static RetType LinkStub##Member(void *, ArgType); \ SAL_DLLPRIVATE static RetType Member(Class *, ArgType) -#define IMPL_LINK_TYPED(Class, Member, ArgType, ArgName, RetType) \ +#define IMPL_LINK(Class, Member, ArgType, ArgName, RetType) \ RetType Class::LinkStub##Member(void * instance, ArgType data) { \ return static_cast<Class *>(instance)->Member(data); \ } \ RetType Class::Member(ArgType ArgName) -#define IMPL_LINK_NOARG_TYPED(Class, Member, ArgType, RetType) \ +#define IMPL_LINK_NOARG(Class, Member, ArgType, RetType) \ RetType Class::LinkStub##Member(void * instance, ArgType data) { \ return static_cast<Class *>(instance)->Member(data); \ } \ RetType Class::Member(SAL_UNUSED_PARAMETER ArgType) -#define IMPL_STATIC_LINK_TYPED( \ +#define IMPL_STATIC_LINK( \ 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_NOARG_TYPED( \ +#define IMPL_STATIC_LINK_NOARG( \ Class, Member, ArgType, RetType) \ RetType Class::LinkStub##Member(void * instance, ArgType data) { \ return Member(static_cast<Class *>(instance), data); \ |