summaryrefslogtreecommitdiff
path: root/include/svtools/asynclink.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
commit3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch)
treebdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /include/svtools/asynclink.hxx
parent57d254d42b6e1d836bd21e6fb2e968af2b511c7d (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 'include/svtools/asynclink.hxx')
-rw-r--r--include/svtools/asynclink.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx
index fea886db2a4e..070d980964c2 100644
--- a/include/svtools/asynclink.hxx
+++ b/include/svtools/asynclink.hxx
@@ -32,7 +32,7 @@ namespace svtools {
class SVT_DLLPUBLIC AsynchronLink
{
- Link _aLink;
+ Link<> _aLink;
ImplSVEvent * _nEventId;
Idle* _pIdle;
bool _bInCall;
@@ -44,7 +44,7 @@ class SVT_DLLPUBLIC AsynchronLink
SVT_DLLPRIVATE void Call_Impl( void* pArg );
public:
- AsynchronLink( const Link& rLink )
+ AsynchronLink( const Link<>& rLink )
: _aLink( rLink )
, _nEventId( 0 )
, _pIdle( 0 )
@@ -64,11 +64,11 @@ public:
~AsynchronLink();
void CreateMutex();
- void operator=( const Link& rLink ) { _aLink = rLink; }
+ void operator=( const Link<>& rLink ) { _aLink = rLink; }
void Call( void* pObj, bool bAllowDoubles = false, bool bUseTimer = false );
void ClearPendingCall( );
bool IsSet() const { return _aLink.IsSet(); }
- Link GetLink() const { return _aLink; }
+ Link<> GetLink() const { return _aLink; }
};
}