diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-07-30 14:03:57 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-07-30 14:03:57 +0000 |
| commit | cf35b38539d468f4fcdcade6d553a59afbc27d7d (patch) | |
| tree | 0110621e9882aef004366254245308df4a49c6f0 /cppu | |
| parent | 4c81da578194625d8679105b500fce3d257adcb7 (diff) | |
INTEGRATION: CWS gcc340fixes01 (1.6.128); FILE MERGED
2004/07/02 10:01:55 sb 1.6.128.1: #i29352# Avoid problems with dependent names in templates.
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/inc/uno/mapping.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cppu/inc/uno/mapping.hxx b/cppu/inc/uno/mapping.hxx index 0b9a699d5365..e5a3b6d25e6c 100644 --- a/cppu/inc/uno/mapping.hxx +++ b/cppu/inc/uno/mapping.hxx @@ -2,9 +2,9 @@ * * $RCSfile: mapping.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: dbo $ $Date: 2001-11-09 09:14:30 $ + * last change: $Author: kz $ $Date: 2004-07-30 15:03:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -340,7 +340,7 @@ inline sal_Bool mapToCpp( Reference< C > * ppRet, uno_Interface * pUnoI ) SAL_TH ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ) ); OSL_ASSERT( aMapping.is() ); - aMapping.mapInterface( (void **)ppRet, pUnoI, ::getCppuType( ppRet ) ); + aMapping.mapInterface( (void **)ppRet, pUnoI, getCppuType( ppRet ) ); return (0 != *ppRet); } /** Maps an UNO interface of the currently used compiler environment to binary C UNO. @@ -357,7 +357,7 @@ inline sal_Bool mapToUno( uno_Interface ** ppRet, const Reference< C > & x ) SAL ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ) ); OSL_ASSERT( aMapping.is() ); - aMapping.mapInterface( (void **)ppRet, x.get(), ::getCppuType( &x ) ); + aMapping.mapInterface( (void **)ppRet, x.get(), getCppuType( &x ) ); return (0 != *ppRet); } |