diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2004-03-30 15:57:54 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2004-03-30 15:57:54 +0000 |
commit | 56d52c1c7f5e9062a5056e95233e52eeb7c8cf6d (patch) | |
tree | 46a826a0707651e2ff2d6873e70181c56f90257b /cppu | |
parent | f8882579fab40e97dcc5361d2be9157d0ba25f28 (diff) |
INTEGRATION: CWS sb14 (1.18.6); FILE MERGED
2004/03/04 10:49:43 sb 1.18.6.1: #i21150# Missing reinterpret_cast to disambiguate multiple-inheritance calls to acquire().
Diffstat (limited to 'cppu')
-rw-r--r-- | cppu/inc/com/sun/star/uno/Reference.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cppu/inc/com/sun/star/uno/Reference.hxx b/cppu/inc/com/sun/star/uno/Reference.hxx index fdb16b307..cbb8600f8 100644 --- a/cppu/inc/com/sun/star/uno/Reference.hxx +++ b/cppu/inc/com/sun/star/uno/Reference.hxx @@ -2,9 +2,9 @@ * * $RCSfile: Reference.hxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: hr $ $Date: 2004-02-03 12:15:32 $ + * last change: $Author: rt $ $Date: 2004-03-30 16:57:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -229,7 +229,7 @@ inline sal_Bool Reference< interface_type >::set( interface_type * pInterface ) SAL_THROW( () ) { if (pInterface) - pInterface->acquire(); + reinterpret_cast< XInterface * >(pInterface)->acquire(); if (_pInterface) _pInterface->release(); _pInterface = reinterpret_cast< XInterface * >(pInterface); |