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 | 8c2cd1675f3308e3f542ededb1f3aad26d5b1f69 (patch) | |
| tree | a4e54f5faf2da2c3df5ca52a6fc235e2b0741caf | |
| parent | b3e081013d31518de220745b833dd1ebc36704a0 (diff) | |
WaE: gcc 4.6.0 various warnings
| -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 41f5ae4615cc..edc908a020a5 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 4b5a22c42da7..fef81033cfa5 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; } |