diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 | ||||
| -rw-r--r-- | ace/SString.i | 34 |
4 files changed, 32 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog index 37f1a073b4c..e9d9794d0de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Apr 11 08:04:21 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/SString.i (operator+): Fixed an "inlined before use" warning. + Thanks to Bala for reporting this. + Tue Apr 10 16:58:54 2001 Ossama Othman <ossama@uci.edu> * ace/OS.h (ACE_DEFAULT_FILE_PERMS, ACE_DEFAULT_DIR_PERMS): diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 37f1a073b4c..e9d9794d0de 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Wed Apr 11 08:04:21 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/SString.i (operator+): Fixed an "inlined before use" warning. + Thanks to Bala for reporting this. + Tue Apr 10 16:58:54 2001 Ossama Othman <ossama@uci.edu> * ace/OS.h (ACE_DEFAULT_FILE_PERMS, ACE_DEFAULT_DIR_PERMS): diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 37f1a073b4c..e9d9794d0de 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Wed Apr 11 08:04:21 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/SString.i (operator+): Fixed an "inlined before use" warning. + Thanks to Bala for reporting this. + Tue Apr 10 16:58:54 2001 Ossama Othman <ossama@uci.edu> * ace/OS.h (ACE_DEFAULT_FILE_PERMS, ACE_DEFAULT_DIR_PERMS): diff --git a/ace/SString.i b/ace/SString.i index a90b9e9de00..c5c42f254c5 100644 --- a/ace/SString.i +++ b/ace/SString.i @@ -312,16 +312,6 @@ ACE_CString::hash (void) const return ACE::hash_pjw (this->rep_, this->len_); } -ACE_INLINE ACE_WString -operator+ (const ACE_WString &s, - const ACE_WString &t) -{ - ACE_WString temp (s.length() + t.length()); - temp = s; - temp += t; - return temp; -} - ACE_INLINE ACE_CString operator+ (const ACE_CString &s, const ACE_CString &t) { @@ -499,6 +489,23 @@ ACE_SString::length (void) const return this->len_; } +ACE_INLINE size_t +ACE_WString::length (void) const +{ + ACE_TRACE ("ACE_WString::length"); + return this->len_; +} + +ACE_INLINE ACE_WString +operator+ (const ACE_WString &s, + const ACE_WString &t) +{ + ACE_WString temp (s.length () + t.length ()); + temp = s; + temp += t; + return temp; +} + ACE_INLINE ACE_WString ACE_WString::substr (size_t offset, ssize_t length) const @@ -678,13 +685,6 @@ ACE_WString::rfind (ACE_WSTRING_TYPE c, int pos) const } ACE_INLINE size_t -ACE_WString::length (void) const -{ - ACE_TRACE ("ACE_WString::length"); - return this->len_; -} - -ACE_INLINE size_t ACE_WString::buffer_size(void) const { ACE_TRACE ("ACE_WString::buffer_size"); |