diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-05-18 07:48:11 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-05-18 07:48:11 +0000 |
| commit | 1e118c5b16fb1a531e45139f72c8a3ac80ea3efe (patch) | |
| tree | 44f417984b3a21b8fa8bdc2ad508ed1355b5e8dc /ACE/ace/Condition_Recursive_Thread_Mutex.cpp | |
| parent | 81c296b19031abdeaf659e03c19f018963d9b33b (diff) | |
| download | ATCD-1e118c5b16fb1a531e45139f72c8a3ac80ea3efe.tar.gz | |
Mon May 18 07:48:05 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* 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
Diffstat (limited to 'ACE/ace/Condition_Recursive_Thread_Mutex.cpp')
| -rw-r--r-- | ACE/ace/Condition_Recursive_Thread_Mutex.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<ACE_Recursive_Thread_Mutex>::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_, |