diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2000-02-03 19:35:34 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2000-02-03 19:35:34 +0000 |
| commit | 39d4083504f5c082fa802b9d649f993faf12e2ed (patch) | |
| tree | 25a33f25b143d74d173d1accc22687efff08e4c3 /ace | |
| parent | 2bd4922a634630e7ad256e5277651e02ae245f95 (diff) | |
| download | ATCD-39d4083504f5c082fa802b9d649f993faf12e2ed.tar.gz | |
ChangeLogTag:Thu Feb 3 11:38:15 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/OS.cpp | 3 | ||||
| -rw-r--r-- | ace/OS.i | 5 | ||||
| -rw-r--r-- | ace/Synch.cpp | 8 |
3 files changed, 12 insertions, 4 deletions
diff --git a/ace/OS.cpp b/ace/OS.cpp index bdb658d518d..4a0211da5c6 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -2999,7 +2999,8 @@ ACE_OS::thr_create (ACE_THR_FUNC func, ACE_OS::memset ((void *) &sparam, 0, sizeof sparam); # if defined (ACE_HAS_IRIX62_THREADS) - sparam.sched_priority = ACE_MIN (priority, PTHREAD_MAX_PRIORITY); + sparam.sched_priority = ACE_MIN (priority, + (long) PTHREAD_MAX_PRIORITY); # elif defined (PTHREAD_MAX_PRIORITY) && !defined(ACE_HAS_PTHREADS_STD) /* For MIT pthreads... */ sparam.prio = ACE_MIN (priority, PTHREAD_MAX_PRIORITY); @@ -2800,7 +2800,10 @@ ACE_OS::recursive_mutex_init (ACE_recursive_thread_mutex_t *m, #else if (ACE_OS::thread_mutex_init (&m->nesting_mutex_, 0, name, arg) == -1) return -1; - else if (ACE_OS::cond_init (&m->lock_available_, USYNC_THREAD, name, arg) == -1) + else if (ACE_OS::cond_init (&m->lock_available_, + (short) USYNC_THREAD, + name, + arg) == -1) return -1; else { diff --git a/ace/Synch.cpp b/ace/Synch.cpp index 62de2450ca6..c95c5eb62a5 100644 --- a/ace/Synch.cpp +++ b/ace/Synch.cpp @@ -749,8 +749,12 @@ ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex (const ACE_Thread_Mutex & #endif /* ACE_HAS_FSU_PTHREADS */ // ACE_TRACE ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex"); - if (ACE_OS::cond_init (&this->cond_, USYNC_THREAD, name, arg) != 0) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), + if (ACE_OS::cond_init (&this->cond_, + (short) USYNC_THREAD, + name, + arg) != 0) + ACE_ERROR ((LM_ERROR, + ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex"))); } |