diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 15:03:12 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 16:59:08 +0200 |
commit | b3068470966530fa1d0b0c76d9095c6edb6a0df0 (patch) | |
tree | d137d408c01bf56b5a31af67c9be989d4f7fa3a6 /include/tools | |
parent | ebd62f7c793552fc9c10480421e2740413922b39 (diff) |
No need for LINK vs LINK_TYPED distinction
(fully qualify ::tools::detail::makeLink to avoid clashes with namespace
basegfx::tools)
Change-Id: I52818d0a47c78f1af7673ff91eb6517bc0820655
Diffstat (limited to 'include/tools')
-rw-r--r-- | include/tools/link.hxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/tools/link.hxx b/include/tools/link.hxx index d157bc03c346..bb6ca2d1bffc 100644 --- a/include/tools/link.hxx +++ b/include/tools/link.hxx @@ -74,9 +74,6 @@ sal_IntPtr Class::Member( \ SAL_UNUSED_PARAMETER Class *, SAL_UNUSED_PARAMETER void *) -#define LINK(Instance, Class, Member) \ - Link<>(static_cast<Class *>(Instance), &Class::LinkStub##Member) - #define DECL_LINK_TYPED(Member, ArgType, RetType) \ static RetType LinkStub##Member(void *, ArgType); \ RetType Member(ArgType) @@ -125,7 +122,7 @@ RetType Class::Member( \ SAL_UNUSED_PARAMETER Class *, SAL_UNUSED_PARAMETER void *) -#define LINK_TYPED(Instance, Class, Member) tools::detail::makeLink( \ +#define LINK(Instance, Class, Member) ::tools::detail::makeLink( \ static_cast<Class *>(Instance), &Class::LinkStub##Member) #define EMPTYARG |