diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-29 08:12:13 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-29 22:21:04 +0100 |
commit | ab2d0ff4d7c0a3c76401b0f07b85dc2267d1eb7c (patch) | |
tree | 375a542d2d45ff86e941dc3914d6b2b9b9c648dd | |
parent | f0152b737d9a196e83752a546154735efee5c2be (diff) |
loplugin:cstylecast (Mac OS X)
Change-Id: Ia8f2c9f1c1c284708a2cbde379197ec6ba58742f
-rw-r--r-- | bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/drivers/macab/MacabRecords.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx index e0e76cae3f03..259aff795031 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx @@ -236,7 +236,7 @@ static typelib_TypeClass cpp2uno_call( uno_destructData( pUnoReturn, pReturnTypeDescr, 0 ); } // complex return ptr is set to return reg - *(void **)pRegisterReturn = pCppReturn; + *reinterpret_cast<void **>(pRegisterReturn) = pCppReturn; } if ( pReturnTypeDescr ) { @@ -346,7 +346,7 @@ typelib_TypeClass cpp_vtable_call( XInterface * pInterface = 0; (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface) ( pCppI->getBridge()->getCppEnv(), - (void **)&pInterface, + reinterpret_cast<void **>(&pInterface), pCppI->getOid().pData, reinterpret_cast<typelib_InterfaceTypeDescription *>( pTD ) ); diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx index 167965c14ae7..4e663bad114a 100644 --- a/connectivity/source/drivers/macab/MacabRecords.cxx +++ b/connectivity/source/drivers/macab/MacabRecords.cxx @@ -677,7 +677,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert /* Get the keys and values */ dictKeys = (CFStringRef *) malloc(sizeof(CFStringRef)*numRecords); dictValues = (CFTypeRef *) malloc(sizeof(CFTypeRef)*numRecords); - CFDictionaryGetKeysAndValues((CFDictionaryRef) _propertyValue, (const void **) dictKeys, (const void **) dictValues); + CFDictionaryGetKeysAndValues((CFDictionaryRef) _propertyValue, reinterpret_cast<const void **>(dictKeys), (const void **) dictValues); propertyNameString = CFStringToOUString(_propertyName); @@ -1020,7 +1020,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT CFTypeRef *dictValues; dictKeys = (CFStringRef *) malloc(sizeof(CFStringRef)*numRecords); dictValues = (CFTypeRef *) malloc(sizeof(CFTypeRef)*numRecords); - CFDictionaryGetKeysAndValues((CFDictionaryRef) _propertyValue, (const void **) dictKeys, (const void **) dictValues); + CFDictionaryGetKeysAndValues((CFDictionaryRef) _propertyValue, reinterpret_cast<const void **>(dictKeys), (const void **) dictValues); /* Going through each element... */ for(i = 0; i < numRecords; i++) |