diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:02:53 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:02:53 +0000 |
| commit | f512630000a2c98833b16cd40f2af0f583e6e4cb (patch) | |
| tree | 4c873712dc1d9a356530dd9468a4d5399eb045b8 /pyuno/source/loader | |
| parent | 560c6d67e4323877b6dedb6f0e15a46f6d6b746a (diff) | |
INTEGRATION: CWS warnings01 (1.6.14); FILE MERGED
2005/09/23 02:07:33 sb 1.6.14.2: RESYNC: (1.6-1.7); FILE MERGED
2005/09/09 15:31:16 sb 1.6.14.1: #i53898# Made code warning-free.
Diffstat (limited to 'pyuno/source/loader')
| -rw-r--r-- | pyuno/source/loader/pyuno_loader.cxx | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx index 1d5880f0ebdd..36d27978a0d3 100644 --- a/pyuno/source/loader/pyuno_loader.cxx +++ b/pyuno/source/loader/pyuno_loader.cxx @@ -4,9 +4,9 @@ * * $RCSfile: pyuno_loader.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-08 16:50:38 $ + * last change: $Author: hr $ $Date: 2006-06-20 05:02:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -32,6 +32,9 @@ * MA 02111-1307 USA * ************************************************************************/ + +#include <pyuno/pyuno.hxx> + #include <osl/module.hxx> #include <osl/process.h> #include <osl/file.h> @@ -44,8 +47,6 @@ #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/factory.hxx> -#include <pyuno/pyuno.hxx> - using rtl::OUString; using rtl::OUStringBuffer; using rtl::OString; @@ -82,7 +83,9 @@ static void raiseRuntimeExceptionWhenNeeded() throw ( RuntimeException ) static PyRef getLoaderModule() throw( RuntimeException ) { - PyRef module( PyImport_ImportModule( "pythonloader" ), SAL_NO_ACQUIRE ); + PyRef module( + PyImport_ImportModule( const_cast< char * >("pythonloader") ), + SAL_NO_ACQUIRE ); raiseRuntimeExceptionWhenNeeded(); if( !module.is() ) { @@ -128,9 +131,8 @@ static OUString getLibDir() { static OUString libDir; - // changed from reinterpret_cast<void*> this is not allowed - // in gcc 3.3 without permissive. Us simple C cast. - if( osl::Module::getUrlFromAddress( (void*)(getLibDir) , libDir ) ) + if( osl::Module::getUrlFromAddress( + reinterpret_cast< oslGenericFunction >(getLibDir) , libDir ) ) { libDir = OUString( libDir.getStr(), libDir.lastIndexOf('/' ) ); } @@ -263,7 +265,7 @@ extern "C" //================================================================================================== void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) + const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } |