diff options
| author | Steve Huston <shuston@riverace.com> | 2015-03-18 14:14:34 -0400 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2015-03-18 14:14:34 -0400 |
| commit | 0dfa07f0471ac06250e49f3ea29eb3753672acd1 (patch) | |
| tree | 02405c1f67b10160966d07a438b6a56fd548d2a7 /ACE/ace | |
| parent | c12af3769bc14539926f221d8dfde806adeb9301 (diff) | |
| parent | d1b42dcaf555f131c009fd26585fe093a2fc5e83 (diff) | |
| download | ATCD-0dfa07f0471ac06250e49f3ea29eb3753672acd1.tar.gz | |
Merge branch 'master' of https://github.com/DOCGroup/ATCD
Diffstat (limited to 'ACE/ace')
| -rw-r--r-- | ACE/ace/OS_NS_Thread.inl | 4 | ||||
| -rw-r--r-- | ACE/ace/SSL/SSL_Context.cpp | 2 |
2 files changed, 3 insertions, 3 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) { diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index 1dfaf5cbed1..56de6f04b94 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -423,7 +423,7 @@ ACE_SSL_Context::check_host (const ACE_INET_Addr &host, SSL *peerssl) if (ACE::debug ()) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SSL_Context::check_host ") ACE_TEXT ("name <%s> returns %d, peer <%s>\n"), name, result, peer)); |