diff options
| author | Steve Huston <shuston@riverace.com> | 2015-03-17 19:46:29 -0400 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2015-03-17 19:46:29 -0400 |
| commit | a52f7499689baddd45d3cbb36f14525d12ff2be1 (patch) | |
| tree | 467e2b58f148a9bcbafee2c50be1e99ee74ee239 | |
| parent | 6518391f8ce12a3dfcadaf9b403a3029d512ede2 (diff) | |
| download | ATCD-BZ4201.tar.gz | |
Cast cond_init's type to select correct variant of the method; see Bugzilla #4201BZ4201
| -rw-r--r-- | ACE/ace/OS_NS_Thread.inl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index d9ea1e086b4..ff4a08251d1 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -1538,7 +1538,7 @@ ACE_OS::sema_init (ACE_sema_t *s, if (ACE_OS::mutex_init (&s->lock_, type, name, (ACE_mutexattr_t *) arg) == 0 && (attributes == 0 ? - ACE_OS::cond_init (&s->count_nonzero_, type, name, arg) : + ACE_OS::cond_init (&s->count_nonzero_, (short)type, name, arg) : ACE_OS::cond_init (&s->count_nonzero_, *attributes, name, arg)) == 0 && ACE_OS::mutex_lock (&s->lock_) == 0) { @@ -1759,7 +1759,7 @@ ACE_OS::sema_init (ACE_sema_t *s, if (ACE_OS::mutex_init (&s->lock_, type, name, (ACE_mutexattr_t *) arg) == 0 && (attributes == 0 ? - ACE_OS::cond_init (&s->count_nonzero_, type, name, arg) : + ACE_OS::cond_init (&s->count_nonzero_, (short)type, name, arg) : ACE_OS::cond_init (&s->count_nonzero_, *attributes, name, arg)) == 0 && ACE_OS::mutex_lock (&s->lock_) == 0) { |