From 1e118c5b16fb1a531e45139f72c8a3ac80ea3efe Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 18 May 2009 07:48:11 +0000 Subject: Mon May 18 07:48:05 2009 Johnny Willemsen * ace/Condition_Recursive_Thread_Mutex.cpp: Const change * ace/OS_NS_stdio.{h,inl}: Removed ACE_OS::fileno(), gives problems with CE at this moment * ace/Recursive_Thread_Mutex.cpp (get_nesting_level): Disabled again for WinCE, the fact that it compiled is a bug in the CEGCC header files * ace/OS_NS_Thread.cpp: Bool changes * ace/OS_NS_stdlib.cpp: WinCE has ExitProcess --- ACE/ace/Condition_Recursive_Thread_Mutex.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ACE/ace/Condition_Recursive_Thread_Mutex.cpp') diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp index af80f4bfbfd..f95fdaf0939 100644 --- a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp +++ b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp @@ -78,7 +78,7 @@ ACE_Condition::wait (ACE_Recursive_Thread_Mutex &mut // returned with the lock held, but waiters primed and waiting to be // released. At cond_wait below, the mutex will be released. // On return, it will be reacquired. - const int result = abstime == 0 + int const result = abstime == 0 ? ACE_OS::cond_wait (&this->cond_, &mutex.get_nesting_mutex ()) : ACE_OS::cond_timedwait (&this->cond_, -- cgit v1.2.1