diff options
| author | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-05-08 23:00:05 +0000 |
|---|---|---|
| committer | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-05-08 23:00:05 +0000 |
| commit | d1160e68b1301a8b0e120ba8da56bb2e7d4fb49e (patch) | |
| tree | cf04398acb7ad9fb45311eb105d60975028bbc03 /ace/Name_Request_Reply.cpp | |
| parent | 1c3dd540264435be21072a3a69a8a8e969bd2b1a (diff) | |
| download | ATCD-d1160e68b1301a8b0e120ba8da56bb2e7d4fb49e.tar.gz | |
Fri May 5 14:33:29 UTC 2006 Ciju John <john_c@ociweb.com>oci_wchar_refactor_post_1_5_1_branch
Diffstat (limited to 'ace/Name_Request_Reply.cpp')
| -rw-r--r-- | ace/Name_Request_Reply.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ace/Name_Request_Reply.cpp b/ace/Name_Request_Reply.cpp index f92bbf3c15d..7cee855d644 100644 --- a/ace/Name_Request_Reply.cpp +++ b/ace/Name_Request_Reply.cpp @@ -21,9 +21,9 @@ ACE_Name_Request::ACE_Name_Request (void) ACE_Name_Request::ACE_Name_Request ( ACE_INT32 t, // Type of request. - const ACE_WCHAR_T name[], // Name + const wchar_t name[], // Name const ACE_UINT32 name_length, // size in bytes - const ACE_WCHAR_T value[], // + const wchar_t value[], // const ACE_UINT32 value_length, // size in bytes const char type[], // const ACE_UINT32 type_length, // size in bytes @@ -52,8 +52,8 @@ ACE_Name_Request::ACE_Name_Request ( // Set up pointers and copy name value and type into request. this->name_ = this->transfer_.data_; - this->value_ = &this->name_[name_length / sizeof (ACE_WCHAR_T) ]; - this->type_ = (char *)(&this->value_[value_length / sizeof (ACE_WCHAR_T)]); // + this->value_ = &this->name_[name_length / sizeof (wchar_t) ]; + this->type_ = (char *)(&this->value_[value_length / sizeof (wchar_t)]); // (void) ACE_OS::memcpy (this->name_, name, @@ -199,7 +199,7 @@ ACE_Name_Request::timeout (const ACE_Time_Value timeout) // = Set/get the name -const ACE_WCHAR_T * +const wchar_t * ACE_Name_Request::name (void) const { ACE_TRACE ("ACE_Name_Request::name"); @@ -207,7 +207,7 @@ ACE_Name_Request::name (void) const } void -ACE_Name_Request::name (const ACE_WCHAR_T *t) +ACE_Name_Request::name (const wchar_t *t) { ACE_TRACE ("ACE_Name_Request::name"); (void) ACE_OS::memcpy (this->name_, @@ -217,7 +217,7 @@ ACE_Name_Request::name (const ACE_WCHAR_T *t) // = Set/get the value -const ACE_WCHAR_T * +const wchar_t * ACE_Name_Request::value (void) const { ACE_TRACE ("ACE_Name_Request::value"); @@ -225,7 +225,7 @@ ACE_Name_Request::value (void) const } void -ACE_Name_Request::value (const ACE_WCHAR_T *c) +ACE_Name_Request::value (const wchar_t *c) { ACE_TRACE ("ACE_Name_Request::value"); @@ -265,7 +265,7 @@ ACE_Name_Request::encode (void *&buf) size_t nv_data_len = (this->transfer_.name_len_ + this->transfer_.value_len_) - / sizeof (ACE_WCHAR_T); + / sizeof (wchar_t); for (size_t i = 0; i < nv_data_len; i++) this->transfer_.data_[i] = @@ -303,15 +303,15 @@ ACE_Name_Request::decode (void) size_t nv_data_len = (this->transfer_.name_len_ + this->transfer_.value_len_) - / sizeof (ACE_WCHAR_T); + / sizeof (wchar_t); for (size_t i = 0; i < nv_data_len; i++) this->transfer_.data_[i] = ntohs (this->transfer_.data_[i]); this->name_ = this->transfer_.data_; - this->value_ = &this->name_[this->transfer_.name_len_ / sizeof (ACE_WCHAR_T)]; - this->type_ = (char *)(&this->value_[this->transfer_.value_len_ / sizeof (ACE_WCHAR_T)]); + this->value_ = &this->name_[this->transfer_.name_len_ / sizeof (wchar_t)]; + this->type_ = (char *)(&this->value_[this->transfer_.value_len_ / sizeof (wchar_t)]); this->type_[this->transfer_.type_len_] = '\0'; // Decode the variable-sized portion. |