diff options
Diffstat (limited to 'ace/String_Base.cpp')
| -rw-r--r-- | ace/String_Base.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ace/String_Base.cpp b/ace/String_Base.cpp index e695b941e45..eb599426850 100644 --- a/ace/String_Base.cpp +++ b/ace/String_Base.cpp @@ -5,7 +5,7 @@ #include "ace/Malloc_Base.h" #include "ace/String_Base.h" #include "ace/Auto_Ptr.h" -#include "ace/OS_String.h" +#include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) #include "ace/String_Base.i" @@ -43,7 +43,7 @@ ACE_String_Base<CHAR>::set (const CHAR *s, this->buf_len_ = new_buf_len; this->release_ = 1; this->len_ = len; - ACE_OS_String::memcpy (this->rep_, s, len * sizeof (CHAR)); + ACE_OS::memcpy (this->rep_, s, len * sizeof (CHAR)); // NUL terminate. this->rep_[len] = '\0'; } @@ -77,7 +77,7 @@ ACE_String_Base<CHAR>::set (const CHAR *s, } else { - ACE_OS_String::memcpy (this->rep_, s, len * sizeof (CHAR)); + ACE_OS::memcpy (this->rep_, s, len * sizeof (CHAR)); // NUL terminate. this->rep_[len] = 0; this->len_ = len; @@ -126,7 +126,7 @@ ACE_String_Base<CHAR>::operator+= (const ACE_String_Base<CHAR> &s) // case 1. No memory allocation needed. if (this->buf_len_ >= new_buf_len) // Copy in data from new string. - ACE_OS_String::memcpy (this->rep_ + this->len_, + ACE_OS::memcpy (this->rep_ + this->len_, s.rep_, s.len_ * sizeof (CHAR)); // case 2. Memory reallocation is needed @@ -140,11 +140,11 @@ ACE_String_Base<CHAR>::operator+= (const ACE_String_Base<CHAR> &s) *this); // Copy memory from old string into new string. - ACE_OS_String::memcpy (t, + ACE_OS::memcpy (t, this->rep_, this->len_ * sizeof (CHAR)); - ACE_OS_String::memcpy (t + this->len_, + ACE_OS::memcpy (t + this->len_, s.rep_, s.len_ * sizeof (CHAR)); @@ -189,7 +189,7 @@ ACE_String_Base<CHAR>::resize (size_t len, CHAR c) } this->len_ = 0; - ACE_OS_String::memset (this->rep_, + ACE_OS::memset (this->rep_, c, this->buf_len_ * sizeof (CHAR)); } |