diff options
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/logging/logrecord.cxx | 3 | ||||
-rw-r--r-- | extensions/source/plugin/base/nfuncs.cxx | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/extensions/source/logging/logrecord.cxx b/extensions/source/logging/logrecord.cxx index dfd0cb8f21d1..eba865bf6d23 100644 --- a/extensions/source/logging/logrecord.cxx +++ b/extensions/source/logging/logrecord.cxx @@ -21,6 +21,7 @@ #include <osl/time.h> #include <osl/thread.h> +#include <osl/thread.hxx> #include <osl/diagnose.h> //........................................................................ @@ -45,7 +46,7 @@ namespace logging */ OUString getCurrentThreadID() { - oslThreadIdentifier nThreadID( osl_getThreadIdentifier( NULL ) ); + oslThreadIdentifier nThreadID( osl::Thread::getCurrentIdentifier() ); return OUString::valueOf( (sal_Int64)nThreadID ); } } diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx index cdb20e2a8765..f827026095f4 100644 --- a/extensions/source/plugin/base/nfuncs.cxx +++ b/extensions/source/plugin/base/nfuncs.cxx @@ -47,6 +47,7 @@ #if OSL_DEBUG_LEVEL > 1 #include <osl/thread.h> +#include <osl/thread.hxx> #include <stdio.h> static FILE * s_file = 0; void TRACE( char const * s ) @@ -55,7 +56,7 @@ void TRACE( char const * s ) s_file = stderr; if (s_file) { - oslThreadIdentifier t = osl_getThreadIdentifier(0); + oslThreadIdentifier t = osl::Thread::getCurrentIdentifier(); fprintf( s_file, "log [t_id=%" SAL_PRIuUINT32 "]: %s\n", t, s ); fflush( s_file ); } @@ -66,7 +67,7 @@ void TRACEN( char const * s, long n ) s_file = stderr; if (s_file) { - oslThreadIdentifier t = osl_getThreadIdentifier(0); + oslThreadIdentifier t = osl::Thread::getCurrentIdentifier(); fprintf( s_file, "log [t_id=%" SAL_PRIuUINT32 "]: %s%ld\n", t, s, n ); fflush( s_file ); } @@ -77,7 +78,7 @@ void TRACES( char const* s, char const* s2 ) s_file = stderr; if (s_file) { - oslThreadIdentifier t = osl_getThreadIdentifier(0); + oslThreadIdentifier t = osl::Thread::getCurrentIdentifier(); fprintf( s_file, "log [t_id=%" SAL_PRIuUINT32 "]: %s %s\n", t, s, s2 ); fflush( s_file ); } |