diff options
Diffstat (limited to 'ace/Local_Name_Space.cpp')
| -rw-r--r-- | ace/Local_Name_Space.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ace/Local_Name_Space.cpp b/ace/Local_Name_Space.cpp index 2263d90cb46..1c58e14ae19 100644 --- a/ace/Local_Name_Space.cpp +++ b/ace/Local_Name_Space.cpp @@ -16,7 +16,7 @@ ACE_NS_String::~ACE_NS_String (void) delete [] this->rep_; } -ACE_WCHAR_T * +wchar_t * ACE_NS_String::fast_rep (void) const { ACE_TRACE ("ACE_NS_String::fast_rep"); @@ -27,7 +27,7 @@ ACE_NS_String::operator ACE_NS_WString () const { ACE_TRACE ("ACE_NS_String::operator ACE_NS_WString"); return ACE_NS_WString (this->rep_, - (this->len_ / sizeof (ACE_WCHAR_T)) - 1); + (this->len_ / sizeof (wchar_t)) - 1); } size_t @@ -42,7 +42,7 @@ ACE_NS_String::char_rep (void) const { ACE_TRACE ("ACE_NS_String::char_rep"); ACE_NS_WString w_string (this->rep_, - (this->len_ / sizeof (ACE_WCHAR_T)) - 1); + (this->len_ / sizeof (wchar_t)) - 1); return w_string.char_rep (); } @@ -55,7 +55,7 @@ ACE_NS_String::ACE_NS_String (void) } ACE_NS_String::ACE_NS_String (const ACE_NS_WString &s) - : len_ ((s.length () + 1) * sizeof (ACE_WCHAR_T)), + : len_ ((s.length () + 1) * sizeof (wchar_t)), rep_ (s.rep ()), delete_rep_ (1) { @@ -76,8 +76,8 @@ ACE_NS_String::strstr (const ACE_NS_String &s) const else { // They're smaller than we are... - const size_t len = (this->len_ - s.len_) / sizeof (ACE_WCHAR_T); - const size_t pat_len = s.len_ / sizeof (ACE_WCHAR_T) - 1; + const size_t len = (this->len_ - s.len_) / sizeof (wchar_t); + const size_t pat_len = s.len_ / sizeof (wchar_t) - 1; for (size_t i = 0; i <= len; ++i) { @@ -112,8 +112,8 @@ ACE_NS_String::operator != (const ACE_NS_String &s) const return !this->operator == (s); } -ACE_NS_String::ACE_NS_String (ACE_WCHAR_T *dst, - const ACE_WCHAR_T *src, +ACE_NS_String::ACE_NS_String (wchar_t *dst, + const wchar_t *src, size_t bytes) : len_ (bytes), rep_ (dst), @@ -127,7 +127,7 @@ u_long ACE_NS_String::hash (void) const { return ACE::hash_pjw - (reinterpret_cast<char *> (const_cast<ACE_WCHAR_T *> (this->rep_)), + (reinterpret_cast<char *> (const_cast<wchar_t *> (this->rep_)), this->len_); } |