diff options
Diffstat (limited to 'protocols/ace/HTBP')
-rw-r--r-- | protocols/ace/HTBP/HTBP_Addr.cpp | 2 | ||||
-rw-r--r-- | protocols/ace/HTBP/HTBP_ID_Requestor.cpp | 6 | ||||
-rw-r--r-- | protocols/ace/HTBP/HTBP_Session.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/protocols/ace/HTBP/HTBP_Addr.cpp b/protocols/ace/HTBP/HTBP_Addr.cpp index aff894e80dc..1ee03ce991d 100644 --- a/protocols/ace/HTBP/HTBP_Addr.cpp +++ b/protocols/ace/HTBP/HTBP_Addr.cpp @@ -76,7 +76,7 @@ ACE::HTBP::Addr::addr_to_string (ACE_TCHAR buffer[], if (size < htid_.length()) return -1; ACE_OS::strncpy (buffer, - ACE_TEXT_CHAR_TO_TCHAR(htid_.c_str()), + ACE_TEXT_TO_TCHAR_IN(htid_.c_str()), size); return 0; } diff --git a/protocols/ace/HTBP/HTBP_ID_Requestor.cpp b/protocols/ace/HTBP/HTBP_ID_Requestor.cpp index d46b16d0e3b..85e2931c0ec 100644 --- a/protocols/ace/HTBP/HTBP_ID_Requestor.cpp +++ b/protocols/ace/HTBP/HTBP_ID_Requestor.cpp @@ -83,7 +83,7 @@ ACE::HTBP::ID_Requestor::send_request (ACE_SOCK_Stream *cli_stream) char *buffer; ACE_NEW_RETURN (buffer, char[this->url_.length()+16],-1); ACE_OS::sprintf (buffer,"GET %s HTTP/1.0\n\n", - ACE_TEXT_ALWAYS_CHAR(url_.c_str())); + ACE_TEXT_TO_CHAR_IN(url_.c_str())); int result = cli_stream->send_n (buffer,ACE_OS::strlen(buffer)); delete [] buffer; if (result == -1) @@ -114,7 +114,7 @@ ACE::HTBP::ID_Requestor::get_HTID () ACE_Utils::UUID_Generator gen; ACE_Utils::UUID *uuid = gen.generateUUID (); const ACE_CString *uuidstr = uuid->to_string(); - ACE::HTBP::ID_Requestor::htid_ = ACE_TEXT_CHAR_TO_TCHAR (uuidstr->c_str()); + ACE::HTBP::ID_Requestor::htid_ = ACE_TEXT_TO_TCHAR_IN (uuidstr->c_str()); delete uuid; return ACE::HTBP::ID_Requestor::htid_.rep(); } @@ -130,7 +130,7 @@ ACE::HTBP::ID_Requestor::get_HTID () start = 0; else start++; - ACE::HTBP::ID_Requestor::htid_ = ACE_TEXT_CHAR_TO_TCHAR(answer.substr (start).c_str()); + ACE::HTBP::ID_Requestor::htid_ = ACE_TEXT_TO_TCHAR_IN(answer.substr (start).c_str()); htid = ACE::HTBP::ID_Requestor::htid_.rep(); } return htid; diff --git a/protocols/ace/HTBP/HTBP_Session.cpp b/protocols/ace/HTBP/HTBP_Session.cpp index f2bae3fde73..37e7258f3b7 100644 --- a/protocols/ace/HTBP/HTBP_Session.cpp +++ b/protocols/ace/HTBP/HTBP_Session.cpp @@ -70,7 +70,7 @@ ACE::HTBP::Session::Session (void) { ACE::HTBP::ID_Requestor req; ACE_TCHAR * htid = req.get_HTID(); - session_id_.local_ = ACE_TEXT_ALWAYS_CHAR(htid); + session_id_.local_ = ACE_TEXT_TO_CHAR_IN(htid); delete[] htid; session_id_.id_ = ACE::HTBP::Session::next_session_id(); ACE_NEW (inbound_, ACE::HTBP::Channel (this)); |