From b475d5fd164e04b014015d96b5d54a7358bd0ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Mon, 17 Apr 2017 12:30:56 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@376 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src/thread/pithread.cpp | 12 ++++++------ src/thread/pitimer.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/thread/pithread.cpp b/src/thread/pithread.cpp index 0b7c49ac..b269f5d2 100755 --- a/src/thread/pithread.cpp +++ b/src/thread/pithread.cpp @@ -275,11 +275,11 @@ __THREAD_FUNC__ PIThread::thread_function(void * t) { ct.terminating = ct.running_ = false; ct.tid_ = -1; //cout << "thread " << t << " exiting ... " << endl; - //piCout << "pthread_exit" << ct.PRIVATE->thread; + //piCout << "pthread_exit" << (ct.__privateinitializer__.p)->thread; PIINTROSPECTION_UNREGISTER_THREAD(ct.tid()); #ifndef WINDOWS - pthread_detach(ct.PRIVATE->thread); - ct.PRIVATE->thread = 0; + pthread_detach((ct.__privateinitializer__.p)->thread); + (ct.__privateinitializer__.p)->thread = 0; #endif #ifndef WINDOWS pthread_exit(0); @@ -317,11 +317,11 @@ __THREAD_FUNC__ PIThread::thread_function_once(void * t) { ct.terminating = ct.running_ = false; ct.tid_ = -1; //cout << "thread " << t << " exiting ... " << endl; - //piCout << "pthread_exit" << ct.PRIVATE->thread; + //piCout << "pthread_exit" << (ct.__privateinitializer__.p)->thread; PIINTROSPECTION_UNREGISTER_THREAD(ct.tid()); #ifndef WINDOWS - pthread_detach(ct.PRIVATE->thread); - ct.PRIVATE->thread = 0; + pthread_detach((ct.__privateinitializer__.p)->thread); + (ct.__privateinitializer__.p)->thread = 0; #endif #ifndef WINDOWS pthread_exit(0); diff --git a/src/thread/pitimer.cpp b/src/thread/pitimer.cpp index 4d66116f..5720fa73 100755 --- a/src/thread/pitimer.cpp +++ b/src/thread/pitimer.cpp @@ -494,7 +494,7 @@ void PITimer::init() { piCoutObj << "Warning: \"ThreadRT\" is not available at this system! Using \"Thread\"."; #endif case PITimer::Thread: imp = new _PITimerImp_Thread(); break; - default: piCout << "Fatal: invalid implementation() of" << this << "!"; abort(); + default: piCout << "Fatal: invalid implementation() of" << this << "!"; assert(0); } if (imp == 0) return; imp->tfunc = tickImpS;