diff options
Diffstat (limited to 'ace/String_Base.cpp')
-rw-r--r-- | ace/String_Base.cpp | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/ace/String_Base.cpp b/ace/String_Base.cpp index d5f065938d7..5aefdddbc75 100644 --- a/ace/String_Base.cpp +++ b/ace/String_Base.cpp @@ -1,3 +1,5 @@ +// $Id$ + #ifndef ACE_STRING_BASE_CPP #define ACE_STRING_BASE_CPP @@ -11,11 +13,7 @@ #include "ace/String_Base.inl" #endif /* __ACE_INLINE__ */ - -ACE_RCSID (ace, - String_Base, - "$Id$") - +ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_String_Base) @@ -294,6 +292,16 @@ ACE_String_Base<CHAR>::clear (int release) // Assignment operator (does copy memory). template <class CHAR> ACE_String_Base<CHAR> & +ACE_String_Base<CHAR>::operator= (const CHAR *s) +{ + ACE_TRACE ("ACE_String_Base<CHAR>::operator="); + if (s != 0) + this->set (s, 1); + return *this; +} + +// Assignment operator (does copy memory). +template <class CHAR> ACE_String_Base<CHAR> & ACE_String_Base<CHAR>::operator= (const ACE_String_Base<CHAR> &s) { ACE_TRACE ("ACE_String_Base<CHAR>::operator="); @@ -353,10 +361,10 @@ template <class CHAR> int ACE_String_Base<CHAR>::compare (const ACE_String_Base<CHAR> &s) const { ACE_TRACE ("ACE_String_Base<CHAR>::compare"); - + if (this->rep_ == s.rep_) return 0; - + // Pick smaller of the two lengths and perform the comparison. size_t smaller_length = ace_min (this->len_, s.len_); @@ -477,7 +485,7 @@ ACE_String_Base<CHAR>::operator+= (const CHAR* s) size_t slen = 0; if (s != 0) slen = ACE_OS::strlen (s); - return this->append(s, slen); + return this->append (s, slen); } template <class CHAR> ACE_String_Base<CHAR> & @@ -495,5 +503,6 @@ ACE_String_Base<CHAR>::operator+= (const CHAR c) return this->append(&c, slen); } +ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_STRING_BASE_CPP */ |