diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-04-23 04:43:59 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-04-23 04:43:59 +0000 |
| commit | a7c03cabf931b077d70c6f80ec02c7728a429f49 (patch) | |
| tree | 61d38d262d43ac77fc2ad94c9e7e850cd5607622 /ace/CLASSIX | |
| parent | 2aa7b10780ad7c670f588dce4ec341351a0646aa (diff) | |
| download | ATCD-a7c03cabf931b077d70c6f80ec02c7728a429f49.tar.gz | |
ChangeLogTag:Sat Apr 22 20:53:11 2000 Darrell Brunsch <brunsch@uci.edu>
Diffstat (limited to 'ace/CLASSIX')
| -rw-r--r-- | ace/CLASSIX/CLASSIX_CLD_Connector.cpp | 2 | ||||
| -rw-r--r-- | ace/CLASSIX/CLASSIX_CO_Acceptor.cpp | 4 | ||||
| -rw-r--r-- | ace/CLASSIX/CLASSIX_Port.cpp | 4 | ||||
| -rw-r--r-- | ace/CLASSIX/CLASSIX_Port.h | 2 | ||||
| -rw-r--r-- | ace/CLASSIX/CLASSIX_Select_Reactor.cpp | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/ace/CLASSIX/CLASSIX_CLD_Connector.cpp b/ace/CLASSIX/CLASSIX_CLD_Connector.cpp index a054213561a..1baf897b75b 100644 --- a/ace/CLASSIX/CLASSIX_CLD_Connector.cpp +++ b/ace/CLASSIX/CLASSIX_CLD_Connector.cpp @@ -41,7 +41,7 @@ ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector ( reuse_addr, flags, perms, protocol_family, protocol) == -1) ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), ASYS_TEXT + ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector"))); } diff --git a/ace/CLASSIX/CLASSIX_CO_Acceptor.cpp b/ace/CLASSIX/CLASSIX_CO_Acceptor.cpp index 153bed23e49..b46d594c262 100644 --- a/ace/CLASSIX/CLASSIX_CO_Acceptor.cpp +++ b/ace/CLASSIX/CLASSIX_CO_Acceptor.cpp @@ -26,8 +26,8 @@ ACE_CLASSIX_CO_Acceptor::ACE_CLASSIX_CO_Acceptor (const ACE_Addr &local_sap, if (this->open (local_sap, reuse_addr, protocol_family, backlog, protocol, theReactor) == -1) ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_CLASSIX_CO_Acceptor"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_CLASSIX_CO_Acceptor"))); } // General purpose routine for performing server creation. diff --git a/ace/CLASSIX/CLASSIX_Port.cpp b/ace/CLASSIX/CLASSIX_Port.cpp index 7beb2a13ae6..9ed92a29fe1 100644 --- a/ace/CLASSIX/CLASSIX_Port.cpp +++ b/ace/CLASSIX/CLASSIX_Port.cpp @@ -108,9 +108,9 @@ ACE_CLASSIX_Port::operator =(ACE_Addr const& theAddr) } int -ACE_CLASSIX_Port::addr_to_string (ASYS_TCHAR s[], size_t) const +ACE_CLASSIX_Port::addr_to_string (ACE_TCHAR s[], size_t) const { - ACE_OS::sprintf (s, ASYS_TEXT ("%d:%d"), + ACE_OS::sprintf (s, ACE_TEXT ("%d:%d"), ASYS_WIDE_STRING (::agetId()), this->get_port_number ()); } diff --git a/ace/CLASSIX/CLASSIX_Port.h b/ace/CLASSIX/CLASSIX_Port.h index 65bb1745d18..94402bf16ca 100644 --- a/ace/CLASSIX/CLASSIX_Port.h +++ b/ace/CLASSIX/CLASSIX_Port.h @@ -78,7 +78,7 @@ public: /* -----------------------------------------------------*/ // = ACCESS - virtual int addr_to_string (ASYS_TCHAR addr[], size_t) const; + virtual int addr_to_string (ACE_TCHAR addr[], size_t) const; // Transform the current <ACE_CLASSIX_Port> address into string format, // which is in the form "actor-id:port-number" diff --git a/ace/CLASSIX/CLASSIX_Select_Reactor.cpp b/ace/CLASSIX/CLASSIX_Select_Reactor.cpp index 035c6219403..13716a5d351 100644 --- a/ace/CLASSIX/CLASSIX_Select_Reactor.cpp +++ b/ace/CLASSIX/CLASSIX_Select_Reactor.cpp @@ -165,7 +165,7 @@ ACE_CLASSIX_Select_Reactor_Notify::dump (void) const ACE_TRACE ("ACE_CLASSIX_Select_Reactor_Notify::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_CLASSIX_select_reactor_ = %x"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_CLASSIX_select_reactor_ = %x"), this->select_reactor_)); this->notification_sap_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -305,7 +305,7 @@ ACE_CLASSIX_Select_Reactor_Notify::handle_input (ACE_HANDLE handle) break; default: // Should we bail out if we get an invalid mask? - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("invalid mask = %d\n"), buffer.mask_)); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("invalid mask = %d\n"), buffer.mask_)); } if (result == -1) buffer.eh_->handle_close (ACE_INVALID_HANDLE, |