diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-03-12 22:28:40 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-03-12 22:28:40 +0000 |
| commit | f7f7b07dcccaea361887e068223e366f60e670bc (patch) | |
| tree | 4683b14230e715d8206d8c64afdebbebbfcbacc1 | |
| parent | a03612133f85ac33e239e617695edf46fa4f932b (diff) | |
| download | ATCD-f7f7b07dcccaea361887e068223e366f60e670bc.tar.gz | |
Regular CE stuff.
74 files changed, 381 insertions, 381 deletions
diff --git a/ace/ACE.cpp b/ace/ACE.cpp index 9aecb09ec56..cd183d83d5f 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -2133,7 +2133,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, s = ACE_OS::socket (AF_INET, SOCK_STREAM, 0); if (s == ACE_INVALID_HANDLE) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_OS::socket"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_OS::socket")), -1); struct ifconf ifc; char buf[BUFSIZ]; @@ -2453,7 +2453,7 @@ ACE::get_ip_interfaces (size_t &count, ACE_HANDLE handle = get_handle(); // call specific routine as necessary if (handle == ACE_INVALID_HANDLE) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE::get_ip_interfaces:open"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE::get_ip_interfaces:open")), -1); if (ACE::count_interfaces (handle, num_ifs)) { @@ -2485,7 +2485,7 @@ ACE::get_ip_interfaces (size_t &count, if (ACE_OS::ioctl (handle, SIOCGIFCONF, (caddr_t) &ifcfg) == -1) { ACE_OS::close (handle); - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "is_address_local:ioctl - SIOCGIFCONF failed"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("is_address_local:ioctl - SIOCGIFCONF failed")), -1); } ACE_OS::close (handle); diff --git a/ace/ARGV.cpp b/ace/ARGV.cpp index 76ed3b856a1..0f1a68141b0 100644 --- a/ace/ARGV.cpp +++ b/ace/ARGV.cpp @@ -18,13 +18,13 @@ ACE_ARGV::dump (void) const ACE_TRACE ("ACE_ARGV::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "argc_ = %d", this->argc_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("argc_ = %d"), this->argc_)); for (size_t i = 0; i < this->argc_; i++) - ACE_DEBUG ((LM_DEBUG, "\nargv_[%i] = %s", i, this->argv_[i])); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nargv_[%i] = %s"), i, this->argv_[i])); - ACE_DEBUG ((LM_DEBUG, "\nbuf = %s\n", this->buf_)); - ACE_DEBUG ((LM_DEBUG, "\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nbuf = %s\n"), this->buf_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp index f4ca1897623..4f8005bbf9b 100644 --- a/ace/Acceptor.cpp +++ b/ace/Acceptor.cpp @@ -93,7 +93,7 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Acceptor { ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Acceptor"); if (this->open (addr, reactor, flags) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Acceptor::ACE_Acceptor")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Acceptor::ACE_Acceptor"))); } template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> @@ -313,12 +313,12 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene SVC_HANDLER *svc_handler = 0; if (this->make_svc_handler (svc_handler) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "make_svc_handler"), 0); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("make_svc_handler")), 0); // Accept connection into the Svc_Handler. else if (this->accept_svc_handler (svc_handler) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "accept_svc_handler"), 0); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("accept_svc_handler")), 0); // Activate the <svc_handler> using the designated concurrency // strategy (note that this method becomes responsible for @@ -326,7 +326,7 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene // awry...). else if (this->activate_svc_handler (svc_handler) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "activate_svc_handler"), 0); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("activate_svc_handler")), 0); conn_handle.set_bit (listener); } @@ -370,16 +370,16 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (); this->creation_strategy_->dump (); - ACE_DEBUG ((LM_DEBUG, "delete_creation_strategy_ = %d", delete_creation_strategy_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("delete_creation_strategy_ = %d"), delete_creation_strategy_)); this->accept_strategy_->dump (); - ACE_DEBUG ((LM_DEBUG, "delete_accept_strategy_ = %d", delete_accept_strategy_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("delete_accept_strategy_ = %d"), delete_accept_strategy_)); this->concurrency_strategy_->dump (); - ACE_DEBUG ((LM_DEBUG, "delete_concurrency_strategy_ = %d", delete_concurrency_strategy_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("delete_concurrency_strategy_ = %d"), delete_concurrency_strategy_)); this->scheduling_strategy_->dump (); - ACE_DEBUG ((LM_DEBUG, "delete_scheduling_strategy_ = %d", delete_scheduling_strategy_)); - ACE_DEBUG ((LM_DEBUG, "\nservice_name_ = %s", this->service_name_)); - ACE_DEBUG ((LM_DEBUG, "\nservice_description_ = %s", this->service_description_)); - ACE_DEBUG ((LM_DEBUG, "\nservice_port_ = %d", this->service_port_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("delete_scheduling_strategy_ = %d"), delete_scheduling_strategy_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nservice_name_ = %s"), this->service_name_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nservice_description_ = %s"), this->service_description_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nservice_port_ = %d"), this->service_port_)); this->service_addr_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -527,7 +527,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor if (this->open (addr, reactor, cre_s, acc_s, con_s, sch_s, service_name, service_description) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Strategy_Acceptor::ACE_Strategy_Acceptor")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Strategy_Acceptor::ACE_Strategy_Acceptor"))); } // Perform termination activities when <this> is removed from the @@ -682,10 +682,10 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "\nsvc_handler_ = %x", this->svc_handler_)); - ACE_DEBUG ((LM_DEBUG, "\nrestart_ = %d", this->restart_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nsvc_handler_ = %x"), this->svc_handler_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nrestart_ = %d"), this->restart_)); this->peer_acceptor_.dump (); - ACE_DEBUG ((LM_DEBUG, "delete_concurrency_strategy_ = %d", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("delete_concurrency_strategy_ = %d"), delete_concurrency_strategy_)); this->concurrency_strategy_->dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); diff --git a/ace/Activation_Queue.cpp b/ace/Activation_Queue.cpp index 0544075fc6f..31c6a36aaab 100644 --- a/ace/Activation_Queue.cpp +++ b/ace/Activation_Queue.cpp @@ -18,7 +18,7 @@ ACE_Activation_Queue::dump (void) const if (this->queue_) this->queue_->dump(); else - ACE_DEBUG ((LM_DEBUG,"(NULL)\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(NULL)\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Asynch_Acceptor.cpp b/ace/Asynch_Acceptor.cpp index fa35e846246..4f5e918d044 100644 --- a/ace/Asynch_Acceptor.cpp +++ b/ace/Asynch_Acceptor.cpp @@ -45,14 +45,14 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, // Create the listener socket this->listen_handle_ = ACE_OS::socket (PF_INET, SOCK_STREAM, 0); if (this->listen_handle_ == ACE_INVALID_HANDLE) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_OS::socket"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_OS::socket")), -1); // Initialize the ACE_Asynch_Accept if (this->asynch_accept_.open (*this, this->listen_handle_, 0, this->proactor ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Asynch_Accept::open"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Asynch_Accept::open")), -1); if (reuse_addr) { @@ -63,14 +63,14 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, SO_REUSEADDR, (const char*) &one, sizeof one) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_OS::setsockopt"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_OS::setsockopt")), -1); } // If port is not specified, bind to any port. static ACE_INET_Addr sa ((const ACE_INET_Addr &) ACE_Addr::sap_any); if (address == sa && ACE::bind_port (this->listen_handle_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE::bind_port"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE::bind_port")), -1); // Bind to the specified port. if (ACE_OS::bind (this->listen_handle_, @@ -113,7 +113,7 @@ ACE_Asynch_Acceptor<HANDLER>::accept (size_t bytes_to_read) { // Cleanup on error message_block->release (); - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Asynch_Accept::accept"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Asynch_Accept::accept")), -1); } return 0; } @@ -136,7 +136,7 @@ ACE_Asynch_Acceptor<HANDLER>::handle_accept (const ACE_Asynch_Accept::Result &re SO_UPDATE_ACCEPT_CONTEXT, (char *) &this->listen_handle_, sizeof (this->listen_handle_)) == -1) - ACE_ERROR ((LM_ERROR, "%p", "ACE_OS::setsockopt")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p"), ASYS_TEXT ("ACE_OS::setsockopt"))); // The Template method HANDLER *new_handler = this->make_handler (); @@ -163,7 +163,7 @@ ACE_Asynch_Acceptor<HANDLER>::handle_accept (const ACE_Asynch_Accept::Result &re { // Close the accept handle ACE_OS::closesocket (result.accept_handle ()); - ACE_ERROR ((LM_ERROR, "%p\n", "Asynchronous Accept")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("Asynchronous Accept"))); } // Delete the dynamically allocated message_block diff --git a/ace/Asynch_IO.cpp b/ace/Asynch_IO.cpp index e07959feb92..2035e4bb5eb 100644 --- a/ace/Asynch_IO.cpp +++ b/ace/Asynch_IO.cpp @@ -195,7 +195,7 @@ ACE_Asynch_Read_Stream::shared_read (ACE_Asynch_Read_Stream::Result *result) // Cleanup dynamically allocated Asynch_Result delete result; - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ReadFile"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ReadFile")), -1); } } @@ -306,7 +306,7 @@ ACE_Asynch_Write_Stream::shared_write (ACE_Asynch_Write_Stream::Result *result) // Cleanup dynamically allocated Asynch_Result delete result; - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "WriteFile"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("WriteFile")), -1); } } @@ -510,7 +510,7 @@ ACE_Asynch_Accept::accept (ACE_Message_Block &message_block, SOCK_STREAM, 0); if (accept_handle == ACE_INVALID_HANDLE) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_OS::socket"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_OS::socket")), -1); else // Remember to close the socket down if failures occur. close_accept_handle = 1; @@ -562,7 +562,7 @@ ACE_Asynch_Accept::accept (ACE_Message_Block &message_block, // Cleanup dynamically allocated Asynch_Result delete result; - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ReadFile"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ReadFile")), -1); } #else ACE_NOTSUP_RETURN (-1); @@ -693,7 +693,7 @@ ACE_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, // Cleanup dynamically allocated Asynch_Result delete result; - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "TransmitFile"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("TransmitFile")), -1); } #else ACE_NOTSUP_RETURN (-1); @@ -1006,14 +1006,14 @@ ACE_Service_Handler::addresses (const ACE_INET_Addr &remote_address, // Default behavior is to print out the addresses. char local_address_buf[BUFSIZ], remote_address_buf[BUFSIZ]; if (local_address.addr_to_string (local_address_buf, sizeof local_address_buf) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "can't obtain local_address's address string")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("can't obtain local_address's address string"))); if (remote_address.addr_to_string (remote_address_buf, sizeof remote_address_buf) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "can't obtain remote_address's address string")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("can't obtain remote_address's address string"))); - ACE_DEBUG ((LM_DEBUG, "On fd %d\n", this->handle ())); - ACE_DEBUG ((LM_DEBUG, "local address %s\n", local_address_buf)); - ACE_DEBUG ((LM_DEBUG, "remote address %s\n", remote_address_buf)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("On fd %d\n"), this->handle ())); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("local address %s\n"), local_address_buf)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("remote address %s\n"), remote_address_buf)); } void diff --git a/ace/CORBA_Handler.cpp b/ace/CORBA_Handler.cpp index 78a52743fc5..a88c2cf7ef3 100644 --- a/ace/CORBA_Handler.cpp +++ b/ace/CORBA_Handler.cpp @@ -24,7 +24,7 @@ ACE_CORBA_Handler::dump (void) const ACE_TRACE ("ACE_CORBA_Handler::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "\nreference_count_ = %d", this->reference_count_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nreference_count_ = %d"), this->reference_count_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -47,8 +47,8 @@ ACE_ST_CORBA_Handler::dump (void) const ACE_CORBA_Handler::dump (); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "instance_ = %x", this->instance_)); - ACE_DEBUG ((LM_DEBUG, "\niteration_ = %d", this->iterations_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("instance_ = %x"), this->instance_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\niteration_ = %d"), this->iterations_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -74,14 +74,14 @@ void ACE_ST_CORBA_Handler::insert_handle (ACE_HANDLE handle) { ACE_TRACE ("ACE_ST_CORBA_Handler::insert_handle"); -// ACE_DEBUG ((LM_DEBUG, "+++ inserting %d\n", handle)); +// ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("+++ inserting %d\n"), handle)); if (ACE_ST_CORBA_Handler::instance_->reactor() != 0) ACE_ST_CORBA_Handler::instance_->reactor()->register_handler (handle, ACE_ST_CORBA_Handler::instance_, ACE_Event_Handler::READ_MASK); else ; -// ACE_DEBUG ((LM_DEBUG, "insert_handle: reactor NULL\n")); +// ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("insert_handle: reactor NULL\n"))); } // Remove a descriptor from the ACE_Reactor that Orbix has just deleted. @@ -91,14 +91,14 @@ void ACE_ST_CORBA_Handler::remove_handle (ACE_HANDLE handle) { ACE_TRACE ("ACE_ST_CORBA_Handler::remove_handle"); -// ACE_DEBUG ((LM_DEBUG, "--- removing %d\n", handle)); +// ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("--- removing %d\n"), handle)); if (ACE_ST_CORBA_Handler::instance_->reactor () != 0) ACE_ST_CORBA_Handler::instance_->reactor ()->remove_handler (handle, ACE_Event_Handler::READ_MASK | ACE_Event_Handler::DONT_CALL); else ; -// ACE_DEBUG ((LM_DEBUG, "remove_handle: reactor NULL\n")); +// ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("remove_handle: reactor NULL\n"))); } // Process the next Orbix event. @@ -287,7 +287,7 @@ ACE_CORBA_Handler::deactivate_service (const char *service_name, if (ref_count < 0) ; -// ACE_DEBUG ((LM_DEBUG, "warning, reference count == %d\n", +// ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("warning, reference count == %d\n"), // ref_count)); return 0; } @@ -354,8 +354,8 @@ ACE_MT_CORBA_Handler::dump (void) const ACE_TRACE ("ACE_MT_CORBA_Handler::dump"); ACE_CORBA_Handler::dump (); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "instance_ = %x", this->instance_)); - ACE_DEBUG ((LM_DEBUG, "\nthr_mgr_ = %x", this->thr_mgr_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("instance_ = %x"), this->instance_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_)); this->pipe_.dump (); ACE_MT (ACE_Thread_Mutex *lock = ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object diff --git a/ace/Connector.cpp b/ace/Connector.cpp index ead333fe37a..600ccc10713 100644 --- a/ace/Connector.cpp +++ b/ace/Connector.cpp @@ -21,8 +21,8 @@ ACE_Connector<SH, PR_CO_2>::dump (void) const ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "\nclosing_ = %d", this->closing_)); - ACE_DEBUG ((LM_DEBUG, "\nflags_ = %d", this->flags_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nclosing_ = %d"), this->closing_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nflags_ = %d"), this->flags_)); this->handler_map_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -180,9 +180,9 @@ ACE_Svc_Tuple<SH>::dump (void) const ACE_TRACE ("ACE_Svc_Tuple<SH>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "svc_handler_ = %x", this->svc_handler_)); - ACE_DEBUG ((LM_DEBUG, "\narg_ = %x", this->arg_)); - ACE_DEBUG ((LM_DEBUG, "\ncancellation_id_ = %d", this->cancellation_id_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("svc_handler_ = %x"), this->svc_handler_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\narg_ = %x"), this->arg_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ncancellation_id_ = %d"), this->cancellation_id_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -739,7 +739,7 @@ ACE_Strategy_Connector<SH, PR_CO_2>::ACE_Strategy_Connector ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::ACE_Connector"); if (this->open (reactor, cre_s, conn_s, con_s, flags) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Strategy_Connector::ACE_Strategy_Connector")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Strategy_Connector::ACE_Strategy_Connector"))); } template <class SH, PR_CO_1> diff --git a/ace/Containers.cpp b/ace/Containers.cpp index 9dac5939d22..e6e218c043a 100644 --- a/ace/Containers.cpp +++ b/ace/Containers.cpp @@ -372,9 +372,9 @@ ACE_Unbounded_Queue<T>::dump (void) const // ACE_TRACE ("ACE_Unbounded_Queue<T>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "\nhead_ = %u", this->head_)); - ACE_DEBUG ((LM_DEBUG, "\nhead_->next_ = %u", this->head_->next_)); - ACE_DEBUG ((LM_DEBUG, "\ncur_size_ = %d\n", this->cur_size_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nhead_ = %u"), this->head_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); T *item = 0; size_t count = 1; @@ -382,7 +382,7 @@ ACE_Unbounded_Queue<T>::dump (void) const for (ACE_Unbounded_Queue_Iterator<T> iter (*(ACE_Unbounded_Queue<T> *) this); iter.next (item) != 0; iter.advance ()) - ACE_DEBUG ((LM_DEBUG, "count = %d\n", count++)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("count = %d\n"), count++)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -1443,9 +1443,9 @@ ACE_Unbounded_Set<T>::dump (void) const ACE_TRACE ("ACE_Unbounded_Set<T>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "\nhead_ = %u", this->head_)); - ACE_DEBUG ((LM_DEBUG, "\nhead_->next_ = %u", this->head_->next_)); - ACE_DEBUG ((LM_DEBUG, "\ncur_size_ = %d\n", this->cur_size_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nhead_ = %u"), this->head_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); T *item = 0; size_t count = 1; @@ -1453,7 +1453,7 @@ ACE_Unbounded_Set<T>::dump (void) const for (ACE_Unbounded_Set_Iterator<T> iter (*(ACE_Unbounded_Set<T> *) this); iter.next (item) != 0; iter.advance ()) - ACE_DEBUG ((LM_DEBUG, "count = %d\n", count++)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("count = %d\n"), count++)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -1910,9 +1910,9 @@ ACE_Ordered_MultiSet<T>::dump (void) const // ACE_TRACE ("ACE_Ordered_MultiSet<T>::dump"); // // ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); -// ACE_DEBUG ((LM_DEBUG, "\nhead_ = %u", this->head_)); -// ACE_DEBUG ((LM_DEBUG, "\nhead_->next_ = %u", this->head_->next_)); -// ACE_DEBUG ((LM_DEBUG, "\ncur_size_ = %d\n", this->cur_size_)); +// ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nhead_ = %u"), this->head_)); +// ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); +// ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); // // T *item = 0; // size_t count = 1; @@ -1920,7 +1920,7 @@ ACE_Ordered_MultiSet<T>::dump (void) const // for (ACE_Ordered_MultiSet_Iterator<T> iter (*(ACE_Ordered_MultiSet<T> *) this); // iter.next (item) != 0; // iter.advance ()) -// ACE_DEBUG ((LM_DEBUG, "count = %d\n", count++)); +// ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("count = %d\n"), count++)); // // ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/DEV_Addr.cpp b/ace/DEV_Addr.cpp index 67f8d3611fd..4ae6211ae74 100644 --- a/ace/DEV_Addr.cpp +++ b/ace/DEV_Addr.cpp @@ -16,7 +16,7 @@ ACE_DEV_Addr::dump (void) const ACE_TRACE ("ACE_DEV_Addr::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "devname_ = %s", this->devname_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("devname_ = %s"), this->devname_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Dynamic_Service.cpp b/ace/Dynamic_Service.cpp index 1d8300ae28d..59fec3d5eab 100644 --- a/ace/Dynamic_Service.cpp +++ b/ace/Dynamic_Service.cpp @@ -15,7 +15,7 @@ ACE_Dynamic_Service<SERVICE>::dump (void) const ACE_TRACE ("ACE_Dynamic_Service<SERVICE>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -28,12 +28,12 @@ ACE_Dynamic_Service<SERVICE>::instance (const char *name) const ACE_Service_Type *svc_rec; if (ACE_Service_Repository::instance ()->find (name, &svc_rec) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "svc_rep"), 0); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("svc_rep")), 0); const ACE_Service_Type_Impl *type = svc_rec->type (); if (type == 0) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "type"), 0); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("type")), 0); else { const void *obj = type->object (); diff --git a/ace/FIFO.cpp b/ace/FIFO.cpp index bd6ca63c695..fc13b43c007 100644 --- a/ace/FIFO.cpp +++ b/ace/FIFO.cpp @@ -18,7 +18,7 @@ ACE_FIFO::dump (void) const ACE_TRACE ("ACE_FIFO::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "rendezvous_ = %s", this->rendezvous_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("rendezvous_ = %s"), this->rendezvous_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -45,7 +45,7 @@ ACE_FIFO::ACE_FIFO (const char *fifo_name, { ACE_TRACE ("ACE_FIFO::ACE_FIFO"); if (this->open (fifo_name, flags, perms, sa) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_FIFO")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_FIFO"))); } ACE_FIFO::ACE_FIFO (void) diff --git a/ace/FIFO_Recv.cpp b/ace/FIFO_Recv.cpp index cfa7ae5e99a..ac32c059296 100644 --- a/ace/FIFO_Recv.cpp +++ b/ace/FIFO_Recv.cpp @@ -14,7 +14,7 @@ ACE_FIFO_Recv::dump (void) const ACE_TRACE ("ACE_FIFO_Recv::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_FIFO::dump (); - ACE_DEBUG ((LM_DEBUG, "aux_handle_ = %d", this->aux_handle_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("aux_handle_ = %d"), this->aux_handle_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -74,6 +74,6 @@ ACE_FIFO_Recv::ACE_FIFO_Recv (const char *fifo_name, perms, persistent, sa) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_FIFO_Recv")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_FIFO_Recv"))); } diff --git a/ace/FIFO_Recv_Msg.cpp b/ace/FIFO_Recv_Msg.cpp index 3cfc8d8f682..eca87670fd2 100644 --- a/ace/FIFO_Recv_Msg.cpp +++ b/ace/FIFO_Recv_Msg.cpp @@ -53,5 +53,5 @@ ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (const char *fifo_name, perms, persistent, sa) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_FIFO_Recv_Msg")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_FIFO_Recv_Msg"))); } diff --git a/ace/FIFO_Send.cpp b/ace/FIFO_Send.cpp index e1c3d67fdbf..394f6042f91 100644 --- a/ace/FIFO_Send.cpp +++ b/ace/FIFO_Send.cpp @@ -33,5 +33,5 @@ ACE_FIFO_Send::ACE_FIFO_Send (const char *fifo_name, int flags, int perms, { ACE_TRACE ("ACE_FIFO_Send::ACE_FIFO_Send"); if (this->ACE_FIFO_Send::open (fifo_name, flags, perms, sa) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_FIFO_Send::ACE_FIFO_Send")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_FIFO_Send::ACE_FIFO_Send"))); } diff --git a/ace/FIFO_Send_Msg.cpp b/ace/FIFO_Send_Msg.cpp index 272462d9527..2baf4e95dab 100644 --- a/ace/FIFO_Send_Msg.cpp +++ b/ace/FIFO_Send_Msg.cpp @@ -59,5 +59,5 @@ ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg (const char *fifo_name, { ACE_TRACE ("ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg"); if (this->ACE_FIFO_Send_Msg::open (fifo_name, flags, perms, sa) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_FIFO_Send_Msg")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_FIFO_Send_Msg"))); } diff --git a/ace/FILE_Addr.cpp b/ace/FILE_Addr.cpp index 9d28f0e3d02..29095b31577 100644 --- a/ace/FILE_Addr.cpp +++ b/ace/FILE_Addr.cpp @@ -92,6 +92,6 @@ ACE_FILE_Addr::dump (void) const ACE_TRACE ("ACE_FILE_Addr::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "filename_ = %s", this->filename_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("filename_ = %s"), this->filename_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/FILE_Connector.cpp b/ace/FILE_Connector.cpp index c6b738b1a4f..2e23a94747b 100644 --- a/ace/FILE_Connector.cpp +++ b/ace/FILE_Connector.cpp @@ -12,7 +12,7 @@ ACE_FILE_Connector::dump (void) const ACE_TRACE ("ACE_FILE_Connector::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Filecache.cpp b/ace/Filecache.cpp index d316188286f..58087d8000e 100644 --- a/ace/Filecache.cpp +++ b/ace/Filecache.cpp @@ -225,7 +225,7 @@ ACE_Filecache::insert_i (const char *filename, ACE_Filecache_Object (filename, filelock, 0, mapit), 0); - ACE_DEBUG ((LM_DEBUG, " (%t) CVF: creating %s\n", filename)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%t) CVF: creating %s\n"), filename)); if (this->hash_.bind (filename, handle) == -1) { @@ -277,7 +277,7 @@ ACE_Filecache::update_i (const char *filename, ACE_Filecache_Object (filename, filelock, 0, mapit), 0); - ACE_DEBUG ((LM_DEBUG, " (%t) CVF: creating %s\n", filename)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%t) CVF: creating %s\n"), filename)); if (this->hash_.bind (filename, handle) == -1) { @@ -295,7 +295,7 @@ ACE_Filecache::update_i (const char *filename, ACE_Filecache_Object (filename, filelock, 0, mapit), 0); - ACE_DEBUG ((LM_DEBUG, " (%t) CVF: updating %s\n", filename)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%t) CVF: updating %s\n"), filename)); if (this->hash_.bind (filename, handle) == -1) { @@ -352,7 +352,7 @@ ACE_Filecache::fetch (const char *filename, int mapit) if (handle) filelock.acquire_read (); } - ACE_DEBUG ((LM_DEBUG, " (%t) CVF: found %s\n", filename)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%t) CVF: found %s\n"), filename)); } return handle; diff --git a/ace/Future.cpp b/ace/Future.cpp index 0b269abd850..740afbb415c 100644 --- a/ace/Future.cpp +++ b/ace/Future.cpp @@ -21,9 +21,9 @@ ACE_Future_Rep<T>::dump (void) const (int) this->ref_count_)); ACE_DEBUG ((LM_INFO,"value_: \n")); if (this->value_) - ACE_DEBUG ((LM_DEBUG," (NON-NULL)\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (NON-NULL)\n"))); else - ACE_DEBUG ((LM_DEBUG," (NULL)\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (NULL)\n"))); ACE_DEBUG ((LM_INFO,"value_ready_: \n")); this->value_ready_.dump (); @@ -196,7 +196,7 @@ template <class T> ACE_Future<T>::ACE_Future (const T &r) : future_rep_ (FUTURE_REP::create ()) { - ACE_DEBUG ((LM_DEBUG," (%t) funny constructor\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%t) funny constructor\n"))); this->future_rep_->set (r); } diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp index f644dde3d5b..91be671ef0e 100644 --- a/ace/Get_Opt.cpp +++ b/ace/Get_Opt.cpp @@ -65,7 +65,7 @@ ACE_Get_Opt::dump (void) const ACE_TRACE ("ACE_Get_Opt::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Hash_Map_Manager.cpp b/ace/Hash_Map_Manager.cpp index dd01c03e120..9556cdae860 100644 --- a/ace/Hash_Map_Manager.cpp +++ b/ace/Hash_Map_Manager.cpp @@ -49,8 +49,8 @@ template <class EXT_ID, class INT_ID> void ACE_Hash_Map_Entry<EXT_ID, INT_ID>::dump (void) const { ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "next_ = %d", this->next_)); - ACE_DEBUG ((LM_DEBUG, "prev_ = %d", this->prev_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("next_ = %d"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("prev_ = %d"), this->prev_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -58,8 +58,8 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> void ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const { ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "total_size_ = %d", this->total_size_)); - ACE_DEBUG ((LM_DEBUG, "\ncur_size_ = %d", this->cur_size_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("total_size_ = %d"), this->total_size_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ncur_size_ = %d"), this->cur_size_)); this->allocator_->dump (); this->lock_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -570,8 +570,8 @@ ACE_Hash_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const ACE_TRACE ("ACE_Hash_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "index_ = %d ", this->index_)); - ACE_DEBUG ((LM_DEBUG, "next_ = %x", this->next_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("index_ = %d "), this->index_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("next_ = %x"), this->next_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -890,7 +890,7 @@ ACE_Hash_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const { ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "next_ = %d", this->next_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("next_ = %d"), this->next_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/LSOCK.cpp b/ace/LSOCK.cpp index f65035e5607..886fdb2763a 100644 --- a/ace/LSOCK.cpp +++ b/ace/LSOCK.cpp @@ -13,7 +13,7 @@ ACE_LSOCK::dump (void) const ACE_TRACE ("ACE_LSOCK::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "aux_handle_ = %d", this->aux_handle_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("aux_handle_ = %d"), this->aux_handle_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/LSOCK_CODgram.cpp b/ace/LSOCK_CODgram.cpp index 7fa0d7f43dc..b84b1e64edc 100644 --- a/ace/LSOCK_CODgram.cpp +++ b/ace/LSOCK_CODgram.cpp @@ -45,6 +45,6 @@ ACE_LSOCK_CODgram::ACE_LSOCK_CODgram (const ACE_Addr &remote, ACE_TRACE ("ACE_LSOCK_CODgram::ACE_LSOCK_CODgram"); if (this->open (remote, local, protocol_family, protocol) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_LSOCK_CODgram")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_LSOCK_CODgram"))); } #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ diff --git a/ace/LSOCK_Connector.cpp b/ace/LSOCK_Connector.cpp index 07c1317d341..ba85fa8039b 100644 --- a/ace/LSOCK_Connector.cpp +++ b/ace/LSOCK_Connector.cpp @@ -17,7 +17,7 @@ ACE_LSOCK_Connector::dump (void) const ACE_TRACE ("ACE_LSOCK_Connector::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/LSOCK_Dgram.cpp b/ace/LSOCK_Dgram.cpp index 7699b1f1e8b..eb734719bdb 100644 --- a/ace/LSOCK_Dgram.cpp +++ b/ace/LSOCK_Dgram.cpp @@ -50,7 +50,7 @@ ACE_LSOCK_Dgram::ACE_LSOCK_Dgram (const ACE_Addr &local, ACE_TRACE ("ACE_LSOCK_Dgram::ACE_LSOCK_Dgram"); if (this->open (local, protocol_family, protocol) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_LSOCK_Dgram")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_LSOCK_Dgram"))); } #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ diff --git a/ace/Local_Name_Space_T.cpp b/ace/Local_Name_Space_T.cpp index 2b7a6850d49..5e8545f79b8 100644 --- a/ace/Local_Name_Space_T.cpp +++ b/ace/Local_Name_Space_T.cpp @@ -339,7 +339,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Local_Name_Space (ACE_Naming { ACE_TRACE ("ACE_Local_Name_Space::ACE_Local_Name_Space"); if (this->open (scope_in) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Local_Name_Space::ACE_Local_Name_Space")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Local_Name_Space::ACE_Local_Name_Space"))); } template <ACE_MEM_POOL_1, class ACE_LOCK> @@ -438,7 +438,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) if (this->allocator_->find (ACE_NAME_SERVER_MAP, ns_map) == 0) { this->name_space_map_ = (ACE_Name_Space_Map <ALLOCATOR> *) ns_map; - ACE_DEBUG ((LM_DEBUG, "name_space_map_ = %d, ns_map = %d\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("name_space_map_ = %d, ns_map = %d\n"), this->name_space_map_, ns_map)); } @@ -453,7 +453,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) if (this->allocator_->find (ACE_NAME_SERVER_MAP, ns_map) == 0) { this->name_space_map_ = (ACE_Name_Space_Map <ALLOCATOR> *) ns_map; - ACE_DEBUG ((LM_DEBUG, "name_space_map_ = %d, ns_map = %d\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("name_space_map_ = %d, ns_map = %d\n"), this->name_space_map_, ns_map)); } else @@ -470,7 +470,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) ACE_ERROR_RETURN ((LM_ERROR, "create_manager\n"), -1); } - ACE_DEBUG ((LM_DEBUG, "name_space_map_ = %d, ns_map = %d\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("name_space_map_ = %d, ns_map = %d\n"), this->name_space_map_, ns_map)); } @@ -741,7 +741,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump_i (void) const char *value = map_entry->int_id_.value ().char_rep (); const char *type = map_entry->int_id_.type (); - ACE_DEBUG ((LM_DEBUG, "key=%s\nvalue=%s\ntype=%s\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("key=%s\nvalue=%s\ntype=%s\n"), key, value, type)); // We need to delete key and value since char_rep allocates memory for them delete [] key; diff --git a/ace/Local_Tokens.cpp b/ace/Local_Tokens.cpp index 755ef5cb0cf..ee17b45ed7a 100644 --- a/ace/Local_Tokens.cpp +++ b/ace/Local_Tokens.cpp @@ -15,11 +15,11 @@ ACE_Tokens::dump (void) const { ACE_TRACE ("ACE_Tokens::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "ACE_Tokens::dump:\n" + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Tokens::dump:\n") " reference_cont_ = %d\n" " token_name_ = %s\n", reference_count_, token_name_)); - ACE_DEBUG ((LM_DEBUG, "waiters_\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("waiters_\n"))); this->waiters_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -57,11 +57,11 @@ ACE_TPQ_Entry::dump (void) const if (next_ != 0) { - ACE_DEBUG ((LM_DEBUG, "next:.\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("next:.\n"))); next_->dump (); } - ACE_DEBUG ((LM_DEBUG, "ACE_TPQ_Entry::dump end.\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_TPQ_Entry::dump end.\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -154,10 +154,10 @@ ACE_TSS_TPQ_Entry::dump (void) const { ACE_TRACE ("ACE_TSS_TPQ_Entry::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "ACE_TSS_TPQ_Entry::dump:\n" + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_TSS_TPQ_Entry::dump:\n") " client_id_ = %s\n", client_id_ == 0 ? "0" : client_id_)); - ACE_DEBUG ((LM_DEBUG, "base:\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base:\n"))); ACE_TPQ_ENTRY::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -228,10 +228,10 @@ ACE_TPQ_Iterator::dump (void) const { ACE_TRACE ("ACE_TPQ_Iterator::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "ACE_TPQ_Iterator::dump:\n" + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_TPQ_Iterator::dump:\n") " current_ = %d\n", (long) this->current_)); - ACE_DEBUG ((LM_DEBUG, "head_ and tail_\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("head_ and tail_\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -244,14 +244,14 @@ ACE_Token_Proxy_Queue::dump (void) const { ACE_TRACE ("ACE_Token_Proxy_Queue::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "ACE_Token_Proxy_Queue::dump:\n" + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Token_Proxy_Queue::dump:\n") " size_ = %d\n", size_)); - ACE_DEBUG ((LM_DEBUG, "head_ and tail_\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("head_ and tail_\n"))); if (this->head_ != 0) this->head_->dump (); - ACE_DEBUG ((LM_DEBUG, "ACE_Token_Proxy_Queue::dump end.\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Token_Proxy_Queue::dump end.\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -404,12 +404,12 @@ ACE_Mutex_Token::dump (void) const { ACE_TRACE ("ACE_Mutex_Token::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "ACE_Mutex_Token::dump:\n")); - ACE_DEBUG ((LM_DEBUG, "lock_\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Mutex_Token::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("lock_\n"))); lock_.dump (); - ACE_DEBUG ((LM_DEBUG, "base:\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base:\n"))); ACE_Tokens::dump (); - ACE_DEBUG ((LM_DEBUG, "ACE_Mutex_Token::dump end.\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Mutex_Token::dump end.\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -643,13 +643,13 @@ ACE_RW_Token::dump (void) const { ACE_TRACE ("ACE_RW_Token::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "ACE_RW_Token::dump:\n" + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_RW_Token::dump:\n") "num_writers_ = %d\n", num_writers_)); - ACE_DEBUG ((LM_DEBUG, "lock_\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("lock_\n"))); this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, "base:\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base:\n"))); ACE_Tokens::dump (); - ACE_DEBUG ((LM_DEBUG, "ACE_RW_Token::dump end.\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_RW_Token::dump end.\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -1026,18 +1026,18 @@ ACE_Token_Proxy::dump (void) const { ACE_TRACE ("ACE_Token_Proxy::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "ACE_Token_Proxy::dump:\n" + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Token_Proxy::dump:\n") " type = %d\n" " ignore_deadlock_ = %d\n" " debug_ = %d\n", (int) this->type (), ignore_deadlock_, debug_)); - ACE_DEBUG ((LM_DEBUG, "mutex_, and waiter_\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("mutex_, and waiter_\n"))); if (this->token_ != 0) this->token_->dump (); this->waiter_.dump (); - ACE_DEBUG ((LM_DEBUG, "ACE_Token_Proxy::dump end.\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Token_Proxy::dump end.\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -1206,7 +1206,7 @@ ACE_Token_Proxy::acquire (int notify, // we have the token { if (debug_) - ACE_DEBUG ((LM_DEBUG, "(%t) acquired %s\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) acquired %s\n"), this->name ())); waiter_->cond_var_.mutex ().release (); } @@ -1252,7 +1252,7 @@ ACE_Token_Proxy::renew (int requeue_position, "%p renew failed\n", "ACE_Token_Proxy"), -1); if (this->debug_) - ACE_DEBUG ((LM_DEBUG, "(%t) renew blocking for %s, owner is %s\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) renew blocking for %s, owner is %s\n"), this->name (), token_->owner_id ())); @@ -1263,7 +1263,7 @@ ACE_Token_Proxy::renew (int requeue_position, // we have the token { if (this->debug_) - ACE_DEBUG ((LM_DEBUG, "(%t) renewed %s\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) renewed %s\n"), this->name ())); waiter_->cond_var_.mutex ().release (); return 0; @@ -1306,7 +1306,7 @@ ACE_Token_Proxy::handle_options (ACE_Synch_Options &options, } if (this->debug_) - ACE_DEBUG ((LM_DEBUG, "(%t) unblocking.\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) unblocking.\n"), this->client_id ())); cv.mutex ().release (); return 0; // operation succeeded @@ -1322,7 +1322,7 @@ ACE_Token_Proxy::release (ACE_Synch_Options &) { errno = ENOENT; if (debug_) - ACE_DEBUG ((LM_DEBUG, "Must open before releasing.\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Must open before releasing.\n"))); ACE_RETURN (-1); } @@ -1331,13 +1331,13 @@ ACE_Token_Proxy::release (ACE_Synch_Options &) // Release failed. this->token_->remove (this->waiter_); if (debug_) - ACE_DEBUG ((LM_DEBUG, "(%t) %p.\n", "release failed")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) %p.\n"), "release failed")); return -1; } else { if (this->debug_) - ACE_DEBUG ((LM_DEBUG, "(%t) released %s, owner is %s\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) released %s, owner is %s\n"), this->name (), token_->owner_id ())); @@ -1399,7 +1399,7 @@ ACE_Token_Name::dump (void) const { ACE_TRACE ("ACE_Token_Name::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "ACE_Token_Name::dump:\n" + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Token_Name::dump:\n") " token_name_ = %s\n", token_name_ == 0 ? "no name" : token_name_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); diff --git a/ace/Local_Tokens.i b/ace/Local_Tokens.i index a1e70bc9e9a..09edb613ddc 100644 --- a/ace/Local_Tokens.i +++ b/ace/Local_Tokens.i @@ -101,7 +101,7 @@ ACE_Tokens::dec_reference (void) ACE_TRACE ("ACE_Tokens::dec_reference"); if (this->reference_count_ == 0) { - ACE_DEBUG ((LM_DEBUG, "dec_reference already zero")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("dec_reference already zero"))); return 0; } diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp index 45f2c3b220a..9d470dc8a85 100644 --- a/ace/Malloc_T.cpp +++ b/ace/Malloc_T.cpp @@ -135,7 +135,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::open (void) rounded_bytes, first_time); if (this->cb_ptr_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "init_acquire failed"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("init_acquire failed")), -1); else if (first_time) { // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("(%P|%t) first time in, control block = %u\n"), this->cb_ptr_)); @@ -307,7 +307,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_malloc (size_t nbytes) currp = this->cb_ptr_->freep_; } else - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "malloc"), 0); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("malloc")), 0); } } } diff --git a/ace/Map_Manager.cpp b/ace/Map_Manager.cpp index 3be42fbfa63..35cdf0be0cb 100644 --- a/ace/Map_Manager.cpp +++ b/ace/Map_Manager.cpp @@ -27,7 +27,7 @@ ACE_Map_Entry<EXT_ID, INT_ID>::dump (void) const ACE_TRACE ("ACE_Map_Entry<EXT_ID, INT_ID>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "is_free_ = %d", this->is_free_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("is_free_ = %d"), this->is_free_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -39,8 +39,8 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const ACE_TRACE ("ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "total_size_ = %d", this->total_size_)); - ACE_DEBUG ((LM_DEBUG, "\ncur_size_ = %d", this->cur_size_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("total_size_ = %d"), this->total_size_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ncur_size_ = %d"), this->cur_size_)); this->allocator_->dump (); this->lock_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -587,7 +587,7 @@ ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const ACE_TRACE ("ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "next_ = %d", this->next_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("next_ = %d"), this->next_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Mem_Map.cpp b/ace/Mem_Map.cpp index 9f9763f6936..8fbdf9bd70e 100644 --- a/ace/Mem_Map.cpp +++ b/ace/Mem_Map.cpp @@ -17,12 +17,12 @@ ACE_Mem_Map::dump (void) const ACE_TRACE ("ACE_Mem_Map::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "base_addr_ = %x", this->base_addr_)); - ACE_DEBUG ((LM_DEBUG, "\nfilename_ = %s", this->filename_)); - ACE_DEBUG ((LM_DEBUG, "\nlength_ = %d", this->length_)); - ACE_DEBUG ((LM_DEBUG, "\nhandle_ = %d", this->handle_)); - ACE_DEBUG ((LM_DEBUG, "\nfile_mapping_ = %d", this->file_mapping_)); - ACE_DEBUG ((LM_DEBUG, "\nclose_handle_ = %d", this->close_handle_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base_addr_ = %x"), this->base_addr_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nfilename_ = %s"), this->filename_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nlength_ = %d"), this->length_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nhandle_ = %d"), this->handle_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nfile_mapping_ = %d"), this->file_mapping_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nclose_handle_ = %d"), this->close_handle_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -186,7 +186,7 @@ ACE_Mem_Map::ACE_Mem_Map (LPCTSTR file_name, { ACE_TRACE ("ACE_Mem_Map::ACE_Mem_Map"); if (this->map (file_name, len, flags, mode, prot, share, addr, pos, sa) < 0) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Mem_Map::ACE_Mem_Map")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Mem_Map::ACE_Mem_Map"))); } // Map a file from an open file descriptor HANDLE. This function will @@ -210,7 +210,7 @@ ACE_Mem_Map::ACE_Mem_Map (ACE_HANDLE handle, ACE_OS::memset (this->filename_, 0, sizeof this->filename_); if (this->map (handle, len, prot, share, addr, pos, sa) < 0) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Mem_Map::ACE_Mem_Map")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Mem_Map::ACE_Mem_Map"))); } // Close down and remove the file from the file system. diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp index 721be55956e..4ada616009e 100644 --- a/ace/Memory_Pool.cpp +++ b/ace/Memory_Pool.cpp @@ -28,14 +28,14 @@ ACE_Local_Memory_Pool::acquire (size_t nbytes, { ACE_TRACE ("ACE_Local_Memory_Pool::acquire"); rounded_bytes = this->round_up (nbytes); - // ACE_DEBUG ((LM_DEBUG, "(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n", nbytes, rounded_bytes)); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); void *cp = (void *) new char[rounded_bytes]; if (cp == 0) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %u\n", cp), 0); else - // ACE_DEBUG ((LM_DEBUG, "(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d, new break = %d\n", nbytes, rounded_bytes, cp)); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d, new break = %d\n"), nbytes, rounded_bytes, cp)); return cp; } @@ -279,19 +279,19 @@ ACE_MMAP_Memory_Pool::init_acquire (size_t nbytes, this->base_addr_, 0, this->sa_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), 0); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("open")), 0); return this->mmap_.addr (); } else - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), 0); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("open")), 0); } int ACE_MMAP_Memory_Pool::remap (void *addr) { ACE_TRACE ("ACE_MMAP_Memory_Pool::remap"); - ACE_DEBUG ((LM_DEBUG, "Remapping with fault address at: %X\n", addr)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Remapping with fault address at: %X\n"), addr)); off_t current_file_offset = ACE_OS::filesize (this->mmap_.handle ()); // ACE_OS::lseek (this->mmap_.handle (), 0, SEEK_END); @@ -341,9 +341,9 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t "(%P|%t) ignoring signal %S\n", signum), -1); else - ; // ACE_DEBUG ((LM_DEBUG, "(%P|%t) received %S\n", signum)); + ; // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) received %S\n"), signum)); - // ACE_DEBUG ((LM_DEBUG, "(%P|%t) new mapping address = %u\n", (char *) this->base_addr_ + current_file_offset)); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) new mapping address = %u\n"), (char *) this->base_addr_ + current_file_offset)); #if defined (ACE_HAS_SIGINFO_T) && !defined (ACE_LACKS_SI_ADDR) // Make sure that the pointer causing the problem is within the @@ -351,7 +351,7 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t if (siginfo != 0) { - // ACE_DEBUG ((LM_DEBUG, "(%P|%t) si_signo = %d, si_code = %d, addr = %u\n", siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); if (this->remap ((void *) siginfo->si_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) address %u out of range\n", siginfo->si_addr), -1); @@ -409,13 +409,13 @@ ACE_Sbrk_Memory_Pool::acquire (size_t nbytes, { ACE_TRACE ("ACE_Sbrk_Memory_Pool::acquire"); rounded_bytes = this->round_up (nbytes); - // ACE_DEBUG ((LM_DEBUG, "(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n", nbytes, rounded_bytes)); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); void *cp = ACE_OS::sbrk (rounded_bytes); if (cp == MAP_FAILED) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) cp = %u\n", cp), 0); else - // ACE_DEBUG ((LM_DEBUG, "(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d, new break = %u\n", nbytes, rounded_bytes, cp)); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d, new break = %u\n"), nbytes, rounded_bytes, cp)); return cp; } @@ -466,9 +466,9 @@ ACE_Shared_Memory_Pool::in_use (off_t &offset, counter++) { if (ACE_OS::shmctl (st[counter].shmid_, IPC_STAT, &buf) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "shmctl"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("shmctl")), -1); offset += buf.shm_segsz; - // ACE_DEBUG ((LM_DEBUG, "(%P|%t) segment size = %d, offset = %d\n", buf.shm_segsz, offset)); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); } return 0; @@ -489,7 +489,7 @@ ACE_Shared_Memory_Pool::find_seg (const void*const searchPtr, counter++) { if (ACE_OS::shmctl (st[counter].shmid_, IPC_STAT, &buf) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "shmctl"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("shmctl")), -1); offset += buf.shm_segsz; // If segment 'counter' starts at a location greater than the @@ -501,7 +501,7 @@ ACE_Shared_Memory_Pool::find_seg (const void*const searchPtr, offset -= buf.shm_segsz; return 0; } - // ACE_DEBUG ((LM_DEBUG, "(%P|%t) segment size = %d, offset = %d\n", buf.shm_segsz, offset)); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); } return 0; @@ -529,7 +529,7 @@ ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, rounded_bytes, this->file_perms_ | IPC_CREAT | IPC_EXCL); if (shmid == -1) - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "shmget"), 0); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("shmget")), 0); st[counter].shmid_ = shmid; st[counter].used_ = 1; @@ -550,7 +550,7 @@ int ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) { ACE_TRACE ("ACE_Shared_Memory_Pool::handle_signal"); - // ACE_DEBUG ((LM_DEBUG, "signal %S occurred\n", signum)); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("signal %S occurred\n"), signum)); #if defined (ACE_HAS_SIGINFO_T) && !defined (ACE_LACKS_SI_ADDR) off_t offset; @@ -559,10 +559,10 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) if (siginfo != 0) { - // ACE_DEBUG ((LM_DEBUG, "(%P|%t) si_signo = %d, si_code = %d, addr = %u\n", siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); size_t counter; if (this->in_use (offset, counter) == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "in_use")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("in_use"))); else if (!(siginfo->si_code == SEGV_MAPERR && siginfo->si_addr < (((char *) this->base_addr_) + offset) && siginfo->si_addr >= ((char *) this->base_addr_))) @@ -578,7 +578,7 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) size_t counter; // ret value to get shmid from the st table. if (this->find_seg (siginfo->si_addr, offset, counter) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "in_use"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("in_use")), -1); void *address = (void *) (((char *) this->base_addr_) + offset); SHM_TABLE *st = (SHM_TABLE *) this->base_addr_; @@ -638,7 +638,7 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool (LPCTSTR backing_store_name, this->base_shm_key_ = ACE_DEFAULT_SHM_KEY; if (this->signal_handler_.register_handler (SIGSEGV, this) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Sig_Handler::register_handler")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Sig_Handler::register_handler"))); } // Ask system for more shared memory. @@ -651,14 +651,14 @@ ACE_Shared_Memory_Pool::acquire (size_t nbytes, rounded_bytes = this->round_up (nbytes); - // ACE_DEBUG ((LM_DEBUG, "(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n", nbytes, rounded_bytes)); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); off_t offset; if (this->commit_backing_store_name (rounded_bytes, offset) == -1) return 0; - // ACE_DEBUG ((LM_DEBUG, "(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d\n", nbytes, rounded_bytes)); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); return ((char *) this->base_addr_) + offset; } @@ -685,14 +685,14 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes, if (shmid == -1) { if (errno != EEXIST) - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "shmget"), 0); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("shmget")), 0); first_time = 0; shmid = ACE_OS::shmget (this->base_shm_key_, 0, 0); if (shmid == -1) - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "shmget"), 0); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("shmget")), 0); // This implementation doesn't care if we don't get the key we want... this->base_addr_ = ACE_OS::shmat (shmid, (char *) this->base_addr_, 0); diff --git a/ace/Message_Queue.cpp b/ace/Message_Queue.cpp index 78928c28f75..a694ada59fb 100644 --- a/ace/Message_Queue.cpp +++ b/ace/Message_Queue.cpp @@ -121,9 +121,9 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dump (void) const this->cur_count_, this->head_, this->tail_)); - ACE_DEBUG ((LM_DEBUG,"not_full_cond: \n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("not_full_cond: \n"))); not_full_cond_.dump (); - ACE_DEBUG ((LM_DEBUG,"not_empty_cond: \n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("not_empty_cond: \n"))); not_empty_cond_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Module.cpp b/ace/Module.cpp index a65efe1e2e2..18a16b7841a 100644 --- a/ace/Module.cpp +++ b/ace/Module.cpp @@ -180,7 +180,7 @@ ACE_Module<ACE_SYNCH_USE>::ACE_Module (const char *mod_name, this->q_pair_[1] = 0; if (this->open (mod_name, writer_q, reader_q, args, flags) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Module")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Module"))); } template <ACE_SYNCH_DECL> int diff --git a/ace/Name_Proxy.cpp b/ace/Name_Proxy.cpp index 02dc399a219..ca428ff2ded 100644 --- a/ace/Name_Proxy.cpp +++ b/ace/Name_Proxy.cpp @@ -12,7 +12,7 @@ ACE_Name_Proxy::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->connector_.dump (); this->peer_.dump (); - ACE_DEBUG ((LM_DEBUG, "reactor_ = %x", this->reactor_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("reactor_ = %x"), this->reactor_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -50,7 +50,7 @@ ACE_Name_Proxy::ACE_Name_Proxy (const ACE_INET_Addr &remote_addr, ACE_TRACE ("ACE_Name_Proxy::ACE_Name_Proxy"); if (this->open (remote_addr, options) == -1 && options[ACE_Synch_Options::USE_TIMEOUT] && errno != EWOULDBLOCK) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Name_Proxy::ACE_Name_Proxy")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Name_Proxy::ACE_Name_Proxy"))); } // Obtain underlying handle. @@ -70,12 +70,12 @@ ACE_Name_Proxy::request_reply (ACE_Name_Request &request) ssize_t length; if ((length = request.encode (buffer)) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "encode failed"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("encode failed")), -1); // Transmit request via a blocking send. if (this->peer_.send_n (buffer, length) != length) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "send_n failed"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("send_n failed")), -1); else { ACE_Name_Reply reply; @@ -83,10 +83,10 @@ ACE_Name_Proxy::request_reply (ACE_Name_Request &request) // Receive reply via blocking read. if (this->peer_.recv (&reply, sizeof reply) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "recv failed"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("recv failed")), -1); else if (reply.decode () == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "decode failed"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("decode failed")), -1); errno = int (reply.errnum ()); return reply.status (); @@ -101,12 +101,12 @@ ACE_Name_Proxy::send_request (ACE_Name_Request &request) ssize_t length; if ((length = request.encode (buffer)) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "encode failed"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("encode failed")), -1); // Transmit request via a blocking send. else if (this->peer_.send_n (buffer, length) != length) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "send_n failed"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("send_n failed")), -1); return 0; } @@ -124,7 +124,7 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) { case -1: // FALLTHROUGH - ACE_DEBUG ((LM_DEBUG, "****************** recv_reply returned -1\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("****************** recv_reply returned -1\n"))); default: ACE_ERROR ((LM_ERROR, "%p got %d bytes, expected %d bytes\n", "recv failed", n, sizeof (ACE_UINT32))); @@ -155,7 +155,7 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) // Decode the request into host byte order. if (reply.decode () == -1) { - ACE_ERROR ((LM_ERROR, "%p\n", "decode failed")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("decode failed"))); return -1; } } diff --git a/ace/Name_Request_Reply.cpp b/ace/Name_Request_Reply.cpp index cd7460626c3..3a8f05cfd4a 100644 --- a/ace/Name_Request_Reply.cpp +++ b/ace/Name_Request_Reply.cpp @@ -286,65 +286,65 @@ void ACE_Name_Request::dump (void) const { ACE_TRACE ("ACE_Name_Request::dump"); - ACE_DEBUG ((LM_DEBUG, "*******\nlength = %d\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("*******\nlength = %d\n"), this->length ())); - ACE_DEBUG ((LM_DEBUG, "message-type = ")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("message-type = "))); switch (this->msg_type ()) { case ACE_Name_Request::BIND: - ACE_DEBUG ((LM_DEBUG, "BIND\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("BIND\n"))); break; case ACE_Name_Request::REBIND: - ACE_DEBUG ((LM_DEBUG, "REBIND\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("REBIND\n"))); break; case ACE_Name_Request::RESOLVE: - ACE_DEBUG ((LM_DEBUG, "RESOLVE\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("RESOLVE\n"))); break; case ACE_Name_Request::UNBIND: - ACE_DEBUG ((LM_DEBUG, "UNBIND\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("UNBIND\n"))); break; case ACE_Name_Request::LIST_NAMES: - ACE_DEBUG ((LM_DEBUG, "LIST_NAMES\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("LIST_NAMES\n"))); break; case ACE_Name_Request::LIST_VALUES: - ACE_DEBUG ((LM_DEBUG, "LIST_VALUES\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("LIST_VALUES\n"))); break; case ACE_Name_Request::LIST_TYPES: - ACE_DEBUG ((LM_DEBUG, "LIST_TYPES\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("LIST_TYPES\n"))); break; case ACE_Name_Request::LIST_NAME_ENTRIES: - ACE_DEBUG ((LM_DEBUG, "LIST_NAME_ENTRIES\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("LIST_NAME_ENTRIES\n"))); break; case ACE_Name_Request::LIST_VALUE_ENTRIES: - ACE_DEBUG ((LM_DEBUG, "LIST_VALUE_ENTRIES\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("LIST_VALUE_ENTRIES\n"))); break; case ACE_Name_Request::LIST_TYPE_ENTRIES: - ACE_DEBUG ((LM_DEBUG, "LIST_TYPE_ENTRIES\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("LIST_TYPE_ENTRIES\n"))); break; default: - ACE_DEBUG ((LM_DEBUG, "<unknown type> = %d\n", this->msg_type ())); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("<unknown type> = %d\n"), this->msg_type ())); break; } if (this->block_forever ()) - ACE_DEBUG ((LM_DEBUG, "blocking forever\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("blocking forever\n"))); else { ACE_Time_Value tv = this->timeout (); - ACE_DEBUG ((LM_DEBUG, "waiting for %ld secs and %ld usecs\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("waiting for %ld secs and %ld usecs\n"), tv.sec (), tv.usec ())); } - ACE_DEBUG ((LM_DEBUG, "*******\nname_len = %d\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("*******\nname_len = %d\n"), this->name_len ())); - ACE_DEBUG ((LM_DEBUG, "*******\nvalue_len = %d\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("*******\nvalue_len = %d\n"), this->value_len ())); #if 0 cout << "Name = " << ACE_WString (this->name(), this->name_len() / sizeof (ACE_USHORT16)) << endl; cout << "value = " << ACE_WString (this->value(), this->value_len() / sizeof (ACE_USHORT16)) << endl; cout << "type = " << this->type () << endl; #endif - ACE_DEBUG ((LM_DEBUG, "+++++++\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("+++++++\n"))); } // Default constructor. @@ -471,20 +471,20 @@ void ACE_Name_Reply::dump (void) const { ACE_TRACE ("ACE_Name_Reply::dump"); - ACE_DEBUG ((LM_DEBUG, "*******\nlength = %d\nerrnum = %d", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("*******\nlength = %d\nerrnum = %d"), this->length (), this->errnum ())); - ACE_DEBUG ((LM_DEBUG, "type = ")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("type = "))); switch (this->msg_type ()) { case ACE_Name_Reply::SUCCESS: - ACE_DEBUG ((LM_DEBUG, "SUCCESS\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("SUCCESS\n"))); break; case ACE_Name_Reply::FAILURE: - ACE_DEBUG ((LM_DEBUG, "FAILURE\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("FAILURE\n"))); break; default: - ACE_DEBUG ((LM_DEBUG, "<unknown type> = %d\n", this->msg_type ())); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("<unknown type> = %d\n"), this->msg_type ())); break; } } diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp index 98e00ec7855..97b641ef777 100644 --- a/ace/Naming_Context.cpp +++ b/ace/Naming_Context.cpp @@ -132,7 +132,7 @@ ACE_Naming_Context::ACE_Naming_Context (Context_Scope_Type scope_in, // Initialize. if (this->open (scope_in, lite) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Naming_Context::ACE_Naming_Context")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Naming_Context::ACE_Naming_Context"))); } ACE_Name_Options * @@ -341,7 +341,7 @@ ACE_Naming_Context::dump () int ACE_Naming_Context::init (int argc, char *argv[]) { - ACE_DEBUG ((LM_DEBUG, "ACE_Naming_Context::init\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Naming_Context::init\n"))); this->name_options_->parse_args (argc, argv); return this->open (this->name_options_->context ()); } @@ -349,7 +349,7 @@ ACE_Naming_Context::init (int argc, char *argv[]) int ACE_Naming_Context::fini (void) { - ACE_DEBUG ((LM_DEBUG, "ACE_Naming_Context::fini\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Naming_Context::fini\n"))); this->close_down (); diff --git a/ace/Obstack.cpp b/ace/Obstack.cpp index 23cafb42d08..9356488561d 100644 --- a/ace/Obstack.cpp +++ b/ace/Obstack.cpp @@ -11,9 +11,9 @@ ACE_Obstack::dump (void) const ACE_TRACE ("ACE_Obstack::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "size_ = %d\n", this->size_)); - ACE_DEBUG ((LM_DEBUG, "head_ = %x\n", this->head_)); - ACE_DEBUG ((LM_DEBUG, "curr_ = %x\n", this->curr_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("size_ = %d\n"), this->size_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("head_ = %x\n"), this->head_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("curr_ = %x\n"), this->curr_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -25,8 +25,8 @@ ACE_Obchunk::dump (void) const ACE_TRACE ("ACE_Obchunk::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "end_ = %x\n", this->end_)); - ACE_DEBUG ((LM_DEBUG, "cur_ = %x\n", this->cur_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("end_ = %x\n"), this->end_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("cur_ = %x\n"), this->cur_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp index d479048d8d9..c7b3c183203 100644 --- a/ace/Parse_Node.cpp +++ b/ace/Parse_Node.cpp @@ -37,7 +37,7 @@ ACE_Stream_Node::apply (void) this->node_->parameters ()) == -1) ace_yyerrno++; - ACE_DEBUG ((LM_DEBUG, "did stream on %s, error = %d\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("did stream on %s, error = %d\n"), this->node_->name (), ace_yyerrno)); } diff --git a/ace/Pipe.cpp b/ace/Pipe.cpp index ff1b0454839..824ce9290e5 100644 --- a/ace/Pipe.cpp +++ b/ace/Pipe.cpp @@ -11,9 +11,9 @@ ACE_Pipe::dump (void) const { ACE_TRACE ("ACE_Pipe::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "handles_[0] = %d", this->handles_[0])); - ACE_DEBUG ((LM_DEBUG, "\nhandles_[1] = %d", this->handles_[1])); - ACE_DEBUG ((LM_DEBUG, "\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("handles_[0] = %d"), this->handles_[0])); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nhandles_[1] = %d"), this->handles_[1])); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -65,7 +65,7 @@ ACE_Pipe::open (void) #elif defined (ACE_HAS_STREAM_PIPES) if (ACE_OS::pipe (this->handles_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "pipe"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("pipe")), -1); int arg = RMSGN; @@ -73,10 +73,10 @@ ACE_Pipe::open (void) // boundaries are maintained when messages are sent and received. if (ACE_OS::ioctl (this->handles_[0], I_SRDOPT, (void *) arg) == -1 || ACE_OS::ioctl (this->handles_[1], I_SRDOPT, (void *) arg) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ioctl"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ioctl")), -1); #else if (ACE_OS::socketpair (AF_UNIX, SOCK_DGRAM, 0, this->handles_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "socketpair"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("socketpair")), -1); #endif /* ACE_WIN32 */ // Point both the read and write HANDLES to the appropriate socket // HANDLEs. diff --git a/ace/Priority_Reactor.cpp b/ace/Priority_Reactor.cpp index bd9d48ab12e..19018eeade4 100644 --- a/ace/Priority_Reactor.cpp +++ b/ace/Priority_Reactor.cpp @@ -90,7 +90,7 @@ ACE_Priority_Reactor::dispatch_io_set (int number_of_active_handles, return 0; } - // ACE_DEBUG ((LM_DEBUG, "ACE_Priority_Reactor::dispatch_io_set\n")); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Priority_Reactor::dispatch_io_set\n"))); ACE_HANDLE handle; @@ -127,7 +127,7 @@ ACE_Priority_Reactor::dispatch_io_set (int number_of_active_handles, } } - // ACE_DEBUG ((LM_DEBUG, "dispatching.... %d\n", number_of_active_handles)); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("dispatching.... %d\n"), number_of_active_handles)); for (int i = max_priority; i >= min_priority; --i) { diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp index 70eca5646d2..d8b7db5a3c5 100644 --- a/ace/Proactor.cpp +++ b/ace/Proactor.cpp @@ -124,7 +124,7 @@ ACE_Proactor_Timer_Handler::svc (void) break; case WAIT_FAILED: // error - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "WaitForSingleObject"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("WaitForSingleObject")), -1); } } @@ -234,7 +234,7 @@ ACE_Proactor::ACE_Proactor (size_t number_of_threads, 0, this->number_of_threads_); if (this->completion_port_ == 0) - ACE_ERROR ((LM_ERROR, "%p\n", "CreateIoCompletionPort")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("CreateIoCompletionPort"))); // set the timer queue this->timer_queue (tq); @@ -244,7 +244,7 @@ ACE_Proactor::ACE_Proactor (size_t number_of_threads, // activate <timer_handler> if (this->timer_handler_->activate (THR_NEW_LWP | THR_DETACHED) == -1) - ACE_ERROR ((LM_ERROR, "%p Could not create thread\n", "Task::activate")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p Could not create thread\n"), ASYS_TEXT ("Task::activate"))); } @@ -407,7 +407,7 @@ ACE_Proactor::register_handle (ACE_HANDLE handle, // If errno == ERROR_INVALID_PARAMETER, then this handle was // already registered. if (errno != ERROR_INVALID_PARAMETER) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CreateIoCompletionPort"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("CreateIoCompletionPort")), -1); } return 0; } @@ -554,7 +554,7 @@ ACE_Proactor::handle_events (unsigned long milli_seconds) return 0; } else - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "GetQueuedCompletionStatus"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("GetQueuedCompletionStatus")), -1); } else { diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp index f23432b1520..acd3a018253 100644 --- a/ace/Process_Manager.cpp +++ b/ace/Process_Manager.cpp @@ -19,8 +19,8 @@ ACE_Process_Descriptor::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "\nproc_id_ = %d", this->proc_id_)); - ACE_DEBUG ((LM_DEBUG, "\ngrp_id_ = %d", this->grp_id_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nproc_id_ = %d"), this->proc_id_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -32,8 +32,8 @@ ACE_Process_Manager::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "\nmax_table_size_ = %d", this->max_table_size_)); - ACE_DEBUG ((LM_DEBUG, "\ncurrent_count_ = %d", this->current_count_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nmax_table_size_ = %d"), this->max_table_size_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ncurrent_count_ = %d"), this->current_count_)); for (size_t i = 0; i < this->current_count_; i++) this->proc_table_[i].dump (); @@ -94,7 +94,7 @@ ACE_Process_Manager::ACE_Process_Manager (size_t size) ACE_TRACE ("ACE_Process_Manager::ACE_Process_Manager"); if (this->open (size) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Process_Manager")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Process_Manager"))); } // Close up and release all resources. diff --git a/ace/Read_Buffer.cpp b/ace/Read_Buffer.cpp index 24aa06de9ab..a169b02ec5f 100644 --- a/ace/Read_Buffer.cpp +++ b/ace/Read_Buffer.cpp @@ -13,10 +13,10 @@ ACE_Read_Buffer::dump (void) const { ACE_TRACE ("ACE_Read_Buffer::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "size_ = %d", this->size_)); - ACE_DEBUG ((LM_DEBUG, "\noccurrences_ = %d", this->occurrences_)); - ACE_DEBUG ((LM_DEBUG, "\nstream_ = %x", this->stream_)); - ACE_DEBUG ((LM_DEBUG, "\nallocator_ = %x", this->allocator_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("size_ = %d"), this->size_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\noccurrences_ = %d"), this->occurrences_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nstream_ = %x"), this->stream_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nallocator_ = %x"), this->allocator_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Registry_Name_Space.cpp b/ace/Registry_Name_Space.cpp index af1d95cdfe6..48247c88ae3 100644 --- a/ace/Registry_Name_Space.cpp +++ b/ace/Registry_Name_Space.cpp @@ -14,7 +14,7 @@ ACE_Registry_Name_Space::ACE_Registry_Name_Space (void) ACE_Registry_Name_Space::ACE_Registry_Name_Space (ACE_Name_Options *name_options) { if (this->open (name_options) != 0) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Registry_Name_Space::open")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Registry_Name_Space::open"))); } @@ -33,7 +33,7 @@ ACE_Registry_Name_Space::open (ACE_Name_Options *name_options) HKEY_LOCAL_MACHINE, ACE_WIDE_STRING (host)); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Predefined_Naming_Context::connect"), result); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Predefined_Naming_Context::connect")), result); else { // Directory @@ -47,7 +47,7 @@ ACE_Registry_Name_Space::open (ACE_Name_Options *name_options) result = predefined.bind_context (name, this->context_); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Registry::Naming_Context::bind_context"), result); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Registry::Naming_Context::bind_context")), result); } return 0; } @@ -215,7 +215,7 @@ ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set, value, type); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Registry::Naming_Context::resolve"), result); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Registry::Naming_Context::resolve")), result); // Complete binding ACE_Name_Binding binding (key, value, type); diff --git a/ace/Remote_Name_Space.cpp b/ace/Remote_Name_Space.cpp index 371429c8f29..f68a689824c 100644 --- a/ace/Remote_Name_Space.cpp +++ b/ace/Remote_Name_Space.cpp @@ -31,7 +31,7 @@ ACE_Remote_Name_Space::ACE_Remote_Name_Space (const char *hostname, { ACE_TRACE ("ACE_Remote_Name_Space::ACE_Remote_Name_Space"); if (this->open (hostname, port) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Remote_Name_Space::ACE_Remote_Name_Space")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Remote_Name_Space::ACE_Remote_Name_Space"))); } int @@ -122,7 +122,7 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set, { if (this->ns_proxy_.recv_reply (reply) == -1) { - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Remote_Name_Space::list_names")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Remote_Name_Space::list_names"))); return -1; } if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) @@ -152,7 +152,7 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set, { if (this->ns_proxy_.recv_reply (reply) == -1) { - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Remote_Name_Space::list_values")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Remote_Name_Space::list_values"))); return -1; } if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) @@ -182,7 +182,7 @@ ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set, { if (this->ns_proxy_.recv_reply (reply) == -1) { - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Remote_Name_Space::list_values")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Remote_Name_Space::list_values"))); return -1; } if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) @@ -212,7 +212,7 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set, { if (this->ns_proxy_.recv_reply (reply) == -1) { - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Remote_Name_Space::list_names")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Remote_Name_Space::list_names"))); return -1; } if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) @@ -246,7 +246,7 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set, { if (this->ns_proxy_.recv_reply (reply) == -1) { - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Remote_Name_Space::list_values")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Remote_Name_Space::list_values"))); return -1; } if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) @@ -280,7 +280,7 @@ ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set, { if (this->ns_proxy_.recv_reply (reply) == -1) { - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Remote_Name_Space::list_values")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Remote_Name_Space::list_values"))); return -1; } if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) diff --git a/ace/Remote_Tokens.cpp b/ace/Remote_Tokens.cpp index 3bb0a00fd53..4ff3578ca23 100644 --- a/ace/Remote_Tokens.cpp +++ b/ace/Remote_Tokens.cpp @@ -65,7 +65,7 @@ ACE_TSS_Connection::make_TSS_TYPE (void) const return 0; } - ACE_DEBUG ((LM_DEBUG, "ACE_TSS_Connection new connection\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_TSS_Connection new connection\n"))); return stream; } @@ -79,10 +79,10 @@ ACE_TSS_Connection::dump (void) const { ACE_TRACE ("ACE_TSS_Connection::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "ACE_TSS_Connection::dump:\n")); - ACE_DEBUG ((LM_DEBUG, "server_address_\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_TSS_Connection::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("server_address_\n"))); server_address_.dump (); - ACE_DEBUG ((LM_DEBUG, "base:\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base:\n"))); ACE_TSS<ACE_SOCK_Stream>::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -139,7 +139,7 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request, ssize_t length; if ((length = request.encode (buffer)) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "encode failed"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("encode failed")), -1); ACE_SOCK_Stream *peer = ACE_Token_Connections::instance ()->get_connection (); @@ -149,7 +149,7 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request, // Transmit request via a blocking send. if (peer->send_n (buffer, length) != length) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "send_n failed"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("send_n failed")), -1); else { ACE_Token_Reply reply; @@ -157,10 +157,10 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request, // Receive reply via blocking read. if (peer->recv (&reply, sizeof reply) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "recv failed"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("recv failed")), -1); if (reply.decode () == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "decode failed"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("decode failed")), -1); errno = int (reply.errnum ()); if (errno != 0) @@ -188,14 +188,14 @@ ACE_Remote_Token_Proxy::acquire (int notify, case EWOULDBLOCK : // Whoah, we detected wouldblock via the shadow mutex! if (debug_) - ACE_DEBUG ((LM_DEBUG, "(%t) shadow: acquire will block, owner is %s\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) shadow: acquire will block, owner is %s\n"), this->token_->owner_id ())); // No error, but would block, break; case EDEADLK : if (debug_) - ACE_DEBUG ((LM_DEBUG, "(%t) shadow: deadlock detected\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) shadow: deadlock detected\n"))); if (ignore_shadow_deadlock_) break; @@ -227,12 +227,12 @@ ACE_Remote_Token_Proxy::acquire (int notify, if (result == -1) { // Update the local shadow copy. - ACE_DEBUG ((LM_DEBUG, "error on remote acquire, releasing shadow mutex.\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("error on remote acquire, releasing shadow mutex.\n"))); ACE_Token_Proxy::release (); } else { - ACE_DEBUG ((LM_DEBUG, "(%t) acquired %s remotely.\n", this->name ())); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) acquired %s remotely.\n"), this->name ())); // Our shadow call may have failed. However, it's still a race // to the remote server. If we beat the client which holds the // local token, we need to fix things locally to reflect the @@ -256,7 +256,7 @@ ACE_Remote_Token_Proxy::tryacquire (void (*sleep_hook)(void *)) if (debug_) { int error = errno; - ACE_DEBUG ((LM_DEBUG, "shadow try acquire failed\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("shadow try acquire failed\n"))); errno = error; } @@ -314,7 +314,7 @@ ACE_Remote_Token_Proxy::renew (int requeue_position, else { if (debug_) - ACE_DEBUG ((LM_DEBUG, "(%t) renewed %s remotely.\n", this->name ())); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) renewed %s remotely.\n"), this->name ())); // Make sure that the local shadow reflects our new ownership. token_->make_owner (waiter_); return result; @@ -335,7 +335,7 @@ ACE_Remote_Token_Proxy::release (ACE_Synch_Options &options) int result = this->request_reply (request, options); if (result == 0) - ACE_DEBUG ((LM_DEBUG, "(%t) released %s remotely.\n", this->name ())); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) released %s remotely.\n"), this->name ())); // whether success or failure, we're going to release the shadow. // If race conditions exist such that we are no longer the owner, @@ -357,7 +357,7 @@ void ACE_Remote_Token_Proxy::token_acquired (ACE_TPQ_Entry *) { ACE_TRACE ("ACE_Remote_Token_Proxy::token_acquired"); - ACE_DEBUG ((LM_DEBUG, "(%t) shadow token %s acquired\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) shadow token %s acquired\n"), this->client_id (), this->name ())); // ACE_Token_Proxy::token_acquired (vp); @@ -367,7 +367,7 @@ const char* ACE_Remote_Token_Proxy::owner_id (void) { ACE_TRACE ("ACE_Remote_Token_Proxy::owner_id"); - ACE_DEBUG ((LM_DEBUG, "owner_id called\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("owner_id called\n"))); // @@ special operation return 0; } @@ -377,10 +377,10 @@ ACE_Remote_Token_Proxy::dump (void) const { ACE_TRACE ("ACE_Remote_Token_Proxy::owner_id"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "ACE_Tokens::dump:\n" + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Tokens::dump:\n") " ignore_shadow_deadlock_ = %d\n", ignore_shadow_deadlock_)); - ACE_DEBUG ((LM_DEBUG, "base:\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base:\n"))); ACE_Token_Proxy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -390,8 +390,8 @@ ACE_Remote_Mutex::dump (void) const { ACE_TRACE ("ACE_Remote_Mutex::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "ACE_Remote_Mutex::dump:\n")); - ACE_DEBUG ((LM_DEBUG, "base:\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Remote_Mutex::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base:\n"))); ACE_Remote_Token_Proxy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -401,8 +401,8 @@ ACE_Remote_RLock::dump (void) const { ACE_TRACE ("ACE_Remote_RLock::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "ACE_Remote_RLock::dump:\n")); - ACE_DEBUG ((LM_DEBUG, "base:\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Remote_RLock::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base:\n"))); ACE_Remote_Token_Proxy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -412,8 +412,8 @@ ACE_Remote_WLock::dump (void) const { ACE_TRACE ("ACE_Remote_WLock::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "ACE_Remote_WLock::dump:\n")); - ACE_DEBUG ((LM_DEBUG, "base:\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Remote_WLock::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base:\n"))); ACE_Remote_Token_Proxy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/SPIPE_Acceptor.cpp b/ace/SPIPE_Acceptor.cpp index 1101abf08a6..d2a2ac67c17 100644 --- a/ace/SPIPE_Acceptor.cpp +++ b/ace/SPIPE_Acceptor.cpp @@ -123,7 +123,7 @@ ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (const ACE_SPIPE_Addr &local_sap, ACE_TRACE ("ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor"); if (this->open (local_sap, reuse_addr, perms) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_SPIPE_Acceptor")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_SPIPE_Acceptor"))); } // General purpose routine for accepting new connections. diff --git a/ace/SV_Semaphore_Complex.cpp b/ace/SV_Semaphore_Complex.cpp index 178b8f0c595..703f6dafe66 100644 --- a/ace/SV_Semaphore_Complex.cpp +++ b/ace/SV_Semaphore_Complex.cpp @@ -211,7 +211,7 @@ ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (key_t k, { ACE_TRACE ("ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex"); if (this->open (k, flags, initial_value, nsems, perms) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_SV_Semaphore_Complex")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_SV_Semaphore_Complex"))); } ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (const char *name, @@ -230,7 +230,7 @@ ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (const char *name, key = this->name_2_key (name); if (this->open (key, flags, initial_value, nsems, perms) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_SV_Semaphore_Complex")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_SV_Semaphore_Complex"))); } ACE_SV_Semaphore_Complex::~ACE_SV_Semaphore_Complex (void) diff --git a/ace/SV_Semaphore_Simple.cpp b/ace/SV_Semaphore_Simple.cpp index 7fa2f462caf..a5c611a79a8 100644 --- a/ace/SV_Semaphore_Simple.cpp +++ b/ace/SV_Semaphore_Simple.cpp @@ -105,7 +105,7 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (key_t k, { ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"); if (this->open (k, flags, initial_value, n, perms) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_SV_Semaphore::ACE_SV_Semaphore")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_SV_Semaphore::ACE_SV_Semaphore"))); } // Convert name to key. This function is used internally to create keys diff --git a/ace/Select_Reactor.cpp b/ace/Select_Reactor.cpp index e0f882be3e7..a9f4fb0fcd5 100644 --- a/ace/Select_Reactor.cpp +++ b/ace/Select_Reactor.cpp @@ -1541,7 +1541,7 @@ ACE_Select_Reactor::dispatch_io_set (int number_of_active_handles, && number_dispatched < number_of_active_handles && this->state_changed_ == 0) { - // ACE_DEBUG ((LM_DEBUG, "ACE_Select_Reactor::dispatching\n")); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Select_Reactor::dispatching\n"))); number_dispatched++; this->notify_handle (handle, mask, @@ -1568,7 +1568,7 @@ ACE_Select_Reactor::dispatch_io_handlers (int &number_of_active_handles, // the obscure case of piggy-backed data coming along with the // final handshake message of a nonblocking connection). - // ACE_DEBUG ((LM_DEBUG, "ACE_Select_Reactor::dispatch - WRITE\n")); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Select_Reactor::dispatch - WRITE\n"))); if (this->dispatch_io_set (number_of_active_handles, number_dispatched, ACE_Event_Handler::WRITE_MASK, @@ -1581,7 +1581,7 @@ ACE_Select_Reactor::dispatch_io_handlers (int &number_of_active_handles, } - // ACE_DEBUG ((LM_DEBUG, "ACE_Select_Reactor::dispatch - EXCEPT\n")); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Select_Reactor::dispatch - EXCEPT\n"))); if (this->dispatch_io_set (number_of_active_handles, number_dispatched, ACE_Event_Handler::EXCEPT_MASK, @@ -1593,7 +1593,7 @@ ACE_Select_Reactor::dispatch_io_handlers (int &number_of_active_handles, return -1; } - // ACE_DEBUG ((LM_DEBUG, "ACE_Select_Reactor::dispatch - READ\n")); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Select_Reactor::dispatch - READ\n"))); if (this->dispatch_io_set (number_of_active_handles, number_dispatched, ACE_Event_Handler::READ_MASK, diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp index 868d6e6e222..8750ac1d27e 100644 --- a/ace/Service_Config.cpp +++ b/ace/Service_Config.cpp @@ -250,7 +250,7 @@ ACE_Service_Config::initialize (const char svc_name[], ACE_ARGV args (parameters); ACE_Service_Type *srp = 0; - ACE_DEBUG ((LM_DEBUG, "opening static service %s\n", svc_name)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("opening static service %s\n"), svc_name)); if (ACE_Service_Repository::instance ()->find (svc_name, (const ACE_Service_Type **) &srp) == -1) @@ -276,7 +276,7 @@ ACE_Service_Config::initialize (const ACE_Service_Type *sr, ACE_TRACE ("ACE_Service_Config::initialize"); ACE_ARGV args (parameters); - ACE_DEBUG ((LM_DEBUG, "opening dynamic service %s\n", sr->name ())); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("opening dynamic service %s\n"), sr->name ())); if (ACE_Service_Repository::instance ()->insert (sr) == -1) ACE_ERROR_RETURN ((LM_ERROR, "insertion failed, %p\n", sr->name ()), -1); @@ -445,7 +445,7 @@ ACE_Service_Config::handle_signal (int sig, siginfo_t *, ucontext_t *) sig, ACE_Service_Config::signum_)); if (ACE_Service_Config::debug_) - ACE_DEBUG ((LM_DEBUG, "signal %S occurred\n", sig)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("signal %S occurred\n"), sig)); ACE_Service_Config::reconfig_occurred_ = 1; } @@ -462,11 +462,11 @@ ACE_Service_Config::reconfigure (void) if (ACE_Service_Config::debug_) { time_t t = ACE_OS::time (0); - ACE_DEBUG ((LM_DEBUG, "beginning reconfiguration at %s", ACE_OS::ctime (&t))); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("beginning reconfiguration at %s"), ACE_OS::ctime (&t))); } if (ACE_Service_Config::process_directives () == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "process_directives")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("process_directives"))); } // Run the event loop until the <ACE_Reactor::handle_events> diff --git a/ace/Service_Main.cpp b/ace/Service_Main.cpp index cddca791ed1..723e64bb3cc 100644 --- a/ace/Service_Main.cpp +++ b/ace/Service_Main.cpp @@ -16,7 +16,7 @@ sc_main (int argc, char *argv[]) ACE_Service_Config daemon; if (daemon.open (argc, argv) == -1) - ACE_ERROR ((LM_ERROR, "%p\n%a", "open", 1)); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n%a"), ASYS_TEXT ("open"), 1)); // Create an adapter to end the event loop. ACE_Sig_Adapter sa ((ACE_Sig_Handler_Ex) ACE_Reactor::end_event_loop); diff --git a/ace/Service_Manager.cpp b/ace/Service_Manager.cpp index fb34800eee9..199dba96fc7 100644 --- a/ace/Service_Manager.cpp +++ b/ace/Service_Manager.cpp @@ -100,7 +100,7 @@ ACE_Service_Manager::init (int argc, char *argv[]) } if (this->open (local_addr) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("open")), -1); else if (ACE_Reactor::instance ()->register_handler (this, ACE_Event_Handler::ACCEPT_MASK) == -1) ACE_ERROR_RETURN ((LM_ERROR, "registering service with ACE_Reactor\n"), -1); @@ -137,7 +137,7 @@ ACE_Service_Manager::handle_signal (int sig, siginfo_t *, ucontext_t *) { ACE_TRACE ("ACE_Service_Manager::handle_signal"); if (this->debug_) - ACE_DEBUG ((LM_DEBUG, "got %S\n", sig)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("got %S\n"), sig)); return 0; } @@ -164,7 +164,7 @@ ACE_Service_Manager::list_services (void) len += sr->type ()->info (&p, sizeof buf - len); if (this->debug_) - ACE_DEBUG ((LM_DEBUG, "len = %d, info = %s%s", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("len = %d, info = %s%s"), len, buf, buf[len - 1] == '\n' ? "" : "\n")); if (len > 0) @@ -172,7 +172,7 @@ ACE_Service_Manager::list_services (void) ssize_t n = this->client_stream_.send_n (buf, len); if (n != len || (n == -1 && errno != EPIPE)) - ACE_ERROR ((LM_ERROR, "%p\n", "send_n")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("send_n"))); } } @@ -223,13 +223,13 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) if (this->debug_) { - ACE_DEBUG ((LM_DEBUG, "client_stream fd = %d\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("client_stream fd = %d\n"), this->client_stream_.get_handle ())); ACE_INET_Addr sa; if (this->client_stream_.get_remote_addr (sa) == -1) return -1; - ACE_DEBUG ((LM_DEBUG, "accepted from host %s at port %d\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("accepted from host %s at port %d\n"), sa.get_host_name (), sa.get_port_number ())); } diff --git a/ace/Service_Repository.cpp b/ace/Service_Repository.cpp index ae03e52df1c..70fa22b7198 100644 --- a/ace/Service_Repository.cpp +++ b/ace/Service_Repository.cpp @@ -108,7 +108,7 @@ ACE_Service_Repository::ACE_Service_Repository (int size) ACE_TRACE ("ACE_Service_Repository::ACE_Service_Repository"); if (this->open (size) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Service_Repository")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Service_Repository"))); } // Close down all the services. @@ -126,7 +126,7 @@ ACE_Service_Repository::close (void) while (this->current_size_ > 0) { int i = --this->current_size_; - ACE_DEBUG ((LM_DEBUG, "shutting down %s\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("shutting down %s\n"), this->service_vector_[i]->name ())); delete (ACE_Service_Type *)this->service_vector_[i]; } diff --git a/ace/Service_Types.cpp b/ace/Service_Types.cpp index 6bb0335962e..271ab064197 100644 --- a/ace/Service_Types.cpp +++ b/ace/Service_Types.cpp @@ -46,7 +46,7 @@ int ACE_Service_Type_Impl::fini (void) const { ACE_TRACE ("ACE_Service_Type_Impl::fini"); - ACE_DEBUG ((LM_DEBUG, "destroying %s, flags = %d\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("destroying %s, flags = %d\n"), this->name_, this->flags_)); delete [] (char *) this->name_; diff --git a/ace/Singleton.cpp b/ace/Singleton.cpp index 9d13383c7b8..1a59137ed36 100644 --- a/ace/Singleton.cpp +++ b/ace/Singleton.cpp @@ -18,7 +18,7 @@ ACE_Singleton<TYPE, ACE_LOCK>::dump (void) ACE_TRACE ("ACE_Singleton<TYPE, ACE_LOCK>::dump"); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - ACE_DEBUG ((LM_DEBUG, "instance_ = %x", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("instance_ = %x"), ACE_Singleton<TYPE, ACE_LOCK>::instance_i ())); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ @@ -109,7 +109,7 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump (void) ACE_TRACE ("ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump"); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - ACE_DEBUG ((LM_DEBUG, "instance_ = %x", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("instance_ = %x"), ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ())); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp index 3a1f03d6f3d..b2892e46c00 100644 --- a/ace/Strategies_T.cpp +++ b/ace/Strategies_T.cpp @@ -158,7 +158,7 @@ ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy (const char dll_name[], factory_function, svc_name, svc_rep, thr_mgr) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "open")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("open"))); } template <class SVC_HANDLER> @@ -447,7 +447,7 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy"); if (this->open (local_addr, restart) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "open")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("open"))); } template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int @@ -518,7 +518,7 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Accept_Strategy (voi ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Accept_Strategy"); if (this->acceptor_.close () == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n"), ASYS_TEXT ("close"))); } template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> void @@ -616,7 +616,7 @@ ACE_Process_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *svc_handle switch (ACE_OS::fork ("child")) { case -1: - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "fork"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("fork")), -1); /* NOTREACHED */ case 0: // In child process. @@ -677,8 +677,8 @@ ACE_Scheduling_Strategy<SVC_HANDLER>::dump (void) const ACE_TRACE ("ACE_Scheduling_Strategy<SVC_HANDLER>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "scheduler_ = %x", this->scheduler_)); - ACE_DEBUG ((LM_DEBUG, "\ndelete_scheduler_ = %d", this->delete_scheduler_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("scheduler_ = %x"), this->scheduler_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ndelete_scheduler_ = %d"), this->delete_scheduler_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -852,7 +852,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::ACE_Cache delete_recycling_strategy_ (0) { if (this->open (cre_s, con_s, rec_s) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Cached_Connect_Strategy::ACE_Cached_Connect_Strategy")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Cached_Connect_Strategy::ACE_Cached_Connect_Strategy"))); } template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> diff --git a/ace/Stream.cpp b/ace/Stream.cpp index 816a08b20a0..71b56bf990d 100644 --- a/ace/Stream.cpp +++ b/ace/Stream.cpp @@ -21,18 +21,18 @@ template <ACE_SYNCH_DECL> void ACE_Stream<ACE_SYNCH_USE>::dump (void) const { ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE>::dump"); - ACE_DEBUG ((LM_DEBUG, "-------- module links --------\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("-------- module links --------\n"))); for (ACE_Module<ACE_SYNCH_USE> *mp = this->stream_head_; ; mp = mp->next ()) { - ACE_DEBUG ((LM_DEBUG, "module name = %s\n", mp->name ())); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("module name = %s\n"), mp->name ())); if (mp == this->stream_tail_) break; } - ACE_DEBUG ((LM_DEBUG, "-------- writer links --------\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("-------- writer links --------\n"))); ACE_Task<ACE_SYNCH_USE> *tp; @@ -40,21 +40,21 @@ ACE_Stream<ACE_SYNCH_USE>::dump (void) const ; tp = tp->next ()) { - ACE_DEBUG ((LM_DEBUG, "writer queue name = %s\n", tp->name ())); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("writer queue name = %s\n"), tp->name ())); tp->dump (); - ACE_DEBUG ((LM_DEBUG, "-------\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("-------\n"))); if (tp == this->stream_tail_->writer () || (this->linked_us_ && tp == this->linked_us_->stream_head_->reader ())) break; } - ACE_DEBUG ((LM_DEBUG, "-------- reader links --------\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("-------- reader links --------\n"))); for (tp = this->stream_tail_->reader (); ; tp = tp->next ()) { - ACE_DEBUG ((LM_DEBUG, "reader queue name = %s\n", tp->name ())); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("reader queue name = %s\n"), tp->name ())); tp->dump (); - ACE_DEBUG ((LM_DEBUG, "-------\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("-------\n"))); if (tp == this->stream_head_->reader () || (this->linked_us_ && tp == this->linked_us_->stream_head_->writer ())) diff --git a/ace/Svc_Handler.cpp b/ace/Svc_Handler.cpp index b5d7621b461..60ca1350589 100644 --- a/ace/Svc_Handler.cpp +++ b/ace/Svc_Handler.cpp @@ -92,13 +92,13 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::open (void *) ACE_PEER_STREAM_ADDR client_addr; if (this->peer_.get_remote_addr (client_addr) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "get_remote_addr"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("get_remote_addr")), -1); if (client_addr.addr_to_string (buf, sizeof buf) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "can't obtain peer's address"), -1); - ACE_DEBUG ((LM_DEBUG, "connected to %s on fd %d\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("connected to %s on fd %d\n"), buf, this->peer_.get_handle ())); #endif /* DEBUGGING */ if (this->reactor () diff --git a/ace/TLI.cpp b/ace/TLI.cpp index c32f5c5003f..be27c6e971d 100644 --- a/ace/TLI.cpp +++ b/ace/TLI.cpp @@ -78,7 +78,7 @@ ACE_TLI::ACE_TLI (const char device[], int oflag, struct t_info *info) { ACE_TRACE ("ACE_TLI::ACE_TLI"); if (this->open (device, oflag, info) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_TLI::ACE_TLI")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_TLI::ACE_TLI"))); } int diff --git a/ace/TLI_Acceptor.cpp b/ace/TLI_Acceptor.cpp index 1e83d3c68ac..b6d5144f296 100644 --- a/ace/TLI_Acceptor.cpp +++ b/ace/TLI_Acceptor.cpp @@ -331,7 +331,7 @@ ACE_TLI_Acceptor::ACE_TLI_Acceptor (const ACE_Addr &remote_sap, ACE_TRACE ("ACE_TLI_Acceptor::ACE_TLI_Acceptor"); if (this->open (remote_sap, reuse_addr, oflag, info, back, dev) == ACE_INVALID_HANDLE) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_TLI_Acceptor::ACE_TLI_Acceptor")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_TLI_Acceptor::ACE_TLI_Acceptor"))); } int diff --git a/ace/TLI_Connector.i b/ace/TLI_Connector.i index f33b059b2af..3706f72f27d 100644 --- a/ace/TLI_Connector.i +++ b/ace/TLI_Connector.i @@ -23,7 +23,7 @@ ACE_TLI_Connector::ACE_TLI_Connector (ACE_TLI_Stream &new_stream, info, rwf, udata, opt) == ACE_INVALID_HANDLE && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_TLI_Stream::ACE_TLI_Stream")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream"))); } inline int diff --git a/ace/Task_T.cpp b/ace/Task_T.cpp index 3cd18710e64..0b5874cf44c 100644 --- a/ace/Task_T.cpp +++ b/ace/Task_T.cpp @@ -18,14 +18,14 @@ ACE_Task<ACE_SYNCH_USE>::dump (void) const { ACE_TRACE ("ACE_Task<ACE_SYNCH_USE>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "\nthr_mgr_ = %x", this->thr_mgr_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_)); this->msg_queue_->dump (); - ACE_DEBUG ((LM_DEBUG, "delete_msg_queue_ = %d\n", this->delete_msg_queue_)); - ACE_DEBUG ((LM_DEBUG, "\nflags = %x", this->flags_)); - ACE_DEBUG ((LM_DEBUG, "\nmod_ = %x", this->mod_)); - ACE_DEBUG ((LM_DEBUG, "\nnext_ = %x", this->next_)); - ACE_DEBUG ((LM_DEBUG, "\ngrp_id_ = %d", this->grp_id_)); - ACE_DEBUG ((LM_DEBUG, "\nthr_count_ = %d", this->thr_count_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("delete_msg_queue_ = %d\n"), this->delete_msg_queue_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nflags = %x"), this->flags_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nmod_ = %x"), this->mod_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nnext_ = %x"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nthr_count_ = %d"), this->thr_count_)); #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) this->lock_.dump (); #endif /* ACE_MT_SAFE */ diff --git a/ace/Time_Request_Reply.cpp b/ace/Time_Request_Reply.cpp index 8bc312de498..c20b9320dd3 100644 --- a/ace/Time_Request_Reply.cpp +++ b/ace/Time_Request_Reply.cpp @@ -157,30 +157,30 @@ void ACE_Time_Request::dump (void) const { ACE_TRACE ("ACE_Time_Request::dump"); - ACE_DEBUG ((LM_DEBUG, "*******\nlength = %d\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("*******\nlength = %d\n"), this->size ())); - ACE_DEBUG ((LM_DEBUG, "message-type = ")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("message-type = "))); switch (this->msg_type ()) { case ACE_Time_Request::TIME_UPDATE: - ACE_DEBUG ((LM_DEBUG, "TIME_UPDATE\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("TIME_UPDATE\n"))); break; default: - ACE_DEBUG ((LM_DEBUG, "<unknown type> = %d\n", this->msg_type ())); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("<unknown type> = %d\n"), this->msg_type ())); break; } if (this->block_forever ()) - ACE_DEBUG ((LM_DEBUG, "blocking forever\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("blocking forever\n"))); else { ACE_Time_Value tv = this->timeout (); - ACE_DEBUG ((LM_DEBUG, "waiting for %ld secs and %ld usecs\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("waiting for %ld secs and %ld usecs\n"), tv.sec (), tv.usec ())); } - ACE_DEBUG ((LM_DEBUG, "*******\ntime = %d\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("*******\ntime = %d\n"), this->time ())); - ACE_DEBUG ((LM_DEBUG, "+++++++\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("+++++++\n"))); } diff --git a/ace/Timer_Queue_Adapters.cpp b/ace/Timer_Queue_Adapters.cpp index 85b07f9fdd1..249c9bf4f8b 100644 --- a/ace/Timer_Queue_Adapters.cpp +++ b/ace/Timer_Queue_Adapters.cpp @@ -72,7 +72,7 @@ ACE_Async_Timer_Queue_Adapter<TQ>::schedule (ACE_Event_Handler *eh, long tid = this->timer_queue_.schedule (eh, 0, delay); if (tid == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_timer"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("schedule_timer")), -1); return this->schedule_ualarm (); } @@ -92,7 +92,7 @@ ACE_Async_Timer_Queue_Adapter<TQ>::ACE_Async_Timer_Queue_Adapter (ACE_Sig_Set *m SA_RESTART); if (this->sig_handler_.register_handler (SIGALRM, this, &sa) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "register_handler")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("register_handler"))); } // This is the signal handler function for the asynchronous timer @@ -209,7 +209,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::svc (void) // for "negative" amounts of time. ACE_Time_Value tv = this->timer_queue_.earliest_time (); - // ACE_DEBUG ((LM_DEBUG, "waiting until %u.%3.3u secs\n", + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("waiting until %u.%3.3u secs\n"), // tv.sec(), tv.msec())); this->condition_.wait (&tv); } diff --git a/ace/Token_Collection.cpp b/ace/Token_Collection.cpp index 22e6b402f64..5c194705624 100644 --- a/ace/Token_Collection.cpp +++ b/ace/Token_Collection.cpp @@ -87,7 +87,7 @@ ACE_Token_Collection::acquire (int notify, iterator.advance ()) { if (debug_) - ACE_DEBUG ((LM_DEBUG, "collection acquiring %s\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("collection acquiring %s\n"), temp->int_id_->name ())); if (temp->int_id_->acquire (notify, sleep_hook, options) == -1) { @@ -149,7 +149,7 @@ ACE_Token_Collection::tryacquire (void (*sleep_hook)(void *)) iterator.advance ()) { if (debug_) - ACE_DEBUG ((LM_DEBUG, "collection acquiring %s\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("collection acquiring %s\n"), temp->int_id_->name ())); // We will fail if _any_ token is not free. if (temp->int_id_->tryacquire (sleep_hook) == -1) @@ -172,7 +172,7 @@ ACE_Token_Collection::renew (int requeue_position, iterator.advance ()) { if (debug_) - ACE_DEBUG ((LM_DEBUG, "collection renewing %s\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("collection renewing %s\n"), temp->int_id_->name ())); if (temp->int_id_->renew (requeue_position, options) == -1) return -1; @@ -214,7 +214,7 @@ ACE_Token_Collection::release (ACE_Synch_Options &) iterator.advance ()) { if (debug_) - ACE_DEBUG ((LM_DEBUG, "collection releasing %s\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("collection releasing %s\n"), temp->int_id_->name ())); temp->int_id_->release (); } @@ -275,11 +275,11 @@ ACE_Token_Collection::dump (void) const { ACE_TRACE ("ACE_Token_Collection::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "ACE_Token_Collection::dump:\n" + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Token_Collection::dump:\n") " debug_ = %d\n", debug_)); - ACE_DEBUG ((LM_DEBUG, "collection_\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("collection_\n"))); collection_.dump (); - ACE_DEBUG ((LM_DEBUG, "base:\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("base:\n"))); ACE_Token_Proxy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Token_Invariants.cpp b/ace/Token_Invariants.cpp index 292e9ca19f5..d396198516e 100644 --- a/ace/Token_Invariants.cpp +++ b/ace/Token_Invariants.cpp @@ -139,9 +139,9 @@ ACE_Token_Invariant_Manager::dump (void) const { ACE_TRACE ("ACE_Token_Invariant_Manager::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "mutex_collection_:\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("mutex_collection_:\n"))); mutex_collection_.dump (); - ACE_DEBUG ((LM_DEBUG, "rwlock_collection_:\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("rwlock_collection_:\n"))); rwlock_collection_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -261,7 +261,7 @@ ACE_Mutex_Invariants::dump (void) const { ACE_TRACE ("ACE_Mutex_Invariants::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "owners_ = %d\n", owners_)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("owners_ = %d\n"), owners_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -334,7 +334,7 @@ ACE_RWLock_Invariants::dump (void) const { ACE_TRACE ("ACE_RWLock_Invariants::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "writers_ = %d\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("writers_ = %d\n"), "readers_ = %d\n", writers_, readers_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); diff --git a/ace/Token_Manager.cpp b/ace/Token_Manager.cpp index dbf14ab0def..c49db5f0a25 100644 --- a/ace/Token_Manager.cpp +++ b/ace/Token_Manager.cpp @@ -148,8 +148,8 @@ ACE_Token_Manager::check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy) // The caller is an owner, so we have a deadlock situation. if (debug_) { - ACE_DEBUG ((LM_DEBUG, "(%t) Deadlock detected.\n")); - ACE_DEBUG ((LM_DEBUG, "%s owns %s and is waiting for %s.\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) Deadlock detected.\n"))); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%s owns %s and is waiting for %s.\n"), proxy->client_id (), token->name (), proxy->token_->name ())); @@ -252,10 +252,10 @@ ACE_Token_Manager::dump (void) const { ACE_TRACE ("ACE_Token_Manager::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "ACE_Token_Manager::dump:\n")); - ACE_DEBUG ((LM_DEBUG, "lock_\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Token_Manager::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("lock_\n"))); lock_.dump (); - ACE_DEBUG ((LM_DEBUG, "collection_\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("collection_\n"))); collection_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Token_Request_Reply.cpp b/ace/Token_Request_Reply.cpp index c834112cbe3..dc082b1c694 100644 --- a/ace/Token_Request_Reply.cpp +++ b/ace/Token_Request_Reply.cpp @@ -85,42 +85,42 @@ void ACE_Token_Request::dump (void) const { ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, "*******\nlength = %d\ntoken name = %s\nclient id = %s\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("*******\nlength = %d\ntoken name = %s\nclient id = %s\n"), this->length (), this->token_name (), this->client_id ())); - ACE_DEBUG ((LM_DEBUG, "type = ")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("type = "))); if (this->token_type () == ACE_Tokens::MUTEX) - ACE_DEBUG ((LM_DEBUG, "MUTEX\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("MUTEX\n"))); else // == ACE_Tokens::RWLOCK { if (this->proxy_type () == ACE_RW_Token::READER) - ACE_DEBUG ((LM_DEBUG, "RLOCK\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("RLOCK\n"))); else // == WRITER - ACE_DEBUG ((LM_DEBUG, "WLOCK\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("WLOCK\n"))); } - ACE_DEBUG ((LM_DEBUG, "operation = ")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("operation = "))); switch (this->operation_type ()) { case ACE_Token_Request::ACQUIRE: - ACE_DEBUG ((LM_DEBUG, "ACQUIRE\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACQUIRE\n"))); break; case ACE_Token_Request::RELEASE: - ACE_DEBUG ((LM_DEBUG, "RELEASE\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("RELEASE\n"))); break; case ACE_Token_Request::RENEW: - ACE_DEBUG ((LM_DEBUG, "RENEW\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("RENEW\n"))); break; default: - ACE_DEBUG ((LM_DEBUG, "<unknown operation type> = %d\n", this->operation_type ())); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("<unknown operation type> = %d\n"), this->operation_type ())); break; } if (this->options ()[ACE_Synch_Options::USE_TIMEOUT] == 0) - ACE_DEBUG ((LM_DEBUG, "blocking forever\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("blocking forever\n"))); else { - ACE_DEBUG ((LM_DEBUG, "waiting for %ld secs and %ld usecs\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("waiting for %ld secs and %ld usecs\n"), this->options ().timeout ().sec (), this->options ().timeout ().usec ())); } ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -163,8 +163,8 @@ ACE_Token_Reply::decode (void) void ACE_Token_Reply::dump (void) const { - ACE_DEBUG ((LM_DEBUG, "*******\nlength = %d\nerrnum = %d", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("*******\nlength = %d\nerrnum = %d"), this->length (), this->errnum ())); - ACE_DEBUG ((LM_DEBUG, "arg = %d", this->arg ())); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("arg = %d"), this->arg ())); } diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp index c69e278c20c..3675b1ab8c5 100644 --- a/ace/WFMO_Reactor.cpp +++ b/ace/WFMO_Reactor.cpp @@ -607,7 +607,7 @@ ACE_WFMO_Reactor::ACE_WFMO_Reactor (ACE_Sig_Handler *sh, open_for_business_ (0) { if (this->open (ACE_WFMO_Reactor::DEFAULT_SIZE, 0, sh, tq) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "WFMO_Reactor")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("WFMO_Reactor"))); } ACE_WFMO_Reactor::ACE_WFMO_Reactor (size_t size, @@ -636,7 +636,7 @@ ACE_WFMO_Reactor::ACE_WFMO_Reactor (size_t size, ACE_UNUSED_ARG (unused); if (this->open (size, 0, sh, tq) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "WFMO_Reactor")); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("WFMO_Reactor"))); } int @@ -1366,7 +1366,7 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum, // This will get called when <WFMO_Reactor->wakeup_one_thread_> event // is signaled. - // ACE_DEBUG ((LM_DEBUG, "(%t) waking up to handle internal notifications\n")); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) waking up to handle internal notifications\n"))); for (int i = 1; ; i++) { diff --git a/ace/WFMO_Reactor.i b/ace/WFMO_Reactor.i index 10af5633240..f2e85c48e96 100644 --- a/ace/WFMO_Reactor.i +++ b/ace/WFMO_Reactor.i @@ -17,7 +17,7 @@ ACE_Wakeup_All_Threads_Handler::handle_signal (int signum, // This will get called when <WFMO_Reactor->wakeup_all_threads_> event // is signaled. There is nothing to be done here. - // ACE_DEBUG ((LM_DEBUG, "(%t) waking up to get updated handle set info\n")); + // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) waking up to get updated handle set info\n"))); return 0; } diff --git a/ace/XtReactor.cpp b/ace/XtReactor.cpp index a00354a0666..cea8a880a97 100644 --- a/ace/XtReactor.cpp +++ b/ace/XtReactor.cpp @@ -90,7 +90,7 @@ ACE_XtReactor::TimerCallbackProc (XtPointer closure, XtIntervalId *id) ACE_XtReactor *self = (ACE_XtReactor *) closure; self->timeout_ = 0; - ACE_DEBUG ((LM_DEBUG, "ACE_XtReactor::Timer on id %d\n", (int) *id)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_XtReactor::Timer on id %d\n"), (int) *id)); // Deal with any timer events ACE_Select_Reactor_Handle_Set handle_set; @@ -109,7 +109,7 @@ ACE_XtReactor::InputCallbackProc (XtPointer closure, { ACE_XtReactor *self = (ACE_XtReactor *) closure; - ACE_DEBUG ((LM_DEBUG, "ACE_XtReactor::Input on fd %d\n", *source)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_XtReactor::Input on fd %d\n"), *source)); ACE_Time_Value zero = ACE_Time_Value::zero; // my copy isn't const @@ -189,7 +189,7 @@ ACE_XtReactor::register_handler_i (ACE_HANDLE handle, { ACE_TRACE ("ACE_XtReactor::register_handler_i"); - ACE_DEBUG ((LM_DEBUG, "+++%d\n", handle)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("+++%d\n"), handle)); int result = ACE_Select_Reactor::register_handler_i (handle, handler, mask); @@ -259,7 +259,7 @@ ACE_XtReactor::remove_handler_i (ACE_HANDLE handle, ACE_Reactor_Mask mask) { ACE_TRACE ("ACE_XtReactor::remove_handler_i"); - ACE_DEBUG ((LM_DEBUG, "---%d\n", handle)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("---%d\n"), handle)); int result = ACE_Select_Reactor::remove_handler_i (handle, mask); @@ -268,11 +268,11 @@ ACE_XtReactor::remove_handler_i (ACE_HANDLE handle, if (ids_[handle].good_id_) ::XtRemoveInput (ids_[handle].id_); else - ACE_DEBUG ((LM_DEBUG, "Handle id is not good %d\n", handle)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Handle id is not good %d\n"), handle)); ids_[handle].good_id_ = 0; } else - ACE_DEBUG ((LM_DEBUG, "Handle out of range %d\n", handle)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Handle out of range %d\n"), handle)); if (result == -1) return result; @@ -303,7 +303,7 @@ ACE_XtReactor::reset_timeout (void) if (max_wait_time) { - ACE_DEBUG ((LM_DEBUG, " %ld\n", max_wait_time->msec ())); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" %ld\n"), max_wait_time->msec ())); timeout_ = ::XtAppAddTimeOut (context_, max_wait_time->msec (), |