path: root/rsc
diff options
authorStephan Bergmann <>2015-04-30 10:20:00 +0200
committerStephan Bergmann <>2015-04-30 10:20:00 +0200
commit3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch)
treebdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /rsc
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 'rsc')
2 files changed, 2 insertions, 2 deletions
diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx
index 15881fdee485..c8c6a0e61898 100644
--- a/rsc/inc/rsctree.hxx
+++ b/rsc/inc/rsctree.hxx
@@ -44,7 +44,7 @@ public:
BiNode * Left() const { return pLeft ; }
BiNode * Right() const{ return pRight ; }
- void EnumNodes( Link aLink ) const;
+ void EnumNodes( Link<> aLink ) const;
class NameNode : public BiNode
diff --git a/rsc/source/tools/rsctree.cxx b/rsc/source/tools/rsctree.cxx
index a080349cf80d..f37ea656f719 100644
--- a/rsc/source/tools/rsctree.cxx
+++ b/rsc/source/tools/rsctree.cxx
@@ -35,7 +35,7 @@ BiNode::~BiNode()
-void BiNode::EnumNodes( Link aLink ) const
+void BiNode::EnumNodes( Link<> aLink ) const
if( Left() )
Left()->EnumNodes( aLink );