diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-07 07:35:29 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-07 07:35:29 +0000 |
| commit | d04b6a4c8347c1bcc42999eb765ce8d6edb04a83 (patch) | |
| tree | ddf3354d0187dcc475754c4c6d15f7ffe9c54665 | |
| parent | 7d3e2e5ceee3f249b2f04e73387d7df2d77154ee (diff) | |
| download | ATCD-d04b6a4c8347c1bcc42999eb765ce8d6edb04a83.tar.gz | |
ChangeLogTag: Thu Apr 6 19:15:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ace/Token.cpp | 8 | ||||
| -rw-r--r-- | ace/Token.inl | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/ace/Token.cpp b/ace/Token.cpp index b3ce7b031c8..e373a078027 100644 --- a/ace/Token.cpp +++ b/ace/Token.cpp @@ -4,6 +4,10 @@ ACE_RCSID(ace, Token, "$Id$") +#if !defined (__ACE_INLINE__) +#include "ace/Token.inl" +#endif /* __ACE_INLINE__ */ + #if defined (ACE_HAS_THREADS) #include "ace/Thread.h" @@ -14,10 +18,6 @@ ACE_RCSID(ace, Token, "$Id$") #include "ace/streams.h" #endif /* DEBUGGING */ -#if !defined (__ACE_INLINE__) -#include "ace/Token.inl" -#endif /* __ACE_INLINE__ */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Token) diff --git a/ace/Token.inl b/ace/Token.inl index 4ba04e9e55d..d375789fbd1 100644 --- a/ace/Token.inl +++ b/ace/Token.inl @@ -2,10 +2,11 @@ // // $Id$ -#include "ace/Guard_T.h" +#include "ace/config-macros.h" #if defined (ACE_HAS_THREADS) +#include "ace/Guard_T.h" #include "ace/Time_Value.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -44,7 +45,7 @@ ACE_Token::waiters (void) ACE_TRACE ("ACE_Token::waiters"); ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1); - int ret = this->waiters_; + int const ret = this->waiters_; return ret; } @@ -119,9 +120,9 @@ ACE_Token::ACE_Token_Queue_Entry::wait (ACE_Time_Value *timeout, ACE_Thread_Mute { #if defined (ACE_TOKEN_USES_SEMAPHORE) lock.release (); - int retv = (timeout == 0 ? - this->cv_.acquire () : - this->cv_.acquire (*timeout)); + int const retv = (timeout == 0 ? + this->cv_.acquire () : + this->cv_.acquire (*timeout)); lock.acquire (); return retv; #else @@ -172,3 +173,4 @@ ACE_Noop_Token::dump (void) const } ACE_END_VERSIONED_NAMESPACE_DECL + |