diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:28:04 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:28:04 +0000 |
| commit | bf9ae147608a10727681470ad542053a768c24bf (patch) | |
| tree | e70cabfe5c649d31723a55de5d22f512e77f012f /configmgr | |
| parent | INTEGRATION: CWS warnings01 (1.4.4); FILE MERGED (diff) | |
| download | core-bf9ae147608a10727681470ad542053a768c24bf.tar.gz core-bf9ae147608a10727681470ad542053a768c24bf.zip | |
INTEGRATION: CWS warnings01 (1.15.4); FILE MERGED
2005/11/10 08:47:14 pl 1.15.4.1: #i53898# removed warnings
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/misc/tracer.cxx | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/configmgr/source/misc/tracer.cxx b/configmgr/source/misc/tracer.cxx index 6763f82bba86..ac2dad8241fa 100644 --- a/configmgr/source/misc/tracer.cxx +++ b/configmgr/source/misc/tracer.cxx @@ -4,9 +4,9 @@ * * $RCSfile: tracer.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: rt $ $Date: 2005-09-08 04:13:26 $ + * last change: $Author: hr $ $Date: 2006-06-19 23:28:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -65,6 +65,11 @@ namespace configmgr namespace configmgr { +extern "C" +{ + static void call_freeThreadData(void*); +} + struct OTracerSetup { enum { @@ -90,7 +95,7 @@ struct OTracerSetup ,m_pOutputMedium(NULL) ,m_bInitialized(sal_False) { - m_nThreadKey = ::osl_createThreadKey(&freeThreadData); + m_nThreadKey = ::osl_createThreadKey(call_freeThreadData); } ~OTracerSetup() { @@ -119,7 +124,7 @@ struct OTracerSetup }; ThreadData& ensureThreadData(); - static void SAL_CALL freeThreadData(void*p); + static void freeThreadData(void*p); }; //========================================================================== @@ -199,6 +204,11 @@ OTracerSetup::ThreadData& OTracerSetup::ensureThreadData() return *pRet; } +static void call_freeThreadData( void* p ) +{ + OTracerSetup::freeThreadData( p ); +} + //-------------------------------------------------------------------------- void OTracerSetup::freeThreadData(void* p) { |