X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fthreads%2FSGThread.hxx;h=477ca458f354b6f10807e766a00aa3f006386b1d;hb=da07871bc60569a02c1dd12aee754d5c85a55738;hp=69b10b8b501922155b7b483e9c8d7b775ed52792;hpb=db1b99d8dd0b6280c60729048b9699bcd190f324;p=simgear.git

diff --git a/simgear/threads/SGThread.hxx b/simgear/threads/SGThread.hxx
index 69b10b8b..477ca458 100644
--- a/simgear/threads/SGThread.hxx
+++ b/simgear/threads/SGThread.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -26,13 +26,8 @@
 #include <simgear/compiler.h>
 
 #include <pthread.h>
-#if defined ( SG_HAVE_STD_INCLUDES )
-#  include <cassert>
-#  include <cerrno>
-#else
-#  include <assert.h>
-#  include <sys/errno.h>
-#endif
+#include <cassert>
+#include <cerrno>
 
 class SGThread;
 
@@ -134,13 +129,9 @@ SGThread::~SGThread()
 inline int
 SGThread::start( unsigned cpu )
 {
-    pthread_attr_t attr;
-    pthread_attr_init(&attr);
-    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-	  
-    int status = pthread_create( &tid, &attr, start_handler, this );
+    int status = pthread_create( &tid, 0, start_handler, this );
     assert( status == 0 );
-    pthread_attr_destroy(&attr);
+    (void)status;
 #if defined( sgi )
     if ( !status && !cpu )
         pthread_setrunon_np( cpu );
@@ -153,6 +144,7 @@ SGThread::join()
 {
     int status = pthread_join( tid, 0 );
     assert( status == 0 );
+    (void)status;
 }
 
 inline void
@@ -160,6 +152,7 @@ SGThread::cancel()
 {
     int status = pthread_cancel( tid );
     assert( status == 0 );
+    (void)status;
 }
 
 /**
@@ -222,37 +215,30 @@ protected:
 
 inline SGMutex::SGMutex()
 {
-#if 0
-    // Note: This will only work if the mutex is in shared memory,
-    // something we don't support enyhow. -EMH-
-    pthread_mutexattr_t mutex_attr = 0;
-    pthread_mutexattr_init(&mutex_attr);
-    pthread_mutexattr_setpshared(&mutex_attr, PTHREAD_PROCESS_SHARED);
-    int status = pthread_mutex_init( &mutex, &mutex_attr );
-    assert( status == 0 );
-    pthread_mutexattr_destroy(&mutex_attr);
-#else
     int status = pthread_mutex_init( &mutex, 0 );
     assert( status == 0 );
-#endif
+    (void)status;
 }
 
 inline SGMutex::~SGMutex()
 {
     int status = pthread_mutex_destroy( &mutex );
     assert( status == 0 );
+    (void)status;
 }
 
 inline void SGMutex::lock()
 {
     int status = pthread_mutex_lock( &mutex );
     assert( status == 0 );
+    (void)status;
 }
 
 inline void SGMutex::unlock()
 {
     int status = pthread_mutex_unlock( &mutex );
     assert( status == 0 );
+    (void)status;
 }
 
 /**
@@ -323,30 +309,35 @@ inline SGPthreadCond::SGPthreadCond()
 {
     int status = pthread_cond_init( &cond, 0 );
     assert( status == 0 );
+    (void)status;
 }
 
 inline SGPthreadCond::~SGPthreadCond()
 {
     int status = pthread_cond_destroy( &cond );
     assert( status == 0 );
+    (void)status;
 }
 
 inline void SGPthreadCond::signal()
 {
     int status = pthread_cond_signal( &cond );
     assert( status == 0 );
+    (void)status;
 }
 
 inline void SGPthreadCond::broadcast()
 {
     int status = pthread_cond_broadcast( &cond );
     assert( status == 0 );
+    (void)status;
 }
 
 inline void SGPthreadCond::wait( SGMutex& mutex )
 {
     int status = pthread_cond_wait( &cond, &mutex.mutex );
     assert( status == 0 );
+    (void)status;
 }
 
 #endif /* SGTHREAD_HXX_INCLUDED */