diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-10-20 13:15:17 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-10-20 13:15:17 +0000 |
| commit | 22dac8adc505724abf7d1a4ac20c42d822aad890 (patch) | |
| tree | aae1ea5a0dc67fad284677243637937ac058abc2 | |
| parent | 664ed013e5a35a17ab8142d7d2be3c49ab456dbc (diff) | |
| download | ATCD-22dac8adc505724abf7d1a4ac20c42d822aad890.tar.gz | |
ChangeLogTag:Sun Oct 20 00:27:02 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | ace/String_Base.i | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3a4a210656d..b9d83da5179 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -37,9 +37,9 @@ Fri Oct 18 23:32:11 2002 Mayur Deshpande <mayur@ics.uci.edu> * examples/AMH/Sink_Server/Timer_Handler.cpp (handle_timeout): Changed the ResponseHandler to a _var instead of a _ptr. This - not only takes care of deleting the pointer in exceptional - circumstances but the code is also much cleaner. Thanks to Ossama - Othman <ossama.ece.uci.edu> for the tip and code-review. + not only takes care of deleting the pointer in exceptional + circumstances but the code is also much cleaner. Thanks to + Ossama Othman <ossama.ece.uci.edu> for the tip and code-review. Fri Oct 18 22:23:53 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu> diff --git a/ace/String_Base.i b/ace/String_Base.i index ca2817ac44e..4edc5206835 100644 --- a/ace/String_Base.i +++ b/ace/String_Base.i @@ -209,7 +209,7 @@ ACE_String_Base<CHAR>::operator== (const ACE_String_Base<CHAR> &s) const { ACE_TRACE ("ACE_String_Base<CHAR>::operator=="); - return compare(s) == 0; + return compare (s) == 0; } // Less than comparison operator. @@ -218,7 +218,7 @@ template <class CHAR> ACE_INLINE int ACE_String_Base<CHAR>::operator < (const ACE_String_Base<CHAR> &s) const { ACE_TRACE ("ACE_String_Base<CHAR>::operator <"); - return compare(s) < 0; + return compare (s) < 0; } // Greater than comparison operator. @@ -227,7 +227,7 @@ template <class CHAR> ACE_INLINE int ACE_String_Base<CHAR>::operator > (const ACE_String_Base &s) const { ACE_TRACE ("ACE_String_Base<CHAR>::operator >"); - return compare(s) > 0; + return compare (s) > 0; } @@ -246,16 +246,14 @@ ACE_String_Base<CHAR>::compare (const ACE_String_Base<CHAR> &s) const ACE_TRACE ("ACE_String_Base<CHAR>::compare"); // Pick smaller of the two lengths and perform the comparison. - size_t smaller_length = ace_min(this->len_,s.len_); + size_t smaller_length = ace_min (this->len_, s.len_); int result = ACE_OS::memcmp (this->rep_, s.rep_, smaller_length); if (!result) - { - result = this->len_ - s.len_; - } + result = this->len_ - s.len_; return result; } |