diff options
| author | Steve Huston <shuston@riverace.com> | 2015-03-17 19:46:29 -0400 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2015-03-18 13:46:14 -0400 |
| commit | 6500d0c5f78b0d5411fcd5797f1285baf6785414 (patch) | |
| tree | 3d53d6ea790bfec37fdde6039daebfa49d63000b | |
| parent | 55fef38cb0e5ea4130f0c9b0549a1e18c1640525 (diff) | |
| download | ATCD-6500d0c5f78b0d5411fcd5797f1285baf6785414.tar.gz | |
Cast cond_init's type to select correct variant of the method; see Bugzilla #4201
| -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 f7593d93be7..a8cd2633a44 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -1542,7 +1542,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) { |