diff options
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/ace/String_Base.cpp | 8 | ||||
| -rw-r--r-- | ACE/ace/String_Base.h | 2 | ||||
| -rw-r--r-- | ACE/ace/String_Base.inl | 2 |
4 files changed, 13 insertions, 6 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index a4ef6b00991..11bf3d27dad 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Thu Mar 29 16:15:24 UTC 2007 Steve Huston <shuston@riverace.com> + + * ace/String_Base.h: Corrected comment. + * ace/String_Base.{cpp inl}: Corrected calls to set() which specified + 'release' as 1/0 instead of true/false. Thanks to Jeff Parsons for + pointing these out. + Thu Mar 29 15:46:19 UTC 2007 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> * examples/Misc/test_trace.cpp: Updated the documentation to diff --git a/ACE/ace/String_Base.cpp b/ACE/ace/String_Base.cpp index ac845437b57..12850c9c29a 100644 --- a/ACE/ace/String_Base.cpp +++ b/ACE/ace/String_Base.cpp @@ -62,7 +62,7 @@ ACE_String_Base<CHAR>::ACE_String_Base (CHAR c, { ACE_TRACE ("ACE_String_Base<CHAR>::ACE_String_Base"); - this->set (&c, 1, 1); + this->set (&c, 1, true); } // Constructor that actually copies memory. @@ -96,7 +96,7 @@ ACE_String_Base<CHAR>::ACE_String_Base (const ACE_String_Base<CHAR> &s) { ACE_TRACE ("ACE_String_Base<CHAR>::ACE_String_Base"); - this->set (s.rep_, s.len_, 1); + this->set (s.rep_, s.len_, true); } template <class CHAR> @@ -318,7 +318,7 @@ ACE_String_Base<CHAR>::operator= (const CHAR *s) { ACE_TRACE ("ACE_String_Base<CHAR>::operator="); if (s != 0) - this->set (s, 1); + this->set (s, true); return *this; } @@ -331,7 +331,7 @@ ACE_String_Base<CHAR>::operator= (const ACE_String_Base<CHAR> &s) // Check for self-assignment. if (this != &s) { - this->set (s.rep_, s.len_, 1); + this->set (s.rep_, s.len_, true); } return *this; diff --git a/ACE/ace/String_Base.h b/ACE/ace/String_Base.h index 2525a070ed0..85ef2755407 100644 --- a/ACE/ace/String_Base.h +++ b/ACE/ace/String_Base.h @@ -198,7 +198,7 @@ public: * existing one is not big enough to hold s. If the existing * buffer is big enough, then it will be used. This means that * set(*, 1) can be illegal when the string is constructed with a - * const char*. (e.g. ACE_String_Base("test", 0, 0)). + * const char*. (e.g. ACE_String_Base("test", 0, false)). * * if release == false then the s buffer is used directly, and any * existing buffer is destroyed. If s == 0 then it will _not_ be diff --git a/ACE/ace/String_Base.inl b/ACE/ace/String_Base.inl index e244cf4ed6d..28b5e824aa7 100644 --- a/ACE/ace/String_Base.inl +++ b/ACE/ace/String_Base.inl @@ -22,7 +22,7 @@ template <class CHAR> ACE_INLINE ACE_String_Base<CHAR> & ACE_String_Base<CHAR>::assign_nocopy (const ACE_String_Base<CHAR> &s) { ACE_TRACE ("ACE_String_Base<CHAR>::assign_nocopy"); - this->set (s.rep_, s.len_, 0); + this->set (s.rep_, s.len_, false); return *this; } |