diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 17:20:36 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 17:20:36 +0000 |
| commit | 6734aea77c66994bea132b13eeabe973a79f66b9 (patch) | |
| tree | 7a092f295e1bc746b8751792b67c241d8f826619 /connectivity/source/drivers/mozab/MDriver.cxx | |
| parent | 093af274aadaafedcdb7f9ba9bcb2b9fd3caabc6 (diff) | |
INTEGRATION: CWS ooo20031110 (1.7.116); FILE MERGED
2003/11/06 22:28:01 waratah 1.7.116.1: #i21906# convert C++ cast to C cast but leave comment with original cast, causes problems when permissive removed from GCC compile
Diffstat (limited to 'connectivity/source/drivers/mozab/MDriver.cxx')
| -rw-r--r-- | connectivity/source/drivers/mozab/MDriver.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx index 356a6f8f0d5e..55a1d0956e4a 100644 --- a/connectivity/source/drivers/mozab/MDriver.cxx +++ b/connectivity/source/drivers/mozab/MDriver.cxx @@ -2,9 +2,9 @@ * * $RCSfile: MDriver.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: oj $ $Date: 2002-08-21 13:15:04 $ + * last change: $Author: rt $ $Date: 2003-12-01 18:20:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -287,8 +287,9 @@ void MozabDriver::registerClient() // first, we need to announce our service factory to the lib // see the documentation of setMozabServiceFactory for more details const ::rtl::OUString sSetFactoryFuncName( RTL_CONSTASCII_USTRINGPARAM( "setMozabServiceFactory" ) ); + // reinterpret_cast< OSetMozabServiceFactory >>> removed GNU C OSetMozabServiceFactory pSetFactoryFunc = - reinterpret_cast< OSetMozabServiceFactory >( osl_getSymbol( s_hModule, sSetFactoryFuncName.pData ) ); + ( OSetMozabServiceFactory )( osl_getSymbol( s_hModule, sSetFactoryFuncName.pData ) ); OSL_ENSURE( pSetFactoryFunc, "MozabDriver::registerClient: missing an entry point!" ); if ( pSetFactoryFunc && m_xMSFactory.is() ) @@ -301,7 +302,8 @@ void MozabDriver::registerClient() // get the symbol for the method creating the factory const ::rtl::OUString sFactoryCreationFunc = ::rtl::OUString::createFromAscii("OMozabConnection_CreateInstance"); - s_pCreationFunc = reinterpret_cast<OMozabConnection_CreateInstanceFunction>(osl_getSymbol(s_hModule, sFactoryCreationFunc.pData)); + // reinterpret_cast<OMozabConnection_CreateInstanceFunction> removed GNU C + s_pCreationFunc = (OMozabConnection_CreateInstanceFunction)(osl_getSymbol(s_hModule, sFactoryCreationFunc.pData)); if (NULL == s_pCreationFunc) { // did not find the symbol |