diff options
Diffstat (limited to 'ACE/ace/Local_Tokens.inl')
| -rw-r--r-- | ACE/ace/Local_Tokens.inl | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/ACE/ace/Local_Tokens.inl b/ACE/ace/Local_Tokens.inl index 23dc5d86796..a57ca96344b 100644 --- a/ACE/ace/Local_Tokens.inl +++ b/ACE/ace/Local_Tokens.inl @@ -6,7 +6,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // ************************************************************ ACE_INLINE int -ACE_Token_Proxy_Queue::size (void) +ACE_Token_Proxy_Queue::size () { ACE_TRACE ("ACE_Token_Proxy_Queue::size"); return this->size_; @@ -15,7 +15,7 @@ ACE_Token_Proxy_Queue::size (void) // ************************************************************ ACE_INLINE int -ACE_TPQ_Entry::waiting (void) const +ACE_TPQ_Entry::waiting () const { ACE_TRACE ("ACE_TPQ_Entry::waiting"); return waiting_; @@ -29,14 +29,14 @@ ACE_TPQ_Entry::waiting (int v) } ACE_INLINE const ACE_TCHAR * -ACE_TPQ_Entry::client_id (void) const +ACE_TPQ_Entry::client_id () const { ACE_TRACE ("ACE_TPQ_Entry::client_id"); return this->client_id_; } ACE_INLINE ACE_Token_Proxy * -ACE_TPQ_Entry::proxy (void) const +ACE_TPQ_Entry::proxy () const { ACE_TRACE ("ACE_TPQ_Entry::proxy"); return this->proxy_; @@ -49,16 +49,6 @@ ACE_TPQ_Entry::proxy (ACE_Token_Proxy *proxy) this->proxy_ = proxy; } -ACE_INLINE -ACE_TPQ_Iterator::~ACE_TPQ_Iterator (void) -{ -} - -ACE_INLINE -ACE_Token_Proxy_Queue::~ACE_Token_Proxy_Queue (void) -{ -} - ACE_INLINE void ACE_Tokens::remove (ACE_TPQ_Entry *caller) { @@ -96,8 +86,6 @@ ACE_Token_Proxy_Queue::head (void) } // ************************************************** -// ************************************************** -// ************************************************** ACE_INLINE void ACE_Tokens::visit (int v) @@ -140,7 +128,7 @@ ACE_Tokens::name (void) // ************************************************************ ACE_INLINE int -ACE_TPQ_Entry::nesting_level (void) const +ACE_TPQ_Entry::nesting_level () const { ACE_TRACE ("ACE_TPQ_Entry::nesting_level"); return this->nesting_level_; @@ -154,7 +142,7 @@ ACE_TPQ_Entry::nesting_level (int delta) } ACE_INLINE ACE_TPQ_Entry::PTVF -ACE_TPQ_Entry::sleep_hook (void) const +ACE_TPQ_Entry::sleep_hook () const { ACE_TRACE ("ACE_TPQ_Entry::sleep_hook"); return this->sleep_hook_; @@ -188,8 +176,6 @@ ACE_TPQ_Entry::equal_client_id (const ACE_TCHAR *id) } // ************************************************************ -// ************************************************************ -// ************************************************************ ACE_INLINE ACE_Local_Mutex::ACE_Local_Mutex (const ACE_TCHAR *token_name, @@ -252,10 +238,10 @@ ACE_INLINE void ACE_Token_Name::operator= (const ACE_Token_Name &rhs) { ACE_TRACE ("ACE_Token_Name::operator="); - if (&rhs == this) - return; - else + if (&rhs != this) + { this->name (rhs.name ()); + } } ACE_INLINE bool |