diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-24 10:55:39 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-24 10:55:39 +0000 |
| commit | f4327314528d794447f3107b37b4adfea8ed1cc6 (patch) | |
| tree | 8fba880ab9960071692396499adae86aa9fa972b /cppu | |
| parent | 0b132a38935fc40ab148c72d64fd9249e9be0c6f (diff) | |
WaE: gcc 4.6.0 various warnings
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/source/uno/data.cxx | 4 | ||||
| -rw-r--r-- | cppu/source/uno/eq.hxx | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index 901b27bca..0d693edf0 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -274,7 +274,7 @@ sal_Bool SAL_CALL uno_type_equalData( { return _equalData( pVal1, pVal1Type, 0, - pVal2, pVal2Type, 0, + pVal2, pVal2Type, queryInterface, release ); } //################################################################################################## @@ -286,7 +286,7 @@ sal_Bool SAL_CALL uno_equalData( { return _equalData( pVal1, pVal1TD->pWeakRef, pVal1TD, - pVal2, pVal2TD->pWeakRef, pVal2TD, + pVal2, pVal2TD->pWeakRef, queryInterface, release ); } //################################################################################################## diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx index 2f08feac5..638b8332b 100644 --- a/cppu/source/uno/eq.hxx +++ b/cppu/source/uno/eq.hxx @@ -303,7 +303,7 @@ inline sal_Bool _equalData( void * pDest, typelib_TypeDescriptionReference * pDestType, typelib_TypeDescription * pDestTypeDescr, void * pSource, - typelib_TypeDescriptionReference * pSourceType, typelib_TypeDescription * pSourceTypeDescr, + typelib_TypeDescriptionReference * pSourceType, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) SAL_THROW( () ) { @@ -316,7 +316,6 @@ inline sal_Bool _equalData( } while (typelib_TypeClass_ANY == (eSourceTypeClass = pSourceType->eTypeClass)) { - pSourceTypeDescr = 0; pSourceType = ((uno_Any *)pSource)->pType; pSource = ((uno_Any *)pSource)->pData; } |