From c3ae70461061a9546a430147a4aabc8960845d19 Mon Sep 17 00:00:00 2001 From: Erik Hofman Date: Thu, 23 Jan 2020 13:47:04 +0100 Subject: [PATCH] Move SGThread::current to after the system dependent code which includes the proper header files --- simgear/threads/SGThread.cxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/simgear/threads/SGThread.cxx b/simgear/threads/SGThread.cxx index 1a98569d..6123966d 100644 --- a/simgear/threads/SGThread.cxx +++ b/simgear/threads/SGThread.cxx @@ -83,16 +83,6 @@ struct SGThread::PrivateData { bool _started = false; }; -long SGThread::current( void ) -{ -#ifdef _WIN32 - return (long)GetCurrentThreadId(); -#else - return (long)pthread_self(); -#endif -} - - #if _WIN32 ///////////////////////////////////////////////////////////////////////////// @@ -269,6 +259,16 @@ SGThread::join() _privateData->join(); } +long SGThread::current( void ) +{ +#ifdef _WIN32 + return (long)GetCurrentThreadId(); +#else + return (long)pthread_self(); +#endif +} + + SGWaitCondition::SGWaitCondition() : _privateData(new PrivateData) {