diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
| commit | 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch) | |
| tree | bdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /vcl/unx | |
| parent | 57d254d42b6e1d836bd21e6fb2e968af2b511c7d (diff) | |
Gradually typed Link
Turn the Link class into a template abstracting over the link's argument and
return types, but provide default template arguments that keep the generic,
unsafe "void* in, sal_IntPtr out" behvior. That way, individual uses of the
Link class can be updated over time.
All the related macros are duplicated with ..._TYPED counterparts, that
additionally take the RetType (except for LINK_TYPED, which manages to infer the
relevant types from the supplied Member).
(It would have been attractive to change the "untyped" LinkStubs from taking a
void* to a properly typed ArgType parameter, too, but that would cause
-fsanitize=function to flag uses of "untyped" Link::Call.)
Change-Id: I3b0140378bad99abbf240140ebb4a46a05d2d2f8
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/gtk/a11y/atkutil.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/window/gtksalmenu.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index d95f700809c8..03f08e4f30c6 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -676,7 +676,7 @@ sal_IntPtr WindowEventHandler(void *, void * p) return 0; } -static Link g_aEventListenerLink( NULL, WindowEventHandler ); +static Link<> g_aEventListenerLink( NULL, WindowEventHandler ); /*****************************************************************************/ diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index 97727a727d54..73ca34b6ce69 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -483,11 +483,11 @@ static long RefreshMenusUnity(void*, void*) return 0; } -static Link* getRefreshLinkInstance() +static Link<>* getRefreshLinkInstance() { - static Link* pLink = NULL; + static Link<>* pLink = NULL; if(!pLink) { - pLink = new Link(NULL, &RefreshMenusUnity); + pLink = new Link<>(NULL, &RefreshMenusUnity); } return pLink; } |