mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WaE: gcc 4.6.0 various warnings

Browse Source
This commit is contained in:
Caolán McNamara
2011-01-24 10:55:39 +00:00
parent b3e081013d
commit 8c2cd1675f
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cppu/source/uno/data.cxx
View File

@@ -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 );
}
//##################################################################################################

3
cppu/source/uno/eq.hxx
View File

@@ -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;
}