X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=sigc%2B%2B%2Fthread.cc;h=a8ed235dc6495b08be6f882c81d5f636fe64310b;hb=4d51fc96b416eb72f8f6e0533745188717da575e;hp=d9b0d4d2009479b645799697243d13f719436f07;hpb=85f8bf7445db373d95bad64faede475e0f6f9049;p=lyx.git diff --git a/sigc++/thread.cc b/sigc++/thread.cc index d9b0d4d200..a8ed235dc6 100644 --- a/sigc++/thread.cc +++ b/sigc++/thread.cc @@ -53,7 +53,7 @@ Condition::~Condition() int Condition::signal() {return pthread_cond_signal(&cond_);} int Condition::broadcast() {return pthread_cond_broadcast(&cond_);} int Condition::wait(Mutex &m) {return pthread_cond_wait(&cond_,m);} -int Condition::wait(Mutex &m, struct timespec* spec) +int Condition::wait(Mutex &m,struct timespec* spec) {return pthread_cond_timedwait(&cond_,m,spec);} int Condition::destroy() {return pthread_cond_destroy(&cond_);} @@ -135,13 +135,6 @@ void Private_::destroy() #endif } -Private::operator int&() -{ - int * value = static_cast(get()); - if (!value) - set(static_cast(value = new int(0))); - return *(value); -} #ifdef SIGC_PTHREAD_DCE MutexAttr Mutex::Default={pthread_mutexattr_default}; @@ -155,8 +148,8 @@ ThreadAttr Thread::Default={0}; #ifdef SIGC_CXX_NAMESPACES -}; -}; +} +} #endif #endif