diff options
182 files changed, 2419 insertions, 1708 deletions
diff --git a/ChangeLog b/ChangeLog index 3994bbbb429..9a52eb4ed94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,202 @@ +Sat Oct 7 000:50:02 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/ACE.cpp: + * ace/ACE.h: + * ace/ACE.i: + * ace/ARGV.cpp: + * ace/ATM_Acceptor.cpp: + * ace/ATM_Acceptor.i: + * ace/ATM_Addr.cpp: + * ace/ATM_Connector.cpp: + * ace/ATM_Connector.i: + * ace/ATM_QoS.cpp: + * ace/ATM_Stream.cpp: + * ace/Acceptor.cpp: + * ace/Activation_Queue.cpp: + * ace/Addr.cpp: + * ace/Arg_Shifter.cpp: + * ace/Asynch_Acceptor.cpp: + * ace/Asynch_IO.cpp: + * ace/Based_Pointer_T.cpp: + * ace/Basic_Types.h: + * ace/CORBA_Handler.cpp: + * ace/Cache_Map_Manager_T.cpp: + * ace/Cached_Connect_Strategy_T.cpp: + * ace/Caching_Strategies_T.i: + * ace/Capabilities.cpp: + * ace/Capabilities.h: + * ace/Configuration.cpp: + * ace/Connector.cpp: + * ace/Containers_T.cpp: + * ace/DEV_Addr.cpp: + * ace/DEV_Connector.i: + * ace/DLL.cpp: + * ace/Dirent.i: + * ace/Dynamic_Service.cpp: + * ace/FIFO.cpp: + * ace/FIFO_Recv.cpp: + * ace/FIFO_Recv_Msg.cpp: + * ace/FIFO_Send.cpp: + * ace/FIFO_Send_Msg.cpp: + * ace/FILE_Addr.cpp: + * ace/FILE_Connector.cpp: + * ace/FILE_Connector.i: + * ace/File_Lock.cpp: + * ace/Filecache.cpp: + * ace/Filecache.h: + * ace/Future.cpp: + * ace/Get_Opt.cpp: + * ace/Handle_Set.cpp: + * ace/Hash_Map_Manager_T.cpp: + * ace/Hash_Map_Manager_T.i: + * ace/High_Res_Timer.cpp: + * ace/High_Res_Timer.h: + * ace/INET_Addr.cpp: + * ace/INET_Addr.h: + * ace/IO_SAP.cpp: + * ace/IPC_SAP.cpp: + * ace/LSOCK.cpp: + * ace/LSOCK_CODgram.cpp: + * ace/LSOCK_Connector.cpp: + * ace/LSOCK_Dgram.cpp: + * ace/Local_Name_Space_T.cpp: + * ace/Local_Tokens.cpp: + * ace/Local_Tokens.i: + * ace/Log_Msg.cpp: + * ace/Log_Msg.h: + * ace/Log_Record.cpp: + * ace/Logging_Strategy.cpp: + * ace/MEM_Acceptor.cpp: + * ace/MEM_Addr.cpp: + * ace/MEM_Connector.cpp: + * ace/MEM_SAP.cpp: + * ace/Malloc.cpp: + * ace/Malloc_T.cpp: + * ace/Malloc_T.h: + * ace/Map_Manager.cpp: + * ace/Map_Manager.i: + * ace/Mem_Map.cpp: + * ace/Memory_Pool.cpp: + * ace/Message_Block.cpp: + * ace/Message_Queue.cpp: + * ace/Message_Queue_T.cpp: + * ace/Module.cpp: + * ace/Name_Proxy.cpp: + * ace/Name_Request_Reply.cpp: + * ace/Naming_Context.cpp: + * ace/OS.cpp: + * ace/OS.h: + * ace/OS.i: + * ace/Object_Manager.cpp: + * ace/Obstack.cpp: + * ace/POSIX_Asynch_IO.cpp: + * ace/Parse_Node.cpp: + * ace/Pipe.cpp: + * ace/Proactor.cpp: + * ace/Process.cpp: + * ace/Process_Manager.cpp: + * ace/QoS_Manager.cpp: + * ace/QoS_Session_Factory.cpp: + * ace/QoS_Session_Impl.cpp: + * ace/RB_Tree.cpp: + * ace/RB_Tree.i: + * ace/Read_Buffer.cpp: + * ace/Registry.cpp: + * ace/Registry_Name_Space.cpp: + * ace/Remote_Name_Space.cpp: + * ace/Remote_Tokens.cpp: + * ace/SOCK.cpp: + * ace/SOCK_Acceptor.cpp: + * ace/SOCK_CODgram.cpp: + * ace/SOCK_Connector.cpp: + * ace/SOCK_Dgram.cpp: + * ace/SOCK_Dgram_Bcast.cpp: + * ace/SOCK_Dgram_Mcast.cpp: + * ace/SOCK_Dgram_Mcast.h: + * ace/SOCK_Dgram_Mcast_QoS.cpp: + * ace/SPIPE_Acceptor.cpp: + * ace/SPIPE_Addr.cpp: + * ace/SPIPE_Connector.cpp: + * ace/SV_Message_Queue.cpp: + * ace/SV_Semaphore_Complex.cpp: + * ace/SV_Semaphore_Simple.cpp: + * ace/SV_Shared_Memory.cpp: + * ace/Select_Reactor_Base.cpp: + * ace/Select_Reactor_T.cpp: + * ace/Service_Config.cpp: + * ace/Service_Manager.cpp: + * ace/Service_Repository.cpp: + * ace/Service_Types.cpp: + * ace/Singleton.cpp: + * ace/Stats.cpp: + * ace/Stats.i: + * ace/Strategies_T.cpp: + * ace/Strategies_T.i: + * ace/Stream.cpp: + * ace/Svc_Conf.h: + * ace/Svc_Conf.l: + * ace/Svc_Conf.y: + * ace/Svc_Conf_l.cpp: + * ace/Svc_Conf_y.cpp: + * ace/Svc_Handler.cpp: + * ace/Synch.cpp: + * ace/Synch.h: + * ace/Synch_T.cpp: + * ace/System_Time.cpp: + * ace/TLI.cpp: + * ace/TLI_Acceptor.cpp: + * ace/TLI_Connector.i: + * ace/TP_Reactor.i: + * ace/Task_T.cpp: + * ace/Thread_Manager.cpp: + * ace/Time_Request_Reply.cpp: + * ace/Timeprobe_T.cpp: + * ace/Timer_Hash_T.cpp: + * ace/Timer_Heap_T.cpp: + * ace/Timer_List_T.cpp: + * ace/Timer_Queue_Adapters.cpp: + * ace/Timer_Queue_T.cpp: + * ace/Timer_Wheel_T.cpp: + * ace/Token.cpp: + * ace/Token_Collection.cpp: + * ace/Token_Invariants.cpp: + * ace/Token_Manager.cpp: + * ace/Token_Request_Reply.cpp: + * ace/Token_Request_Reply.i: + * ace/Trace.cpp: + * ace/Trace.h: + * ace/UPIPE_Acceptor.cpp: + * ace/UPIPE_Connector.cpp: + * ace/UPIPE_Connector.i: + * ace/WFMO_Reactor.cpp: + * ace/WFMO_Reactor.i: + * ace/WIN32_Asynch_IO.cpp: + * ace/WIN32_Proactor.cpp: + * ace/XTI_ATM_Mcast.i: + * ace/ace_wchar.h: + * ace/config-WinCE.h: + * ace/config-all.h: + * ace/config-win32-borland.h: + * ace/config-win32-msvc.h: + * ace/config-win32-visualage.h: + + Split several methods into char/wchar_t versions: + - ACE_OS::getenv + - ACE_OS::cuserid + - ACE_Allocator_Adapter constructor + - ACE_Manual_Event constructor + + Split several string macros into char/wchar_t versions: + - ACE_DIRECTORY_SEPARATOR_STR + - ACE_DIRECTORY_SEPARATOR_CHAR + - ACE_PLATFORM + - ACE_PLATFORM_EXE_SUFFIX + - ACE_DEFAULT_LOCALNAME + - ACE_DEFAULT_GLOBALNAME + - ACE_DEFAULT_MUTEX + + Added ACE_DEFAULT_NAMESPACE_DIR back in for ACE_LEGACY_MODE. + Fri Oct 06 11:34:26 2000 Steve Huston <shuston@riverace.com> * ace/Based_Pointer_T.cpp: @@ -1159,9 +1358,9 @@ Thu Sep 07 18:10:00 2000 Darrell Brunsch <brunsch@uci.edu> ACE_HAS_WINSOCK2 is turned on by default for all of Win32. Windows 98 and Windows ME should have Winsock2, and NT/2000 - also does. For Windows 95, this requires that Winsock - library be added or ACE_HAS_WINSOCK2 defined to 0 in - config.h before including config-win32.h (overriding it). + also does. For Windows 95, this requires that the Winsock 2 + library for Windows 95 is added or ACE_HAS_WINSOCK2 defined to + 0 in config.h before including config-win32.h (overriding it). Thanks to Giovanni Zito <gzito@mbox.thunder.it> for inquiring about this. diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 3994bbbb429..9a52eb4ed94 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,202 @@ +Sat Oct 7 000:50:02 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/ACE.cpp: + * ace/ACE.h: + * ace/ACE.i: + * ace/ARGV.cpp: + * ace/ATM_Acceptor.cpp: + * ace/ATM_Acceptor.i: + * ace/ATM_Addr.cpp: + * ace/ATM_Connector.cpp: + * ace/ATM_Connector.i: + * ace/ATM_QoS.cpp: + * ace/ATM_Stream.cpp: + * ace/Acceptor.cpp: + * ace/Activation_Queue.cpp: + * ace/Addr.cpp: + * ace/Arg_Shifter.cpp: + * ace/Asynch_Acceptor.cpp: + * ace/Asynch_IO.cpp: + * ace/Based_Pointer_T.cpp: + * ace/Basic_Types.h: + * ace/CORBA_Handler.cpp: + * ace/Cache_Map_Manager_T.cpp: + * ace/Cached_Connect_Strategy_T.cpp: + * ace/Caching_Strategies_T.i: + * ace/Capabilities.cpp: + * ace/Capabilities.h: + * ace/Configuration.cpp: + * ace/Connector.cpp: + * ace/Containers_T.cpp: + * ace/DEV_Addr.cpp: + * ace/DEV_Connector.i: + * ace/DLL.cpp: + * ace/Dirent.i: + * ace/Dynamic_Service.cpp: + * ace/FIFO.cpp: + * ace/FIFO_Recv.cpp: + * ace/FIFO_Recv_Msg.cpp: + * ace/FIFO_Send.cpp: + * ace/FIFO_Send_Msg.cpp: + * ace/FILE_Addr.cpp: + * ace/FILE_Connector.cpp: + * ace/FILE_Connector.i: + * ace/File_Lock.cpp: + * ace/Filecache.cpp: + * ace/Filecache.h: + * ace/Future.cpp: + * ace/Get_Opt.cpp: + * ace/Handle_Set.cpp: + * ace/Hash_Map_Manager_T.cpp: + * ace/Hash_Map_Manager_T.i: + * ace/High_Res_Timer.cpp: + * ace/High_Res_Timer.h: + * ace/INET_Addr.cpp: + * ace/INET_Addr.h: + * ace/IO_SAP.cpp: + * ace/IPC_SAP.cpp: + * ace/LSOCK.cpp: + * ace/LSOCK_CODgram.cpp: + * ace/LSOCK_Connector.cpp: + * ace/LSOCK_Dgram.cpp: + * ace/Local_Name_Space_T.cpp: + * ace/Local_Tokens.cpp: + * ace/Local_Tokens.i: + * ace/Log_Msg.cpp: + * ace/Log_Msg.h: + * ace/Log_Record.cpp: + * ace/Logging_Strategy.cpp: + * ace/MEM_Acceptor.cpp: + * ace/MEM_Addr.cpp: + * ace/MEM_Connector.cpp: + * ace/MEM_SAP.cpp: + * ace/Malloc.cpp: + * ace/Malloc_T.cpp: + * ace/Malloc_T.h: + * ace/Map_Manager.cpp: + * ace/Map_Manager.i: + * ace/Mem_Map.cpp: + * ace/Memory_Pool.cpp: + * ace/Message_Block.cpp: + * ace/Message_Queue.cpp: + * ace/Message_Queue_T.cpp: + * ace/Module.cpp: + * ace/Name_Proxy.cpp: + * ace/Name_Request_Reply.cpp: + * ace/Naming_Context.cpp: + * ace/OS.cpp: + * ace/OS.h: + * ace/OS.i: + * ace/Object_Manager.cpp: + * ace/Obstack.cpp: + * ace/POSIX_Asynch_IO.cpp: + * ace/Parse_Node.cpp: + * ace/Pipe.cpp: + * ace/Proactor.cpp: + * ace/Process.cpp: + * ace/Process_Manager.cpp: + * ace/QoS_Manager.cpp: + * ace/QoS_Session_Factory.cpp: + * ace/QoS_Session_Impl.cpp: + * ace/RB_Tree.cpp: + * ace/RB_Tree.i: + * ace/Read_Buffer.cpp: + * ace/Registry.cpp: + * ace/Registry_Name_Space.cpp: + * ace/Remote_Name_Space.cpp: + * ace/Remote_Tokens.cpp: + * ace/SOCK.cpp: + * ace/SOCK_Acceptor.cpp: + * ace/SOCK_CODgram.cpp: + * ace/SOCK_Connector.cpp: + * ace/SOCK_Dgram.cpp: + * ace/SOCK_Dgram_Bcast.cpp: + * ace/SOCK_Dgram_Mcast.cpp: + * ace/SOCK_Dgram_Mcast.h: + * ace/SOCK_Dgram_Mcast_QoS.cpp: + * ace/SPIPE_Acceptor.cpp: + * ace/SPIPE_Addr.cpp: + * ace/SPIPE_Connector.cpp: + * ace/SV_Message_Queue.cpp: + * ace/SV_Semaphore_Complex.cpp: + * ace/SV_Semaphore_Simple.cpp: + * ace/SV_Shared_Memory.cpp: + * ace/Select_Reactor_Base.cpp: + * ace/Select_Reactor_T.cpp: + * ace/Service_Config.cpp: + * ace/Service_Manager.cpp: + * ace/Service_Repository.cpp: + * ace/Service_Types.cpp: + * ace/Singleton.cpp: + * ace/Stats.cpp: + * ace/Stats.i: + * ace/Strategies_T.cpp: + * ace/Strategies_T.i: + * ace/Stream.cpp: + * ace/Svc_Conf.h: + * ace/Svc_Conf.l: + * ace/Svc_Conf.y: + * ace/Svc_Conf_l.cpp: + * ace/Svc_Conf_y.cpp: + * ace/Svc_Handler.cpp: + * ace/Synch.cpp: + * ace/Synch.h: + * ace/Synch_T.cpp: + * ace/System_Time.cpp: + * ace/TLI.cpp: + * ace/TLI_Acceptor.cpp: + * ace/TLI_Connector.i: + * ace/TP_Reactor.i: + * ace/Task_T.cpp: + * ace/Thread_Manager.cpp: + * ace/Time_Request_Reply.cpp: + * ace/Timeprobe_T.cpp: + * ace/Timer_Hash_T.cpp: + * ace/Timer_Heap_T.cpp: + * ace/Timer_List_T.cpp: + * ace/Timer_Queue_Adapters.cpp: + * ace/Timer_Queue_T.cpp: + * ace/Timer_Wheel_T.cpp: + * ace/Token.cpp: + * ace/Token_Collection.cpp: + * ace/Token_Invariants.cpp: + * ace/Token_Manager.cpp: + * ace/Token_Request_Reply.cpp: + * ace/Token_Request_Reply.i: + * ace/Trace.cpp: + * ace/Trace.h: + * ace/UPIPE_Acceptor.cpp: + * ace/UPIPE_Connector.cpp: + * ace/UPIPE_Connector.i: + * ace/WFMO_Reactor.cpp: + * ace/WFMO_Reactor.i: + * ace/WIN32_Asynch_IO.cpp: + * ace/WIN32_Proactor.cpp: + * ace/XTI_ATM_Mcast.i: + * ace/ace_wchar.h: + * ace/config-WinCE.h: + * ace/config-all.h: + * ace/config-win32-borland.h: + * ace/config-win32-msvc.h: + * ace/config-win32-visualage.h: + + Split several methods into char/wchar_t versions: + - ACE_OS::getenv + - ACE_OS::cuserid + - ACE_Allocator_Adapter constructor + - ACE_Manual_Event constructor + + Split several string macros into char/wchar_t versions: + - ACE_DIRECTORY_SEPARATOR_STR + - ACE_DIRECTORY_SEPARATOR_CHAR + - ACE_PLATFORM + - ACE_PLATFORM_EXE_SUFFIX + - ACE_DEFAULT_LOCALNAME + - ACE_DEFAULT_GLOBALNAME + - ACE_DEFAULT_MUTEX + + Added ACE_DEFAULT_NAMESPACE_DIR back in for ACE_LEGACY_MODE. + Fri Oct 06 11:34:26 2000 Steve Huston <shuston@riverace.com> * ace/Based_Pointer_T.cpp: @@ -1159,9 +1358,9 @@ Thu Sep 07 18:10:00 2000 Darrell Brunsch <brunsch@uci.edu> ACE_HAS_WINSOCK2 is turned on by default for all of Win32. Windows 98 and Windows ME should have Winsock2, and NT/2000 - also does. For Windows 95, this requires that Winsock - library be added or ACE_HAS_WINSOCK2 defined to 0 in - config.h before including config-win32.h (overriding it). + also does. For Windows 95, this requires that the Winsock 2 + library for Windows 95 is added or ACE_HAS_WINSOCK2 defined to + 0 in config.h before including config-win32.h (overriding it). Thanks to Giovanni Zito <gzito@mbox.thunder.it> for inquiring about this. diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 3994bbbb429..9a52eb4ed94 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,202 @@ +Sat Oct 7 000:50:02 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/ACE.cpp: + * ace/ACE.h: + * ace/ACE.i: + * ace/ARGV.cpp: + * ace/ATM_Acceptor.cpp: + * ace/ATM_Acceptor.i: + * ace/ATM_Addr.cpp: + * ace/ATM_Connector.cpp: + * ace/ATM_Connector.i: + * ace/ATM_QoS.cpp: + * ace/ATM_Stream.cpp: + * ace/Acceptor.cpp: + * ace/Activation_Queue.cpp: + * ace/Addr.cpp: + * ace/Arg_Shifter.cpp: + * ace/Asynch_Acceptor.cpp: + * ace/Asynch_IO.cpp: + * ace/Based_Pointer_T.cpp: + * ace/Basic_Types.h: + * ace/CORBA_Handler.cpp: + * ace/Cache_Map_Manager_T.cpp: + * ace/Cached_Connect_Strategy_T.cpp: + * ace/Caching_Strategies_T.i: + * ace/Capabilities.cpp: + * ace/Capabilities.h: + * ace/Configuration.cpp: + * ace/Connector.cpp: + * ace/Containers_T.cpp: + * ace/DEV_Addr.cpp: + * ace/DEV_Connector.i: + * ace/DLL.cpp: + * ace/Dirent.i: + * ace/Dynamic_Service.cpp: + * ace/FIFO.cpp: + * ace/FIFO_Recv.cpp: + * ace/FIFO_Recv_Msg.cpp: + * ace/FIFO_Send.cpp: + * ace/FIFO_Send_Msg.cpp: + * ace/FILE_Addr.cpp: + * ace/FILE_Connector.cpp: + * ace/FILE_Connector.i: + * ace/File_Lock.cpp: + * ace/Filecache.cpp: + * ace/Filecache.h: + * ace/Future.cpp: + * ace/Get_Opt.cpp: + * ace/Handle_Set.cpp: + * ace/Hash_Map_Manager_T.cpp: + * ace/Hash_Map_Manager_T.i: + * ace/High_Res_Timer.cpp: + * ace/High_Res_Timer.h: + * ace/INET_Addr.cpp: + * ace/INET_Addr.h: + * ace/IO_SAP.cpp: + * ace/IPC_SAP.cpp: + * ace/LSOCK.cpp: + * ace/LSOCK_CODgram.cpp: + * ace/LSOCK_Connector.cpp: + * ace/LSOCK_Dgram.cpp: + * ace/Local_Name_Space_T.cpp: + * ace/Local_Tokens.cpp: + * ace/Local_Tokens.i: + * ace/Log_Msg.cpp: + * ace/Log_Msg.h: + * ace/Log_Record.cpp: + * ace/Logging_Strategy.cpp: + * ace/MEM_Acceptor.cpp: + * ace/MEM_Addr.cpp: + * ace/MEM_Connector.cpp: + * ace/MEM_SAP.cpp: + * ace/Malloc.cpp: + * ace/Malloc_T.cpp: + * ace/Malloc_T.h: + * ace/Map_Manager.cpp: + * ace/Map_Manager.i: + * ace/Mem_Map.cpp: + * ace/Memory_Pool.cpp: + * ace/Message_Block.cpp: + * ace/Message_Queue.cpp: + * ace/Message_Queue_T.cpp: + * ace/Module.cpp: + * ace/Name_Proxy.cpp: + * ace/Name_Request_Reply.cpp: + * ace/Naming_Context.cpp: + * ace/OS.cpp: + * ace/OS.h: + * ace/OS.i: + * ace/Object_Manager.cpp: + * ace/Obstack.cpp: + * ace/POSIX_Asynch_IO.cpp: + * ace/Parse_Node.cpp: + * ace/Pipe.cpp: + * ace/Proactor.cpp: + * ace/Process.cpp: + * ace/Process_Manager.cpp: + * ace/QoS_Manager.cpp: + * ace/QoS_Session_Factory.cpp: + * ace/QoS_Session_Impl.cpp: + * ace/RB_Tree.cpp: + * ace/RB_Tree.i: + * ace/Read_Buffer.cpp: + * ace/Registry.cpp: + * ace/Registry_Name_Space.cpp: + * ace/Remote_Name_Space.cpp: + * ace/Remote_Tokens.cpp: + * ace/SOCK.cpp: + * ace/SOCK_Acceptor.cpp: + * ace/SOCK_CODgram.cpp: + * ace/SOCK_Connector.cpp: + * ace/SOCK_Dgram.cpp: + * ace/SOCK_Dgram_Bcast.cpp: + * ace/SOCK_Dgram_Mcast.cpp: + * ace/SOCK_Dgram_Mcast.h: + * ace/SOCK_Dgram_Mcast_QoS.cpp: + * ace/SPIPE_Acceptor.cpp: + * ace/SPIPE_Addr.cpp: + * ace/SPIPE_Connector.cpp: + * ace/SV_Message_Queue.cpp: + * ace/SV_Semaphore_Complex.cpp: + * ace/SV_Semaphore_Simple.cpp: + * ace/SV_Shared_Memory.cpp: + * ace/Select_Reactor_Base.cpp: + * ace/Select_Reactor_T.cpp: + * ace/Service_Config.cpp: + * ace/Service_Manager.cpp: + * ace/Service_Repository.cpp: + * ace/Service_Types.cpp: + * ace/Singleton.cpp: + * ace/Stats.cpp: + * ace/Stats.i: + * ace/Strategies_T.cpp: + * ace/Strategies_T.i: + * ace/Stream.cpp: + * ace/Svc_Conf.h: + * ace/Svc_Conf.l: + * ace/Svc_Conf.y: + * ace/Svc_Conf_l.cpp: + * ace/Svc_Conf_y.cpp: + * ace/Svc_Handler.cpp: + * ace/Synch.cpp: + * ace/Synch.h: + * ace/Synch_T.cpp: + * ace/System_Time.cpp: + * ace/TLI.cpp: + * ace/TLI_Acceptor.cpp: + * ace/TLI_Connector.i: + * ace/TP_Reactor.i: + * ace/Task_T.cpp: + * ace/Thread_Manager.cpp: + * ace/Time_Request_Reply.cpp: + * ace/Timeprobe_T.cpp: + * ace/Timer_Hash_T.cpp: + * ace/Timer_Heap_T.cpp: + * ace/Timer_List_T.cpp: + * ace/Timer_Queue_Adapters.cpp: + * ace/Timer_Queue_T.cpp: + * ace/Timer_Wheel_T.cpp: + * ace/Token.cpp: + * ace/Token_Collection.cpp: + * ace/Token_Invariants.cpp: + * ace/Token_Manager.cpp: + * ace/Token_Request_Reply.cpp: + * ace/Token_Request_Reply.i: + * ace/Trace.cpp: + * ace/Trace.h: + * ace/UPIPE_Acceptor.cpp: + * ace/UPIPE_Connector.cpp: + * ace/UPIPE_Connector.i: + * ace/WFMO_Reactor.cpp: + * ace/WFMO_Reactor.i: + * ace/WIN32_Asynch_IO.cpp: + * ace/WIN32_Proactor.cpp: + * ace/XTI_ATM_Mcast.i: + * ace/ace_wchar.h: + * ace/config-WinCE.h: + * ace/config-all.h: + * ace/config-win32-borland.h: + * ace/config-win32-msvc.h: + * ace/config-win32-visualage.h: + + Split several methods into char/wchar_t versions: + - ACE_OS::getenv + - ACE_OS::cuserid + - ACE_Allocator_Adapter constructor + - ACE_Manual_Event constructor + + Split several string macros into char/wchar_t versions: + - ACE_DIRECTORY_SEPARATOR_STR + - ACE_DIRECTORY_SEPARATOR_CHAR + - ACE_PLATFORM + - ACE_PLATFORM_EXE_SUFFIX + - ACE_DEFAULT_LOCALNAME + - ACE_DEFAULT_GLOBALNAME + - ACE_DEFAULT_MUTEX + + Added ACE_DEFAULT_NAMESPACE_DIR back in for ACE_LEGACY_MODE. + Fri Oct 06 11:34:26 2000 Steve Huston <shuston@riverace.com> * ace/Based_Pointer_T.cpp: @@ -1159,9 +1358,9 @@ Thu Sep 07 18:10:00 2000 Darrell Brunsch <brunsch@uci.edu> ACE_HAS_WINSOCK2 is turned on by default for all of Win32. Windows 98 and Windows ME should have Winsock2, and NT/2000 - also does. For Windows 95, this requires that Winsock - library be added or ACE_HAS_WINSOCK2 defined to 0 in - config.h before including config-win32.h (overriding it). + also does. For Windows 95, this requires that the Winsock 2 + library for Windows 95 is added or ACE_HAS_WINSOCK2 defined to + 0 in config.h before including config-win32.h (overriding it). Thanks to Giovanni Zito <gzito@mbox.thunder.it> for inquiring about this. diff --git a/ace/ACE.cpp b/ace/ACE.cpp index d004de9c6f9..0a43eaa9e49 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -23,7 +23,7 @@ ACE_RCSID(ace, ACE, "$Id$") char ACE::debug_ = 0; // Hex characters. -const ACE_TCHAR ACE::hex_chars_[] = ACE_TEXT ("0123456789abcdef"); +const ACE_TCHAR ACE::hex_chars_[] = ACE_LIB_TEXT ("0123456789abcdef"); // Size of a VM page. size_t ACE::pagesize_ = 0; @@ -315,13 +315,13 @@ const ACE_TCHAR * ACE::execname (const ACE_TCHAR *old_name) { #if defined (ACE_WIN32) - if (ACE_OS::strstr (old_name, ACE_TEXT (".exe")) == 0) + if (ACE_OS::strstr (old_name, ACE_LIB_TEXT (".exe")) == 0) { ACE_TCHAR *new_name; size_t size = ACE_OS::strlen (old_name) - + ACE_OS::strlen (ACE_TEXT (".exe")) + + ACE_OS::strlen (ACE_LIB_TEXT (".exe")) + 1; ACE_NEW_RETURN (new_name, @@ -332,7 +332,7 @@ ACE::execname (const ACE_TCHAR *old_name) end = ACE_OS::strecpy (new_name, old_name); // Concatenate the .exe suffix onto the end of the executable. - ACE_OS::strcpy (end, ACE_TEXT (".exe")); + ACE_OS::strcpy (end, ACE_LIB_TEXT (".exe")); return new_name; } @@ -687,8 +687,8 @@ ACE::ldfind (const ACE_TCHAR filename[], if (ACE_OS::strcmp (s, dll_suffix) != 0) { ACE_ERROR ((LM_WARNING, - ACE_TEXT ("Warning: improper suffix for a ") - ACE_TEXT ("shared library on this platform: %s\n"), + ACE_LIB_TEXT ("Warning: improper suffix for a ") + ACE_LIB_TEXT ("shared library on this platform: %s\n"), s)); } } @@ -738,19 +738,19 @@ ACE::ldfind (const ACE_TCHAR filename[], // prefix. #if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) ACE_OS::sprintf (pathname, - ACE_TEXT ("%s%s%s"), + ACE_LIB_TEXT ("%s%s%s"), searchpathname, searchfilename, got_suffix ? ACE_static_cast (ACE_TCHAR *, - ACE_TEXT ("")) + ACE_LIB_TEXT ("")) : ACE_static_cast (ACE_TCHAR *, dll_suffix)); #else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ ACE_OS::sprintf (pathname, - ACE_TEXT ("%s%s%s"), + ACE_LIB_TEXT ("%s%s%s"), searchpathname, searchfilename, - got_suffix ? ACE_TEXT ("") : dll_suffix); + got_suffix ? ACE_LIB_TEXT ("") : dll_suffix); #endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ if (ACE_OS::access (pathname, F_OK) == 0) return 0; @@ -758,21 +758,21 @@ ACE::ldfind (const ACE_TCHAR filename[], // Second, try matching the filename *with* adding a prefix. #if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) ACE_OS::sprintf (pathname, - ACE_TEXT ("%s%s%s%s"), + ACE_LIB_TEXT ("%s%s%s%s"), searchpathname, ACE_DLL_PREFIX, searchfilename, got_suffix ? ACE_static_cast (ACE_TCHAR *, - ACE_TEXT ("")) + ACE_LIB_TEXT ("")) : ACE_static_cast (ACE_TCHAR *, dll_suffix)); #else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ ACE_OS::sprintf (pathname, - ACE_TEXT ("%s%s%s%s"), + ACE_LIB_TEXT ("%s%s%s%s"), searchpathname, ACE_DLL_PREFIX, searchfilename, - got_suffix ? ACE_TEXT ("") : dll_suffix); + got_suffix ? ACE_LIB_TEXT ("") : dll_suffix); #endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ if (ACE_OS::access (pathname, F_OK) == 0) return 0; @@ -858,27 +858,27 @@ ACE::ldfind (const ACE_TCHAR filename[], // We need to do it here rather than anywhere else so // that the loop condition will still work. else if (path_entry[0] == '\0') - path_entry = ACE_TEXT ("."); + path_entry = ACE_LIB_TEXT ("."); // First, try matching the filename *without* adding a // prefix. #if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) ACE_OS::sprintf (pathname, - ACE_TEXT ("%s%c%s%s"), + ACE_LIB_TEXT ("%s%c%s%s"), path_entry, ACE_DIRECTORY_SEPARATOR_CHAR, searchfilename, got_suffix ? ACE_static_cast (ACE_TCHAR *, - ACE_TEXT ("")) + ACE_LIB_TEXT ("")) : ACE_static_cast (ACE_TCHAR *, dll_suffix)); #else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ ACE_OS::sprintf (pathname, - ACE_TEXT ("%s%c%s%s"), + ACE_LIB_TEXT ("%s%c%s%s"), path_entry, ACE_DIRECTORY_SEPARATOR_CHAR, searchfilename, - got_suffix ? ACE_TEXT ("") : dll_suffix); + got_suffix ? ACE_LIB_TEXT ("") : dll_suffix); #endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ if (ACE_OS::access (pathname, F_OK) == 0) break; @@ -887,23 +887,23 @@ ACE::ldfind (const ACE_TCHAR filename[], // prefix. #if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) ACE_OS::sprintf (pathname, - ACE_TEXT ("%s%c%s%s%s"), + ACE_LIB_TEXT ("%s%c%s%s%s"), path_entry, ACE_DIRECTORY_SEPARATOR_CHAR, ACE_DLL_PREFIX, searchfilename, got_suffix ? ACE_static_cast (ACE_TCHAR *, - ACE_TEXT ("")) + ACE_LIB_TEXT ("")) : ACE_static_cast (ACE_TCHAR *, dll_suffix)); #else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ ACE_OS::sprintf (pathname, - ACE_TEXT ("%s%c%s%s%s"), + ACE_LIB_TEXT ("%s%c%s%s%s"), path_entry, ACE_DIRECTORY_SEPARATOR_CHAR, ACE_DLL_PREFIX, searchfilename, - got_suffix ? ACE_TEXT ("") : dll_suffix); + got_suffix ? ACE_LIB_TEXT ("") : dll_suffix); #endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ if (ACE_OS::access (pathname, F_OK) == 0) break; @@ -964,7 +964,7 @@ ACE::ldname (const ACE_TCHAR *entry_point) ACE_TCHAR[size], 0); - ACE_OS::strcpy (new_name, ACE_TEXT ("_")); + ACE_OS::strcpy (new_name, ACE_LIB_TEXT ("_")); ACE_OS::strcat (new_name, entry_point); return new_name; @@ -1000,10 +1000,10 @@ ACE::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len) // On non-win32 platforms, check to see what the TMPDIR environment // variable is defined to be. If it doesn't exist, just use /tmp - const ACE_TCHAR *tmpdir = ACE_OS::getenv (ACE_TEXT ("TMPDIR")); + const ACE_TCHAR *tmpdir = ACE_OS::getenv (ACE_LIB_TEXT ("TMPDIR")); if (tmpdir == NULL) - tmpdir = ACE_TEXT ("/tmp"); + tmpdir = ACE_LIB_TEXT ("/tmp"); size_t len = ACE_OS::strlen (tmpdir); @@ -2914,13 +2914,13 @@ ACE::format_hexdump (const char *buffer, { c = (u_char) buffer[(i << 4) + j]; ACE_OS::sprintf (obuf, - ACE_TEXT ("%02x "), + ACE_LIB_TEXT ("%02x "), c); obuf += 3; if (j == 7) { ACE_OS::sprintf (obuf, - ACE_TEXT (" ")); + ACE_LIB_TEXT (" ")); obuf++; } textver[j] = ACE_OS::ace_isprint (c) ? c : '.'; @@ -2929,7 +2929,7 @@ ACE::format_hexdump (const char *buffer, textver[j] = 0; ACE_OS::sprintf (obuf, - ACE_TEXT (" %s\n"), + ACE_LIB_TEXT (" %s\n"), textver); while (*obuf != '\0') @@ -2942,13 +2942,13 @@ ACE::format_hexdump (const char *buffer, { c = (u_char) buffer[size - size % 16 + i]; ACE_OS::sprintf (obuf, - ACE_TEXT ("%02x "), + ACE_LIB_TEXT ("%02x "), c); obuf += 3; if (i == 7) { ACE_OS::sprintf (obuf, - ACE_TEXT (" ")); + ACE_LIB_TEXT (" ")); obuf++; } textver[i] = ACE_OS::ace_isprint (c) ? c : '.'; @@ -2957,14 +2957,14 @@ ACE::format_hexdump (const char *buffer, for (i = size % 16; i < 16; i++) { ACE_OS::sprintf (obuf, - ACE_TEXT (" ")); + ACE_LIB_TEXT (" ")); obuf += 3; textver[i] = ' '; } textver[i] = 0; ACE_OS::sprintf (obuf, - ACE_TEXT (" %s\n"), + ACE_LIB_TEXT (" %s\n"), textver); } return size; @@ -2995,7 +2995,7 @@ ACE::timestamp (ACE_TCHAR date_and_time[], ::GetLocalTime (&local); ACE_OS::sprintf (date_and_time, - ACE_TEXT ("%02d/%02d/%04d %02d.%02d.%02d.%06d"), + ACE_LIB_TEXT ("%02d/%02d/%04d %02d.%02d.%02d.%06d"), (int) local.wMonth, // new, also the %02d in sprintf (int) local.wDay, // new, also the %02d in sprintf (int) local.wYear, // new, also the %02d in sprintf @@ -3707,95 +3707,95 @@ ACE::sock_error (int error) switch (error) { case WSAVERNOTSUPPORTED: - return ACE_TEXT ("version of WinSock not supported"); + return ACE_LIB_TEXT ("version of WinSock not supported"); /* NOTREACHED */ case WSASYSNOTREADY: - return ACE_TEXT ("WinSock not present or not responding"); + return ACE_LIB_TEXT ("WinSock not present or not responding"); /* NOTREACHED */ case WSAEINVAL: - return ACE_TEXT ("app version not supported by DLL"); + return ACE_LIB_TEXT ("app version not supported by DLL"); /* NOTREACHED */ case WSAHOST_NOT_FOUND: - return ACE_TEXT ("Authoritive: Host not found"); + return ACE_LIB_TEXT ("Authoritive: Host not found"); /* NOTREACHED */ case WSATRY_AGAIN: - return ACE_TEXT ("Non-authoritive: host not found or server failure"); + return ACE_LIB_TEXT ("Non-authoritive: host not found or server failure"); /* NOTREACHED */ case WSANO_RECOVERY: - return ACE_TEXT ("Non-recoverable: refused or not implemented"); + return ACE_LIB_TEXT ("Non-recoverable: refused or not implemented"); /* NOTREACHED */ case WSANO_DATA: - return ACE_TEXT ("Valid name, no data record for type"); + return ACE_LIB_TEXT ("Valid name, no data record for type"); /* NOTREACHED */ /* case WSANO_ADDRESS: return "Valid name, no MX record"; */ case WSANOTINITIALISED: - return ACE_TEXT ("WSA Startup not initialized"); + return ACE_LIB_TEXT ("WSA Startup not initialized"); /* NOTREACHED */ case WSAENETDOWN: - return ACE_TEXT ("Network subsystem failed"); + return ACE_LIB_TEXT ("Network subsystem failed"); /* NOTREACHED */ case WSAEINPROGRESS: - return ACE_TEXT ("Blocking operation in progress"); + return ACE_LIB_TEXT ("Blocking operation in progress"); /* NOTREACHED */ case WSAEINTR: - return ACE_TEXT ("Blocking call cancelled"); + return ACE_LIB_TEXT ("Blocking call cancelled"); /* NOTREACHED */ case WSAEAFNOSUPPORT: - return ACE_TEXT ("address family not supported"); + return ACE_LIB_TEXT ("address family not supported"); /* NOTREACHED */ case WSAEMFILE: - return ACE_TEXT ("no file handles available"); + return ACE_LIB_TEXT ("no file handles available"); /* NOTREACHED */ case WSAENOBUFS: - return ACE_TEXT ("no buffer space available"); + return ACE_LIB_TEXT ("no buffer space available"); /* NOTREACHED */ case WSAEPROTONOSUPPORT: - return ACE_TEXT ("specified protocol not supported"); + return ACE_LIB_TEXT ("specified protocol not supported"); /* NOTREACHED */ case WSAEPROTOTYPE: - return ACE_TEXT ("protocol wrong type for this socket"); + return ACE_LIB_TEXT ("protocol wrong type for this socket"); /* NOTREACHED */ case WSAESOCKTNOSUPPORT: - return ACE_TEXT ("socket type not supported for address family"); + return ACE_LIB_TEXT ("socket type not supported for address family"); /* NOTREACHED */ case WSAENOTSOCK: - return ACE_TEXT ("handle is not a socket"); + return ACE_LIB_TEXT ("handle is not a socket"); /* NOTREACHED */ case WSAEWOULDBLOCK: - return ACE_TEXT ("socket marked as non-blocking and SO_LINGER set not 0"); + return ACE_LIB_TEXT ("socket marked as non-blocking and SO_LINGER set not 0"); /* NOTREACHED */ case WSAEADDRINUSE: - return ACE_TEXT ("address already in use"); + return ACE_LIB_TEXT ("address already in use"); /* NOTREACHED */ case WSAECONNABORTED: - return ACE_TEXT ("connection aborted"); + return ACE_LIB_TEXT ("connection aborted"); /* NOTREACHED */ case WSAECONNRESET: - return ACE_TEXT ("connection reset"); + return ACE_LIB_TEXT ("connection reset"); /* NOTREACHED */ case WSAENOTCONN: - return ACE_TEXT ("not connected"); + return ACE_LIB_TEXT ("not connected"); /* NOTREACHED */ case WSAETIMEDOUT: - return ACE_TEXT ("connection timed out"); + return ACE_LIB_TEXT ("connection timed out"); /* NOTREACHED */ case WSAECONNREFUSED: - return ACE_TEXT ("connection refused"); + return ACE_LIB_TEXT ("connection refused"); /* NOTREACHED */ case WSAEHOSTDOWN: - return ACE_TEXT ("host down"); + return ACE_LIB_TEXT ("host down"); /* NOTREACHED */ case WSAEHOSTUNREACH: - return ACE_TEXT ("host unreachable"); + return ACE_LIB_TEXT ("host unreachable"); /* NOTREACHED */ case WSAEADDRNOTAVAIL: - return ACE_TEXT ("address not available"); + return ACE_LIB_TEXT ("address not available"); /* NOTREACHED */ default: - ACE_OS::sprintf (unknown_msg, ACE_TEXT ("unknown error: %d"), error); + ACE_OS::sprintf (unknown_msg, ACE_LIB_TEXT ("unknown error: %d"), error); return unknown_msg; /* NOTREACHED */ } @@ -3821,8 +3821,8 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, if (s == ACE_INVALID_HANDLE) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_OS::socket")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_OS::socket")), -1); struct ifconf ifc; @@ -3840,9 +3840,9 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, #endif /* AIX */ if (ACE_OS::ioctl (s, cmd, (char *) &ifc) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::get_bcast_addr:") - ACE_TEXT ("ioctl (get interface configuration)")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE::get_bcast_addr:") + ACE_LIB_TEXT ("ioctl (get interface configuration)")), -1); struct ifreq *ifr = ifc.ifc_req; @@ -3907,9 +3907,9 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, if (ifr->ifr_addr.sa_family != AF_INET) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::get_bcast_addr:") - ACE_TEXT ("Not AF_INET"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE::get_bcast_addr:") + ACE_LIB_TEXT ("Not AF_INET"))); continue; } @@ -3919,18 +3919,18 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, if (ACE_OS::ioctl (s, SIOCGIFFLAGS, (char *) &flags) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::get_bcast_addr:") - ACE_TEXT (" ioctl (get interface flags)"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE::get_bcast_addr:") + ACE_LIB_TEXT (" ioctl (get interface flags)"))); continue; } if (ACE_BIT_DISABLED (flags.ifr_flags, IFF_UP)) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::get_bcast_addr:") - ACE_TEXT ("Network interface is not up"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE::get_bcast_addr:") + ACE_LIB_TEXT ("Network interface is not up"))); continue; } @@ -3943,9 +3943,9 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, SIOCGIFBRDADDR, (char *) &if_req) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::get_bcast_addr:") - ACE_TEXT ("ioctl (get broadaddr)"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE::get_bcast_addr:") + ACE_LIB_TEXT ("ioctl (get broadaddr)"))); else { ACE_OS::memcpy (ACE_reinterpret_cast(sockaddr_in *, &ip_addr), @@ -3965,9 +3965,9 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, } else ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::get_bcast_addr:") - ACE_TEXT ("Broadcast is not enable for this interface."))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE::get_bcast_addr:") + ACE_LIB_TEXT ("Broadcast is not enable for this interface."))); if (handle == ACE_INVALID_HANDLE) ACE_OS::close (s); @@ -4000,8 +4000,8 @@ ACE::count_interfaces (ACE_HANDLE handle, SIOCGIFNUM, (caddr_t) &tmp_how_many) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("ACE::get_ip_interfaces:") - ACE_TEXT ("ioctl - SIOCGIFNUM failed")), + ACE_LIB_TEXT ("ACE::get_ip_interfaces:") + ACE_LIB_TEXT ("ioctl - SIOCGIFNUM failed")), -1); how_many = (size_t) tmp_how_many; return 0; @@ -4045,8 +4045,8 @@ ACE::count_interfaces (ACE_HANDLE handle, { ACE_OS::free (ifcfg.ifc_req); ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("count_interfaces:ioctl:") - ACE_TEXT ("SIOCGIFCONF failed")), + ACE_LIB_TEXT ("count_interfaces:ioctl:") + ACE_LIB_TEXT ("SIOCGIFCONF failed")), -1); } @@ -4124,7 +4124,7 @@ get_reg_value (const ACE_TCHAR *key, &hk); // 1. open key that defines the interfaces used for TCP/IP? if (rc != ERROR_SUCCESS) - // print_error_string(ACE_TEXT("RegOpenKeyEx"), rc); + // print_error_string(ACE_LIB_TEXT ("RegOpenKeyEx"), rc); return -1; rc = ACE_TEXT_RegQueryValueEx (hk, @@ -4135,7 +4135,7 @@ get_reg_value (const ACE_TCHAR *key, &buf_len); if (rc != ERROR_SUCCESS) { - // print_error_string(ACE_TEXT("RegEnumKeyEx"), rc); + // print_error_string(ACE_LIB_TEXT ("RegEnumKeyEx"), rc); RegCloseKey (hk); return -2; } @@ -4314,13 +4314,13 @@ ACE::get_ip_interfaces (size_t &count, # else /* ACE_HAS_PHARLAP */ const ACE_TCHAR *SVCS_KEY1 = - ACE_TEXT ("SYSTEM\\CurrentControlSet\\Services\\"); + ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services\\"); const ACE_TCHAR *LINKAGE_KEY1 = - ACE_TEXT ("SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Linkage"); - const ACE_TCHAR *TCP_PARAM_SUBKEY = ACE_TEXT ("\\Parameters\\Tcpip"); - const ACE_TCHAR *BIND_NAME_ID = ACE_TEXT ("Bind"); - const ACE_TCHAR *IPADDR_NAME_ID = ACE_TEXT ("IPAddress"); - const ACE_TCHAR *INVALID_TCPIP_DEVICE_ADDR = ACE_TEXT ("0.0.0.0"); + ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Linkage"); + const ACE_TCHAR *TCP_PARAM_SUBKEY = ACE_LIB_TEXT ("\\Parameters\\Tcpip"); + const ACE_TCHAR *BIND_NAME_ID = ACE_LIB_TEXT ("Bind"); + const ACE_TCHAR *IPADDR_NAME_ID = ACE_LIB_TEXT ("IPAddress"); + const ACE_TCHAR *INVALID_TCPIP_DEVICE_ADDR = ACE_LIB_TEXT ("0.0.0.0"); ACE_TCHAR raw_buffer[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1]; DWORD raw_buflen = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1; @@ -4335,7 +4335,7 @@ ACE::get_ip_interfaces (size_t &count, // return buffer contains 0 delimited strings ACE_Tokenizer dev_names (raw_buffer); - dev_names.delimiter (ACE_TEXT('\0')); + dev_names.delimiter (ACE_LIB_TEXT ('\0')); int n_interfaces = 0; // Count the number of interfaces @@ -4398,8 +4398,8 @@ ACE::get_ip_interfaces (size_t &count, if (handle == ACE_INVALID_HANDLE) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::get_ip_interfaces:open")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE::get_ip_interfaces:open")), -1); if (ACE::count_interfaces (handle, num_ifs)) { @@ -4442,9 +4442,9 @@ ACE::get_ip_interfaces (size_t &count, { ACE_OS::close (handle); ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("is_address_local:") - ACE_TEXT ("ioctl - SIOCGIFCONF failed")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("is_address_local:") + ACE_LIB_TEXT ("ioctl - SIOCGIFCONF failed")), -1); } diff --git a/ace/ACE.h b/ace/ACE.h index 9459d6019f5..08ca633c3ac 100644 --- a/ace/ACE.h +++ b/ace/ACE.h @@ -466,16 +466,16 @@ public: // 0 if unsuccessful, else returns pointer to beginning of the // "time" portion of <day_and_time>. - static pid_t fork (const ACE_TCHAR *program_name = ACE_TEXT ("<unknown>"), + static pid_t fork (const ACE_TCHAR *program_name = ACE_LIB_TEXT ("<unknown>"), int avoid_zombies = 0); // if <avoid_zombies> == 0 call <ACE_OS::fork> directly, else create // an orphan process that's inherited by the init process; init // cleans up when the orphan process terminates so we don't create // zombies. - static int daemonize (const ACE_TCHAR pathname[] = ACE_TEXT ("/"), + static int daemonize (const ACE_TCHAR pathname[] = ACE_LIB_TEXT ("/"), int close_all_handles = ACE_DEFAULT_CLOSE_ALL_HANDLES, - const ACE_TCHAR program_name[] = ACE_TEXT ("<unknown>")); + const ACE_TCHAR program_name[] = ACE_LIB_TEXT ("<unknown>")); // Become a daemon process using the algorithm in Richard Stevens // "Advanced Programming in the UNIX Environment." If // <close_all_handles> is non-zero then all open file handles are diff --git a/ace/ACE.i b/ace/ACE.i index 59105519047..792cc8056ff 100644 --- a/ace/ACE.i +++ b/ace/ACE.i @@ -310,11 +310,11 @@ ASYS_INLINE u_char ACE::hex2byte (ACE_TCHAR c) { if (isdigit (c)) - return (u_char) (c - ACE_TEXT ('0')); + return (u_char) (c - ACE_LIB_TEXT ('0')); else if (islower (c)) - return (u_char) (10 + c - ACE_TEXT ('a')); + return (u_char) (10 + c - ACE_LIB_TEXT ('a')); else - return (u_char) (10 + c - ACE_TEXT ('A')); + return (u_char) (10 + c - ACE_LIB_TEXT ('A')); } ASYS_INLINE char diff --git a/ace/ARGV.cpp b/ace/ARGV.cpp index d293eb0cf72..9d485da722f 100644 --- a/ace/ARGV.cpp +++ b/ace/ARGV.cpp @@ -20,13 +20,13 @@ ACE_ARGV::dump (void) const ACE_TRACE ("ACE_ARGV::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("argc_ = %d"), this->argc_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("argc_ = %d"), this->argc_)); for (size_t i = 0; i < this->argc_; i++) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nargv_[%i] = %s"), i, this->argv_[i])); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nargv_[%i] = %s"), i, this->argv_[i])); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nbuf = %s\n"), this->buf_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nbuf = %s\n"), this->buf_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -75,8 +75,8 @@ ACE_ARGV::ACE_ARGV (const ACE_TCHAR buf[], // Create this->argv_. if (this->string_to_argv () == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("string_to_argv"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("string_to_argv"))); } ACE_ARGV::ACE_ARGV (ACE_TCHAR *argv[], @@ -137,7 +137,7 @@ ACE_ARGV::ACE_ARGV (ACE_TCHAR *argv[], // Replace the null char that strecpy copies with white space as // a separator. - *(end-1) = ACE_TEXT (' '); + *(end-1) = ACE_LIB_TEXT (' '); } // Remember how many arguments there are @@ -223,7 +223,7 @@ ACE_ARGV::add (const ACE_TCHAR *next_arg) // Put the new argument at the end of the queue. if (this->queue_.enqueue_tail ((ACE_TCHAR *) next_arg) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Can't add more to ARGV queue")), + ACE_LIB_TEXT ("Can't add more to ARGV queue")), -1); this->length_ += ACE_OS::strlen (next_arg); diff --git a/ace/ATM_Acceptor.cpp b/ace/ATM_Acceptor.cpp index 6023a100ce0..1af3671bf43 100644 --- a/ace/ATM_Acceptor.cpp +++ b/ace/ATM_Acceptor.cpp @@ -78,7 +78,7 @@ ACE_ATM_Acceptor::get_local_addr( ACE_ATM_Addr &local_addr ) (struct sockaddr *) &(myaddr->sockaddratmsvc), &addrlen) < 0) { ACE_DEBUG((LM_DEBUG, - ACE_TEXT("ATM_Acceptor(get_local_addr): ioctl: %d\n"), + ACE_LIB_TEXT ("ATM_Acceptor(get_local_addr): ioctl: %d\n"), errno)); return -1; } @@ -175,7 +175,7 @@ ACE_ATM_Acceptor::open (const ACE_Addr &remote_sap, )) == ACE_INVALID_HANDLE) { ACE_DEBUG(LM_DEBUG, - ACE_TEXT("Acceptor(socket): socket %d\n"), + ACE_LIB_TEXT ("Acceptor(socket): socket %d\n"), errno); return (ACE_INVALID_HANDLE); } @@ -212,7 +212,7 @@ ACE_ATM_Acceptor::open (const ACE_Addr &remote_sap, sizeof (local_sap_addr->sockaddratmsvc) ) == -1) { ACE_DEBUG(LM_DEBUG, - ACE_TEXT("Acceptor(open): bind %d\n"), + ACE_LIB_TEXT ("Acceptor(open): bind %d\n"), errno); return -1; } @@ -221,7 +221,7 @@ ACE_ATM_Acceptor::open (const ACE_Addr &remote_sap, backlog) == -1) { ACE_DEBUG(LM_DEBUG, - ACE_TEXT("Acceptor(listen): listen %d\n"), + ACE_LIB_TEXT ("Acceptor(listen): listen %d\n"), errno); return -1; } diff --git a/ace/ATM_Acceptor.i b/ace/ATM_Acceptor.i index 44b7469d4eb..3561cfa4733 100644 --- a/ace/ATM_Acceptor.i +++ b/ace/ATM_Acceptor.i @@ -12,8 +12,8 @@ ACE_ATM_Acceptor::ACE_ATM_Acceptor (const ACE_Addr &remote_sap, backlog, params) < 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_ATM_Acceptor::ACE_ATM_Acceptor"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_ATM_Acceptor::ACE_ATM_Acceptor"))); } ACE_INLINE diff --git a/ace/ATM_Addr.cpp b/ace/ATM_Addr.cpp index 34aae160283..ccc02252c03 100644 --- a/ace/ATM_Addr.cpp +++ b/ace/ATM_Addr.cpp @@ -367,7 +367,7 @@ ACE_ATM_Addr::addr_to_string (ACE_TCHAR addr[], atm_addr_.sap.t_atm_sap_addr.address, ATMNSAP_ADDR_LEN); ACE_OS::sprintf (buffer, - ACE_TEXT ("%s"), + ACE_LIB_TEXT ("%s"), atmnsap_ntoa (nsap)); size_t total_len = ACE_OS::strlen (buffer) + sizeof ('\0'); @@ -387,7 +387,7 @@ ACE_ATM_Addr::addr_to_string (ACE_TCHAR addr[], for ( i = 0; i < ATM_ADDR_SIZE; i++ ) { buffer[ i * 3 ] = '\0'; - ACE_OS::sprintf( buffer, ACE_TEXT( "%s%02x." ), + ACE_OS::sprintf( buffer, ACE_LIB_TEXT ( "%s%02x." ), buffer, atm_addr_.satm_number.Addr[ i ]); } @@ -492,8 +492,8 @@ ACE_ATM_Addr::dump (void) const ACE_TCHAR s[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16]; ACE_OS::sprintf (s, - ACE_TEXT ("%s"), + ACE_LIB_TEXT ("%s"), this->addr_to_string ()); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s"), s)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("%s"), s)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/ATM_Connector.cpp b/ace/ATM_Connector.cpp index 879daf57a61..d804f87ef03 100644 --- a/ace/ATM_Connector.cpp +++ b/ace/ATM_Connector.cpp @@ -56,7 +56,7 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream, &options.get_qos()); #elif defined (ACE_HAS_FORE_ATM_WS2) ACE_DEBUG(LM_DEBUG, - ACE_TEXT("ATM_Connector(connect): set QoS parameters\n" )); + ACE_LIB_TEXT ("ATM_Connector(connect): set QoS parameters\n" )); ACE_HANDLE s = new_stream.get_handle(); struct sockaddr_atm *saddr = ( struct sockaddr_atm *)remote_sap.get_addr(); @@ -69,7 +69,7 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream, 0); ACE_DEBUG(LM_DEBUG, - ACE_TEXT("ATM_Connector(connect): connecting...\n")); + ACE_LIB_TEXT ("ATM_Connector(connect): connecting...\n")); int result = ACE_OS::connect( s, ( struct sockaddr *)saddr, @@ -108,7 +108,7 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream, ACE_reinterpret_cast(char*, &qos), sizeof(qos)) < 0) { - ACE_DEBUG((LM_DEBUG,ACE_TEXT("ATM_Connector(connect): unable to set qos %d\n"), + ACE_DEBUG((LM_DEBUG,ACE_LIB_TEXT ("ATM_Connector(connect): unable to set qos %d\n"), errno)); return -1; } @@ -119,7 +119,7 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream, if ( result != 0 ) ACE_DEBUG(LM_DEBUG, - ACE_TEXT("ATM_Connector(connect): connection failed, %d\n"), + ACE_LIB_TEXT ("ATM_Connector(connect): connection failed, %d\n"), errno); return result; diff --git a/ace/ATM_Connector.i b/ace/ATM_Connector.i index 9ac8281cfbf..dbdef470165 100644 --- a/ace/ATM_Connector.i +++ b/ace/ATM_Connector.i @@ -25,8 +25,8 @@ ACE_ATM_Connector::ACE_ATM_Connector (ACE_ATM_Stream &new_stream, flags, perms) == ACE_INVALID_HANDLE && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_ATM_Stream::ACE_ATM_Stream"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_ATM_Stream::ACE_ATM_Stream"))); } // Try to complete a non-blocking connection. diff --git a/ace/ATM_QoS.cpp b/ace/ATM_QoS.cpp index b40f8cc6dc0..c775f61a2db 100644 --- a/ace/ATM_QoS.cpp +++ b/ace/ATM_QoS.cpp @@ -116,7 +116,7 @@ ACE_ATM_QoS::ACE_ATM_QoS(int rate, qos_.ProviderSpecific.buf = (char *) ACE_OS::malloc(size); if (qos_.ProviderSpecific.buf == 0) { ACE_ERROR((LM_ERROR, - ACE_TEXT("ACE_ATM_QoS::ACE_ATM_QoS: Unable to allocate %d bytes for qos_.ProviderSpecific.buf\n"), + ACE_LIB_TEXT ("ACE_ATM_QoS::ACE_ATM_QoS: Unable to allocate %d bytes for qos_.ProviderSpecific.buf\n"), size)); return; } @@ -296,7 +296,7 @@ ACE_ATM_QoS::set_cbr_rate (int rate, qos_.ProviderSpecific.buf = (char *) ACE_OS::malloc(size); if (qos_.ProviderSpecific.buf == 0) { ACE_ERROR((LM_ERROR, - ACE_TEXT ("ACE_ATM_QoS::ACE_ATM_QoS: Unable to allocate %d bytes for qos_.ProviderSpecific.buf\n"), + ACE_LIB_TEXT ("ACE_ATM_QoS::ACE_ATM_QoS: Unable to allocate %d bytes for qos_.ProviderSpecific.buf\n"), size)); return; } @@ -472,7 +472,7 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd, if (buf == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Unable to allocate %d bytes for options\n"), + ACE_LIB_TEXT ("Unable to allocate %d bytes for options\n"), info.options), 0); @@ -508,7 +508,7 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd, { ACE_OS::t_error("t_getname (local_address)"); ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Can't get local address!\n"))); + ACE_LIB_TEXT ("Can't get local address!\n"))); ACE_OS::free (buf); return 0; } diff --git a/ace/ATM_Stream.cpp b/ace/ATM_Stream.cpp index 02ccf86a37d..6ab6fc84261 100644 --- a/ace/ATM_Stream.cpp +++ b/ace/ATM_Stream.cpp @@ -123,7 +123,7 @@ ACE_ATM_Stream::get_peer_name (void) const if ((total_len = atm2text(buffer,sizeof buffer, (struct sockaddr *)&(name.sockaddratmsvc), A2T_PRETTY|A2T_NAME)) < 0) { - ACE_DEBUG((LM_DEBUG,ACE_TEXT("ACE_ATM_Stream(get_peer_name):%d"),errno)); + ACE_DEBUG((LM_DEBUG,ACE_LIB_TEXT ("ACE_ATM_Stream(get_peer_name):%d"),errno)); return 0; } @@ -253,7 +253,7 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, ACE_reinterpret_cast(char*,&mypvcaddr), &addrpvclen) < 0) { ACE_DEBUG(LM_DEBUG, - ACE_TEXT("ACE_ATM_Stream::get_vpi_vci: getsockopt %d\n"), + ACE_LIB_TEXT ("ACE_ATM_Stream::get_vpi_vci: getsockopt %d\n"), errno); return -1; } @@ -269,7 +269,7 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, ACE_reinterpret_cast(char*,&mypvcid), &pvcidlen) < 0) { ACE_DEBUG(LM_DEBUG, - ACE_TEXT("ACE_ATM_Stream::get_vpi_vci: getsockopt %d\n"), + ACE_LIB_TEXT ("ACE_ATM_Stream::get_vpi_vci: getsockopt %d\n"), errno); return -1; } @@ -279,7 +279,7 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, return 0; #else ACE_DEBUG(LM_DEBUG, - ACE_TEXT("ACE_ATM_Stream::get_vpi_vci: Not implemented in this ATM version. Update to >= 0.62\n Or patch 0.59")); + ACE_LIB_TEXT ("ACE_ATM_Stream::get_vpi_vci: Not implemented in this ATM version. Update to >= 0.62\n Or patch 0.59")); ACE_UNUSED_ARG (vci); ACE_UNUSED_ARG (vpi); diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp index 824c5892191..ddc4a21832b 100644 --- a/ace/Acceptor.cpp +++ b/ace/Acceptor.cpp @@ -125,8 +125,8 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Acceptor use_select, reuse_addr) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Acceptor::ACE_Acceptor"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Acceptor::ACE_Acceptor"))); } template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> @@ -167,10 +167,10 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ACE_TCHAR **strp, return -1; ACE_OS::sprintf (buf, - ACE_TEXT ("%s\t %s %s"), - ACE_TEXT ("ACE_Acceptor"), + ACE_LIB_TEXT ("%s\t %s %s"), + ACE_LIB_TEXT ("ACE_Acceptor"), addr_str, - ACE_TEXT ("# acceptor factory\n")); + ACE_LIB_TEXT ("# acceptor factory\n")); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) return -1; @@ -222,7 +222,7 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE, // Shut down the listen socket to recycle the handles. if (this->peer_acceptor_.close () == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("close\n"))); + ACE_LIB_TEXT ("close\n"))); // Set the Reactor to 0 so that we don't try to close down // again. this->reactor (0); @@ -367,8 +367,8 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene { if (ACE::debug () > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%p\n"), - ACE_TEXT ("make_svc_handler"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("make_svc_handler"))); return 0; } // Accept connection into the Svc_Handler. @@ -377,8 +377,8 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene { if (ACE::debug () > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%p\n"), - ACE_TEXT ("accept_svc_handler"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("accept_svc_handler"))); return 0; } @@ -390,8 +390,8 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene { if (ACE::debug () > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%p\n"), - ACE_TEXT ("activate_svc_handler"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("activate_svc_handler"))); return 0; } @@ -443,18 +443,18 @@ 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, ACE_TEXT ("delete_creation_strategy_ = %d"), delete_creation_strategy_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("delete_creation_strategy_ = %d"), delete_creation_strategy_)); this->accept_strategy_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_accept_strategy_ = %d"), delete_accept_strategy_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("delete_accept_strategy_ = %d"), delete_accept_strategy_)); this->concurrency_strategy_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_concurrency_strategy_ = %d"), delete_concurrency_strategy_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("delete_concurrency_strategy_ = %d"), delete_concurrency_strategy_)); this->scheduling_strategy_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_scheduling_strategy_ = %d"), delete_scheduling_strategy_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nservice_name_ = %s"), - this->service_name_ == 0 ? ACE_TEXT ("<unknown>") : this->service_name_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nservice_description_ = %s"), - this->service_description_ == 0 ? ACE_TEXT ("<unknown>") : this->service_description_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nservice_port_ = %d"), this->service_port_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("delete_scheduling_strategy_ = %d"), delete_scheduling_strategy_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nservice_name_ = %s"), + this->service_name_ == 0 ? ACE_LIB_TEXT ("<unknown>") : this->service_name_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nservice_description_ = %s"), + this->service_description_ == 0 ? ACE_LIB_TEXT ("<unknown>") : this->service_description_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nservice_port_ = %d"), this->service_port_)); this->service_addr_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -637,8 +637,8 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor service_description, use_select) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Strategy_Acceptor::ACE_Strategy_Acceptor"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Strategy_Acceptor::ACE_Strategy_Acceptor"))); } // Perform termination activities when <this> is removed from the @@ -769,13 +769,13 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ACE_TCHAR **strp, // @@ Should add the protocol in... ACE_OS::sprintf (buf, - ACE_TEXT ("%s\t %s #%s\n"), + ACE_LIB_TEXT ("%s\t %s #%s\n"), this->service_name_ == 0 - ? ACE_TEXT ("<unknown>") + ? ACE_LIB_TEXT ("<unknown>") : this->service_name_, service_addr_str, this->service_description_ == 0 - ? ACE_TEXT ("<unknown>") + ? ACE_LIB_TEXT ("<unknown>") : this->service_description_); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) @@ -800,10 +800,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, ACE_TEXT ("\nsvc_handler_ = %x"), this->svc_handler_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nrestart_ = %d"), this->restart_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsvc_handler_ = %x"), this->svc_handler_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nrestart_ = %d"), this->restart_)); this->peer_acceptor_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_concurrency_strategy_ = %d"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("delete_concurrency_strategy_ = %d"), delete_concurrency_strategy_)); this->concurrency_strategy_->dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -851,8 +851,8 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Oneshot_Acceptor ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Oneshot_Acceptor"); if (this->open (local_addr, reactor, cs) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Oneshot_Acceptor::ACE_Oneshot_Acceptor"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Oneshot_Acceptor::ACE_Oneshot_Acceptor"))); } template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> @@ -892,7 +892,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE if (this->peer_acceptor_.close () == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("close\n"))); + ACE_LIB_TEXT ("close\n"))); } return 0; } @@ -1120,10 +1120,10 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ACE_TCHAR **strp, return -1; ACE_OS::sprintf (buf, - ACE_TEXT ("%s\t %s %s"), - ACE_TEXT ("ACE_Oneshot_Acceptor"), + ACE_LIB_TEXT ("%s\t %s %s"), + ACE_LIB_TEXT ("ACE_Oneshot_Acceptor"), addr_str, - ACE_TEXT ("#oneshot acceptor factory\n")); + ACE_LIB_TEXT ("#oneshot acceptor factory\n")); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) return -1; diff --git a/ace/Activation_Queue.cpp b/ace/Activation_Queue.cpp index 0072667f561..491b4d57ad5 100644 --- a/ace/Activation_Queue.cpp +++ b/ace/Activation_Queue.cpp @@ -17,13 +17,13 @@ ACE_Activation_Queue::dump (void) const { ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("delete_queue_ = %d\n"), + ACE_LIB_TEXT ("delete_queue_ = %d\n"), this->delete_queue_)); - ACE_DEBUG ((LM_INFO, ACE_TEXT ("queue_: \n"))); + ACE_DEBUG ((LM_INFO, ACE_LIB_TEXT ("queue_: \n"))); if (this->queue_) this->queue_->dump(); else - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(NULL)\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(NULL)\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Addr.cpp b/ace/Addr.cpp index d0072b55d40..c0bb1efbf80 100644 --- a/ace/Addr.cpp +++ b/ace/Addr.cpp @@ -38,8 +38,8 @@ ACE_Addr::dump (void) const ACE_TRACE ("ACE_Addr::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("addr_type_ = %d"), this->addr_type_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\naddr_size_ = %d"), this->addr_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("addr_type_ = %d"), this->addr_type_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\naddr_size_ = %d"), this->addr_size_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Arg_Shifter.cpp b/ace/Arg_Shifter.cpp index ec7e8127b8c..cbe01bb908c 100644 --- a/ace/Arg_Shifter.cpp +++ b/ace/Arg_Shifter.cpp @@ -108,7 +108,7 @@ ACE_Arg_Shifter::cur_arg_strncasecmp (const ACE_TCHAR *flag) // matches, with more info to boot! return ACE_OS::strspn (this->temp_[current_index_] + flag_length, - ACE_TEXT (" ")) + flag_length; + ACE_LIB_TEXT (" ")) + flag_length; } } } diff --git a/ace/Asynch_Acceptor.cpp b/ace/Asynch_Acceptor.cpp index 686ccff660d..1da5c30086d 100644 --- a/ace/Asynch_Acceptor.cpp +++ b/ace/Asynch_Acceptor.cpp @@ -56,8 +56,8 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, this->listen_handle_ = ACE_OS::socket (PF_INET, SOCK_STREAM, 0); if (this->listen_handle_ == ACE_INVALID_HANDLE) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_OS::socket")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_OS::socket")), -1); // Initialize the ACE_Asynch_Accept if (this->asynch_accept_.open (*this, @@ -65,8 +65,8 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, 0, this->proactor ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Asynch_Accept::open")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Asynch_Accept::open")), -1); if (reuse_addr) { @@ -78,8 +78,8 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, (const char*) &one, sizeof one) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_OS::setsockopt")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_OS::setsockopt")), -1); } @@ -88,8 +88,8 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, if (address == sa && ACE::bind_port (this->listen_handle_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::bind_port")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE::bind_port")), -1); // Bind to the specified port. @@ -135,8 +135,8 @@ ACE_Asynch_Acceptor<HANDLER>::set_handle (ACE_HANDLE listen_handle) 0, this->proactor ()) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Asynch_Accept::open"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Asynch_Accept::open"))); } template <class HANDLER> ACE_HANDLE @@ -165,8 +165,8 @@ ACE_Asynch_Acceptor<HANDLER>::accept (size_t bytes_to_read, const void *act) // Cleanup on error message_block->release (); ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Asynch_Accept::accept")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Asynch_Accept::accept")), -1); } return 0; @@ -188,8 +188,8 @@ ACE_Asynch_Acceptor<HANDLER>::handle_accept (const ACE_Asynch_Accept::Result &re { error = 1; ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("AcceptEx"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("AcceptEx"))); } #if !defined (ACE_HAS_AIO_CALLS) @@ -207,8 +207,8 @@ ACE_Asynch_Acceptor<HANDLER>::handle_accept (const ACE_Asynch_Accept::Result &re { error = 1; ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p"), - ACE_TEXT ("ACE_OS::setsockopt"))); + ACE_LIB_TEXT ("%p"), + ACE_LIB_TEXT ("ACE_OS::setsockopt"))); } #endif /* ACE_HAS_AIO_CALLS */ @@ -229,8 +229,8 @@ ACE_Asynch_Acceptor<HANDLER>::handle_accept (const ACE_Asynch_Accept::Result &re { error = 1; ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Address validation failed"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("Address validation failed"))); } HANDLER *new_handler = 0; @@ -242,8 +242,8 @@ ACE_Asynch_Acceptor<HANDLER>::handle_accept (const ACE_Asynch_Accept::Result &re { error = 1; ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Making of new handler failed"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("Making of new handler failed"))); } } diff --git a/ace/Asynch_IO.cpp b/ace/Asynch_IO.cpp index 2ac3e7c947f..0d2595f82b9 100644 --- a/ace/Asynch_IO.cpp +++ b/ace/Asynch_IO.cpp @@ -1000,14 +1000,14 @@ ACE_Service_Handler::addresses (const ACE_INET_Addr &remote_address, // Default behavior is to print out the addresses. ACE_TCHAR 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, ACE_TEXT ("%p\n"), ACE_TEXT ("can't obtain local_address's address string"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_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, ACE_TEXT ("%p\n"), ACE_TEXT ("can't obtain remote_address's address string"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("can't obtain remote_address's address string"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("On fd %d\n"), this->handle ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("local address %s\n"), local_address_buf)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("remote address %s\n"), remote_address_buf)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("On fd %d\n"), this->handle ())); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("local address %s\n"), local_address_buf)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("remote address %s\n"), remote_address_buf)); } void diff --git a/ace/Based_Pointer_T.cpp b/ace/Based_Pointer_T.cpp index 14ca9094fb7..5bf6352b406 100644 --- a/ace/Based_Pointer_T.cpp +++ b/ace/Based_Pointer_T.cpp @@ -7,7 +7,7 @@ #include "ace/Based_Pointer_Repository.h" #include "ace/Log_Msg.h" -# define ACE_TRACEX(X) ACE_Trace ____ (ACE_TEXT (X), __LINE__, ACE_TEXT (__FILE__)) +# define ACE_TRACEX(X) ACE_Trace ____ (ACE_LIB_TEXT (X), __LINE__, ACE_LIB_TEXT (__FILE__)) #if !defined (__ACE_INLINE__) #include "ace/Based_Pointer_T.i" @@ -25,9 +25,9 @@ ACE_Based_Pointer_Basic<CONCRETE>::dump (void) const ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntarget_ = %d\n"), this->target_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base_offset_ = %d\n"), this->base_offset_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("computed pointer = %x\n"), (CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this)))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntarget_ = %d\n"), this->target_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base_offset_ = %d\n"), this->base_offset_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("computed pointer = %x\n"), (CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this)))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h index 8bcb1d4bb30..498bb98f26c 100644 --- a/ace/Basic_Types.h +++ b/ace/Basic_Types.h @@ -439,11 +439,11 @@ typedef ACE_UINT16 ACE_USHORT16; # endif /* ! ACE_WIN32 && ! ACE_LACKS_LONGLONG_T */ #if !defined (ACE_UINT64_FORMAT_SPECIFIER) -# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%llu") +# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%llu") #endif /* ACE_UINT64_FORMAT_SPECIFIER */ #if !defined (ACE_INT64_FORMAT_SPECIFIER) -# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%lld") +# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lld") #endif /* ACE_INT64_FORMAT_SPECIFIER */ // Cast from UINT64 to a double requires an intermediate cast to INT64 diff --git a/ace/CORBA_Handler.cpp b/ace/CORBA_Handler.cpp index a4d20ae153b..9c19a38d52b 100644 --- a/ace/CORBA_Handler.cpp +++ b/ace/CORBA_Handler.cpp @@ -22,7 +22,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, ACE_TEXT ("\nreference_count_ = %d"), this->reference_count_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nreference_count_ = %d"), this->reference_count_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -45,8 +45,8 @@ ACE_ST_CORBA_Handler::dump (void) const ACE_CORBA_Handler::dump (); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), this->instance_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\niteration_ = %d"), this->iterations_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("instance_ = %x"), this->instance_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\niteration_ = %d"), this->iterations_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -81,7 +81,7 @@ void ACE_ST_CORBA_Handler::insert_handle (ACE_HANDLE handle) { ACE_TRACE ("ACE_ST_CORBA_Handler::insert_handle"); -// ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("+++ inserting %d\n"), handle)); +// ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("+++ inserting %d\n"), handle)); #if defined (ACE_TAKEOVER_ORBIX_CALLBACKS) if (ACE_ST_CORBA_Handler::previous_orbix_open_callback_ != 0) @@ -96,7 +96,7 @@ ACE_ST_CORBA_Handler::insert_handle (ACE_HANDLE handle) (handle, ACE_ST_CORBA_Handler::instance_, ACE_Event_Handler::READ_MASK); else ; -// ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("insert_handle: reactor NULL\n"))); +// ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("insert_handle: reactor NULL\n"))); } // Remove a descriptor from the ACE_Reactor that Orbix has just deleted. @@ -106,7 +106,7 @@ void ACE_ST_CORBA_Handler::remove_handle (ACE_HANDLE handle) { ACE_TRACE ("ACE_ST_CORBA_Handler::remove_handle"); -// ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("--- removing %d\n"), handle)); +// ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("--- removing %d\n"), handle)); #if defined (ACE_TAKEOVER_ORBIX_CALLBACKS) if (ACE_ST_CORBA_Handler::previous_orbix_close_callback_ != 0) @@ -121,7 +121,7 @@ ACE_ST_CORBA_Handler::remove_handle (ACE_HANDLE handle) (handle, ACE_Event_Handler::READ_MASK | ACE_Event_Handler::DONT_CALL); else ; -// ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("remove_handle: reactor NULL\n"))); +// ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("remove_handle: reactor NULL\n"))); } /* static */ @@ -329,7 +329,7 @@ ACE_CORBA_Handler::deactivate_service (const char *service_name, if (ref_count < 0) ; -// ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("warning, reference count == %d\n"), +// ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("warning, reference count == %d\n"), // ref_count)); return 0; } @@ -408,8 +408,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, ACE_TEXT ("instance_ = %x"), this->instance_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("instance_ = %x"), this->instance_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_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/Cache_Map_Manager_T.cpp b/ace/Cache_Map_Manager_T.cpp index b8779796b4e..9460c2df16d 100644 --- a/ace/Cache_Map_Manager_T.cpp +++ b/ace/Cache_Map_Manager_T.cpp @@ -43,8 +43,8 @@ ACE_Cache_Map_Manager<ACE_T2>::ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_ { if (this->open (size, alloc) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Cache_Map_Manager::ACE_Cache_Map_Manager"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Cache_Map_Manager::ACE_Cache_Map_Manager"))); } diff --git a/ace/Cached_Connect_Strategy_T.cpp b/ace/Cached_Connect_Strategy_T.cpp index adad0acae53..846993e3a44 100644 --- a/ace/Cached_Connect_Strategy_T.cpp +++ b/ace/Cached_Connect_Strategy_T.cpp @@ -35,8 +35,8 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::ACE_Cached_Connect_Strategy_Ex { if (this->open (cre_s, con_s, rec_s) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Cached_Connect_Strategy_Ex<ACE_T2>\n"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Cached_Connect_Strategy_Ex<ACE_T2>\n"))); } template <ACE_T1> diff --git a/ace/Caching_Strategies_T.i b/ace/Caching_Strategies_T.i index 30df91a76ed..b57b9fc4f38 100644 --- a/ace/Caching_Strategies_T.i +++ b/ace/Caching_Strategies_T.i @@ -193,7 +193,7 @@ ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const ACE_TRACE ("ACE_LRU_Caching_Strategy::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("timer_ = %d "), this->timer_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("timer_ = %d "), this->timer_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -361,7 +361,7 @@ ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const ACE_TRACE ("ACE_FIFO_Caching_Strategy::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("order_ = %d "), this->order_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("order_ = %d "), this->order_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Capabilities.cpp b/ace/Capabilities.cpp index b3b60403fef..9257178d486 100644 --- a/ace/Capabilities.cpp +++ b/ace/Capabilities.cpp @@ -26,36 +26,36 @@ ACE_Capabilities::~ACE_Capabilities (void) const ACE_TCHAR * ACE_Capabilities::parse (const ACE_TCHAR *buf, ACE_TString &cap) { - while (*buf != ACE_TEXT ('\0') && *buf != ACE_TEXT (',')) + while (*buf != ACE_LIB_TEXT ('\0') && *buf != ACE_LIB_TEXT (',')) { - if (*buf == ACE_TEXT ('\\')) + if (*buf == ACE_LIB_TEXT ('\\')) { buf++; - if (*buf == ACE_TEXT ('E') || *buf == ACE_TEXT ('e')) + if (*buf == ACE_LIB_TEXT ('E') || *buf == ACE_LIB_TEXT ('e')) { cap += ACE_ESC; buf++; continue; } - else if (*buf == ACE_TEXT ('r')) + else if (*buf == ACE_LIB_TEXT ('r')) { - cap += ACE_TEXT ('\r'); + cap += ACE_LIB_TEXT ('\r'); buf++; continue; } - else if (*buf == ACE_TEXT ('n')) + else if (*buf == ACE_LIB_TEXT ('n')) { - cap += ACE_TEXT ('\n'); + cap += ACE_LIB_TEXT ('\n'); buf++; continue; } - else if (*buf == ACE_TEXT ('t')) + else if (*buf == ACE_LIB_TEXT ('t')) { - cap += ACE_TEXT ('\t'); + cap += ACE_LIB_TEXT ('\t'); buf++; continue; } - else if (*buf == ACE_TEXT ('\\')) + else if (*buf == ACE_LIB_TEXT ('\\')) { cap += *buf++; continue; @@ -67,7 +67,7 @@ ACE_Capabilities::parse (const ACE_TCHAR *buf, ACE_TString &cap) for (int i = 0; i < 3 && *buf && isdigit (*buf); i++) - oc = oc * 8 + (*buf++ - ACE_TEXT ('0')); + oc = oc * 8 + (*buf++ - ACE_LIB_TEXT ('0')); cap += (ACE_TCHAR) oc; continue; @@ -84,7 +84,7 @@ ACE_Capabilities::parse (const ACE_TCHAR *buf, int &cap) int n = 0; while (*buf && isdigit (*buf)) - n = n * 10 + (*buf++ - ACE_TEXT ('0')); + n = n * 10 + (*buf++ - ACE_LIB_TEXT ('0')); cap = n; @@ -122,26 +122,26 @@ ACE_Capabilities::fillent (const ACE_TCHAR *buf) while (*buf && isspace(*buf)) buf++; // If we get end of line return - if (*buf == ACE_TEXT ('\0')) + if (*buf == ACE_LIB_TEXT ('\0')) break; - if (*buf == ACE_TEXT ('#')) + if (*buf == ACE_LIB_TEXT ('#')) { - while (*buf && *buf != ACE_TEXT ('\n')) + while (*buf && *buf != ACE_LIB_TEXT ('\n')) buf++; - if (*buf == ACE_TEXT ('\n')) + if (*buf == ACE_LIB_TEXT ('\n')) buf++; continue; } - while(*buf && *buf != ACE_TEXT ('=') - && *buf!= ACE_TEXT ('#') - && *buf != ACE_TEXT (',')) + while(*buf && *buf != ACE_LIB_TEXT ('=') + && *buf!= ACE_LIB_TEXT ('#') + && *buf != ACE_LIB_TEXT (',')) name += *buf++; // If name is null. switch (*buf) { - case ACE_TEXT ('='): + case ACE_LIB_TEXT ('='): // String property buf = this->parse (buf + 1, s); ACE_NEW_RETURN (ce, @@ -153,7 +153,7 @@ ACE_Capabilities::fillent (const ACE_TCHAR *buf) return -1; } break; - case ACE_TEXT ('#'): + case ACE_LIB_TEXT ('#'): // Integer property buf = this->parse (buf + 1, n); ACE_NEW_RETURN (ce, @@ -165,7 +165,7 @@ ACE_Capabilities::fillent (const ACE_TCHAR *buf) return -1; } break; - case ACE_TEXT (','): + case ACE_LIB_TEXT (','): // Boolean ACE_NEW_RETURN (ce, ACE_BoolCapEntry (1), @@ -180,7 +180,7 @@ ACE_Capabilities::fillent (const ACE_TCHAR *buf) return 0; } - if (*buf++ != ACE_TEXT (',')) + if (*buf++ != ACE_LIB_TEXT (',')) return -1; } @@ -197,12 +197,12 @@ ACE_Capabilities::is_entry (const ACE_TCHAR *name, const ACE_TCHAR *line) line++; // End of line reached - if (*line == ACE_TEXT ('\0')) + if (*line == ACE_LIB_TEXT ('\0')) break; // Build the entry name ACE_TString nextname; - while (*line && *line != ACE_TEXT ('|') && *line != ACE_TEXT (',')) + while (*line && *line != ACE_LIB_TEXT ('|') && *line != ACE_LIB_TEXT (',')) nextname += *line++; // We have found the required entry? @@ -210,12 +210,12 @@ ACE_Capabilities::is_entry (const ACE_TCHAR *name, const ACE_TCHAR *line) return 1; // Skip puntuaction char if neccesary. - if (*line == ACE_TEXT ('|') || *line == ACE_TEXT (',')) + if (*line == ACE_LIB_TEXT ('|') || *line == ACE_LIB_TEXT (',')) line++; else { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Invalid entry\n"))); + ACE_LIB_TEXT ("Invalid entry\n"))); break; } } @@ -229,7 +229,7 @@ ACE_Capabilities::getline (FILE *fp, ACE_TString &line) line.set (0, 0); - while ((ch = fgetc (fp)) != EOF && ch != ACE_TEXT ('\n')) + while ((ch = fgetc (fp)) != EOF && ch != ACE_LIB_TEXT ('\n')) line += (ACE_TCHAR) ch; if (ch == EOF && line.length () == 0) @@ -286,7 +286,7 @@ is_empty (const ACE_TCHAR *line) while (*line && isspace (*line)) line++; - return *line == ACE_TEXT ('\0') || *line == ACE_TEXT ('#'); + return *line == ACE_LIB_TEXT ('\0') || *line == ACE_LIB_TEXT ('#'); } static int @@ -295,18 +295,18 @@ is_line (const ACE_TCHAR *line) while (*line && isspace (*line)) line++; - return *line != ACE_TEXT ('\0'); + return *line != ACE_LIB_TEXT ('\0'); } #endif /* !ACE_IS_SPLITTING */ int ACE_Capabilities::getent (const ACE_TCHAR *fname, const ACE_TCHAR *name) { - FILE *fp = ACE_OS::fopen (fname, ACE_TEXT ("r")); + FILE *fp = ACE_OS::fopen (fname, ACE_LIB_TEXT ("r")); if (fp == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Can't open %s file\n"), + ACE_LIB_TEXT ("Can't open %s file\n"), fname), -1); diff --git a/ace/Capabilities.h b/ace/Capabilities.h index 0384494ff22..83510eb9810 100644 --- a/ace/Capabilities.h +++ b/ace/Capabilities.h @@ -171,7 +171,7 @@ is_empty (const ACE_TCHAR *line) while (*line && isspace (*line)) line++; - return *line == ACE_TEXT ('\0') || *line == ACE_TEXT ('#'); + return *line == ACE_LIB_TEXT ('\0') || *line == ACE_LIB_TEXT ('#'); } int @@ -180,7 +180,7 @@ is_line (const ACE_TCHAR *line) while (*line && isspace (*line)) line++; - return *line != ACE_TEXT ('\0'); + return *line != ACE_LIB_TEXT ('\0'); } #endif /* ACE_IS_SPLITTING */ diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp index cb5f72fda29..181d2d558b9 100644 --- a/ace/Configuration.cpp +++ b/ace/Configuration.cpp @@ -175,7 +175,7 @@ ACE_Configuration::expand_path (const ACE_Configuration_Section_Key& key, while (1) { // Detmine the begin/ending of the key name - end = ACE_OS::strchr (begin, ACE_TEXT ('\\')); + end = ACE_OS::strchr (begin, ACE_LIB_TEXT ('\\')); size_t length = end ? (size_t)(end-begin) : ACE_OS::strlen (begin); // Make sure length is not 0 @@ -213,7 +213,7 @@ ACE_Configuration::validate_name (const ACE_TCHAR* name) // make sure it doesn't contain any invalid characters while (*pos) { - if (ACE_OS::strchr (ACE_TEXT ("\\]["), *pos)) + if (ACE_OS::strchr (ACE_LIB_TEXT ("\\]["), *pos)) return -1; pos++; @@ -235,10 +235,10 @@ ACE_Configuration::export_section (const ACE_Configuration_Section_Key& section, if (path.length ()) { // Write out the section header - ACE_TString header = ACE_TEXT ("["); + ACE_TString header = ACE_LIB_TEXT ("["); header += path; - header += ACE_TEXT ("]"); - header += ACE_TEXT (" \n"); + header += ACE_LIB_TEXT ("]"); + header += ACE_LIB_TEXT (" \n"); if (ACE_OS::fputs (header.fast_rep (), out) < 0) return -1; @@ -254,7 +254,7 @@ ACE_Configuration::export_section (const ACE_Configuration_Section_Key& section, ACE_TString string_value; while (!enumerate_values (section, index, name, type)) { - line = ACE_TEXT ("\"") + name + ACE_TEXT ("\"="); + line = ACE_LIB_TEXT ("\"") + name + ACE_LIB_TEXT ("\"="); switch (type) { case INTEGER: @@ -263,8 +263,8 @@ ACE_Configuration::export_section (const ACE_Configuration_Section_Key& section, if (get_integer_value (section, name.fast_rep (), value)) return -2; - ACE_OS::sprintf (int_value, ACE_TEXT ("%08x"), value); - line += ACE_TEXT("dword:"); + ACE_OS::sprintf (int_value, ACE_LIB_TEXT ("%08x"), value); + line += ACE_LIB_TEXT ("dword:"); line += int_value; break; } @@ -275,8 +275,8 @@ ACE_Configuration::export_section (const ACE_Configuration_Section_Key& section, string_value)) return -2; - line += ACE_TEXT ("\""); - line += string_value + ACE_TEXT("\""); + line += ACE_LIB_TEXT ("\""); + line += string_value + ACE_LIB_TEXT ("\""); break; } #ifdef _WIN32 @@ -291,16 +291,16 @@ ACE_Configuration::export_section (const ACE_Configuration_Section_Key& section, binary_length)) return -2; - line += ACE_TEXT ("hex:"); + line += ACE_LIB_TEXT ("hex:"); unsigned char* ptr = (unsigned char*)binary_data; while(binary_length) { if(ptr != binary_data) { - line += ACE_TEXT (","); + line += ACE_LIB_TEXT (","); } - ACE_OS::sprintf(bin_value, ACE_TEXT ("%02x"), *ptr); + ACE_OS::sprintf(bin_value, ACE_LIB_TEXT ("%02x"), *ptr); line += bin_value; --binary_length; ++ptr; @@ -312,7 +312,7 @@ ACE_Configuration::export_section (const ACE_Configuration_Section_Key& section, return -3; } - line += ACE_TEXT ("\n"); + line += ACE_LIB_TEXT ("\n"); if (ACE_OS::fputs (line.fast_rep (), out) < 0) return -4; @@ -330,7 +330,7 @@ ACE_Configuration::export_section (const ACE_Configuration_Section_Key& section, { ACE_TString sub_section (path); if (path.length ()) - sub_section += ACE_TEXT ("\\"); + sub_section += ACE_LIB_TEXT ("\\"); sub_section += name; if (open_section (section, name.fast_rep (), 0, sub_key)) @@ -348,11 +348,11 @@ ACE_Configuration::export_section (const ACE_Configuration_Section_Key& section, int ACE_Configuration::export_config (const ACE_TCHAR* filename) { - FILE* out = ACE_OS::fopen (filename, ACE_TEXT ("w")); + FILE* out = ACE_OS::fopen (filename, ACE_LIB_TEXT ("w")); if (!out) return -1; - int result = export_section (root_, ACE_TEXT (""), out); + int result = export_section (root_, ACE_LIB_TEXT (""), out); ACE_OS::fclose (out); return result; } @@ -360,7 +360,7 @@ ACE_Configuration::export_config (const ACE_TCHAR* filename) int ACE_Configuration::import_config (const ACE_TCHAR* filename) { - FILE* in = ACE_OS::fopen (filename, ACE_TEXT ("r")); + FILE* in = ACE_OS::fopen (filename, ACE_LIB_TEXT ("r")); if (!in) return -1; @@ -370,13 +370,13 @@ ACE_Configuration::import_config (const ACE_TCHAR* filename) while (ACE_OS::fgets (buffer, 4096, in)) { // Check for a comment - if (buffer[0] == ACE_TEXT (';') || buffer[0] == ACE_TEXT ('#')) + if (buffer[0] == ACE_LIB_TEXT (';') || buffer[0] == ACE_LIB_TEXT ('#')) continue; - if (buffer[0] == ACE_TEXT ('[')) + if (buffer[0] == ACE_LIB_TEXT ('[')) { // We have a new section here, strip out the section name - ACE_TCHAR* end = ACE_OS::strrchr(buffer, ACE_TEXT(']')); + ACE_TCHAR* end = ACE_OS::strrchr(buffer, ACE_LIB_TEXT (']')); if(!end) { fclose(in); @@ -393,7 +393,7 @@ ACE_Configuration::import_config (const ACE_TCHAR* filename) continue; } - if(buffer[0] == ACE_TEXT ('"')) + if(buffer[0] == ACE_LIB_TEXT ('"')) { // we have a value ACE_TCHAR* end = ACE_OS::strchr (buffer+1, '"'); @@ -421,7 +421,7 @@ ACE_Configuration::import_config (const ACE_TCHAR* filename) return -4; } } - else if (ACE_OS::strncmp(end, ACE_TEXT ("dword:"), 6) == 0) + else if (ACE_OS::strncmp(end, ACE_LIB_TEXT ("dword:"), 6) == 0) { // number type ACE_TCHAR* endptr = 0; @@ -432,7 +432,7 @@ ACE_Configuration::import_config (const ACE_TCHAR* filename) return -4; } } - else if(ACE_OS::strncmp(end, ACE_TEXT ("hex:"), 4) == 0) + else if(ACE_OS::strncmp(end, ACE_LIB_TEXT ("hex:"), 4) == 0) { // binary type u_int string_length = ACE_OS::strlen(end+4); @@ -934,7 +934,7 @@ ACE_Configuration_Win32Registry::resolve_key (HKEY hKey, while (1) { // Detmine the begin/ending of the key name - end = ACE_OS::strchr (begin, ACE_TEXT ('\\')); + end = ACE_OS::strchr (begin, ACE_LIB_TEXT ('\\')); size_t length = end ? (size_t)(end-begin) : ACE_OS::strlen (begin); // Make sure length is not 0 @@ -1176,7 +1176,7 @@ ACE_Configuration_Heap::ACE_Configuration_Heap (void) { ACE_Configuration_Section_Key_Heap *temp = 0; - ACE_NEW (temp, ACE_Configuration_Section_Key_Heap (ACE_TEXT (""))); + ACE_NEW (temp, ACE_Configuration_Section_Key_Heap (ACE_LIB_TEXT (""))); root_ = ACE_Configuration_Section_Key (temp); } @@ -1238,7 +1238,7 @@ ACE_Configuration_Heap::open (const ACE_TCHAR* file_name, // Now check if the backing store has been created successfully. if (ACE_OS::access (file_name, F_OK) != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("create_index\n")), + ACE_LIB_TEXT ("create_index\n")), -1); #endif /* ACE_LACKS_ACCESS */ @@ -1269,12 +1269,12 @@ ACE_Configuration_Heap::create_index (void) { // Attempt to clean up. ACE_ERROR ((LM_ERROR, - ACE_TEXT("create_index\n"))); + ACE_LIB_TEXT ("create_index\n"))); this->allocator_->remove (); return -1; } // Add the root section - return new_section (ACE_TEXT (""), root_); + return new_section (ACE_LIB_TEXT (""), root_); } return 0; } @@ -1330,7 +1330,7 @@ ACE_Configuration_Heap::add_section (const ACE_Configuration_Section_Key& base, // Create the new section name // only prepend a separater if were not at the root if (section.length ()) - section += ACE_TEXT ("\\"); + section += ACE_LIB_TEXT ("\\"); section += sub_section; @@ -1466,7 +1466,7 @@ ACE_Configuration_Heap::open_section (const ACE_Configuration_Section_Key& base, // Only add the \\ if were not at the root if (section.length ()) - section += ACE_TEXT ("\\"); + section += ACE_LIB_TEXT ("\\"); section += sub_section; @@ -1509,7 +1509,7 @@ ACE_Configuration_Heap::remove_section (const ACE_Configuration_Section_Key& key // Find this subkey if (section.length ()) - section += ACE_TEXT ("\\"); + section += ACE_LIB_TEXT ("\\"); section += sub_section; ACE_Configuration_ExtId SectionExtId (section.fast_rep ()); diff --git a/ace/Connector.cpp b/ace/Connector.cpp index 703d2fc7dec..defa75f0d9b 100644 --- a/ace/Connector.cpp +++ b/ace/Connector.cpp @@ -26,8 +26,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, ACE_TEXT ("\nclosing_ = %d"), this->closing_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags_ = %d"), this->flags_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nclosing_ = %d"), this->closing_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nflags_ = %d"), this->flags_)); this->handler_map_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -214,9 +214,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, ACE_TEXT ("svc_handler_ = %x"), this->svc_handler_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\narg_ = %x"), this->arg_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncancellation_id_ = %d"), this->cancellation_id_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("svc_handler_ = %x"), this->svc_handler_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\narg_ = %x"), this->arg_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncancellation_id_ = %d"), this->cancellation_id_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -267,8 +267,8 @@ ACE_Connector<SH, PR_CO_2>::cleanup_AST (ACE_HANDLE handle, // Error, entry not found in map. errno = ENOENT; ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p %d not found in map\n"), - ACE_TEXT ("find"), + ACE_LIB_TEXT ("%p %d not found in map\n"), + ACE_LIB_TEXT ("find"), handle), -1); } @@ -708,9 +708,9 @@ ACE_Connector<SH, PR_CO_2>::info (ACE_TCHAR **strp, size_t length) const ACE_TCHAR buf[BUFSIZ]; ACE_OS::sprintf (buf, - ACE_TEXT ("%s\t %s"), - ACE_TEXT ("ACE_Connector"), - ACE_TEXT ("# connector factory\n")); + ACE_LIB_TEXT ("%s\t %s"), + ACE_LIB_TEXT ("ACE_Connector"), + ACE_LIB_TEXT ("# connector factory\n")); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) return -1; @@ -836,7 +836,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, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Strategy_Connector::ACE_Strategy_Connector"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_Strategy_Connector::ACE_Strategy_Connector"))); } template <class SH, PR_CO_1> diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp index 5cdc6364b86..98223470f9b 100644 --- a/ace/Containers_T.cpp +++ b/ace/Containers_T.cpp @@ -400,9 +400,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, ACE_TEXT ("\nhead_ = %u"), this->head_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_ = %u"), this->head_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); T *item = 0; #if !defined (ACE_NLOGGING) @@ -412,7 +412,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, ACE_TEXT ("count = %d\n"), count++)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("count = %d\n"), count++)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -783,7 +783,7 @@ template <class T> void ACE_Double_Linked_List_Iterator_Base<T>::dump_i (void) const { ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("current_ = %x"), this->current_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("current_ = %x"), this->current_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -1759,9 +1759,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, ACE_TEXT ("\nhead_ = %u"), this->head_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_ = %u"), this->head_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); T *item = 0; #if !defined (ACE_NLOGGING) @@ -1771,7 +1771,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, ACE_TEXT ("count = %d\n"), count++)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("count = %d\n"), count++)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -2243,9 +2243,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, ACE_TEXT ("\nhead_ = %u"), this->head_)); - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_ = %u"), this->head_)); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); // // T *item = 0; // size_t count = 1; @@ -2253,7 +2253,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, ACE_TEXT ("count = %d\n"), count++)); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_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 a1a0bb6ff85..43dde161857 100644 --- a/ace/DEV_Addr.cpp +++ b/ace/DEV_Addr.cpp @@ -18,7 +18,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, ACE_TEXT ("devname_ = %s"), this->devname_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("devname_ = %s"), this->devname_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/DEV_Connector.i b/ace/DEV_Connector.i index a68e1e02cc3..8b2af2372f0 100644 --- a/ace/DEV_Connector.i +++ b/ace/DEV_Connector.i @@ -16,8 +16,8 @@ ACE_DEV_Connector::ACE_DEV_Connector (ACE_DEV_IO &new_io, if (this->connect (new_io, remote_sap, timeout, local_sap, reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("address %s, %p\n"), - remote_sap.get_path_name (), ACE_TEXT ("ACE_DEV_IO"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("address %s, %p\n"), + remote_sap.get_path_name (), ACE_LIB_TEXT ("ACE_DEV_IO"))); } ASYS_INLINE int diff --git a/ace/DLL.cpp b/ace/DLL.cpp index 4e3e1463a99..f198472df81 100644 --- a/ace/DLL.cpp +++ b/ace/DLL.cpp @@ -29,7 +29,7 @@ ACE_DLL::ACE_DLL (const ACE_TCHAR *dll_name, { if (this->handle_ == ACE_SHLIB_INVALID_HANDLE) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%s\n"), + ACE_LIB_TEXT ("%s\n"), this->error ())); } @@ -84,7 +84,7 @@ ACE_DLL::open (const ACE_TCHAR *dll_filename, if (this->handle_ == ACE_SHLIB_INVALID_HANDLE) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%s\n"), this->error ()), + ACE_LIB_TEXT ("%s\n"), this->error ()), -1); return 0; } @@ -154,7 +154,7 @@ ACE_DLL::set_handle (ACE_SHLIB_HANDLE handle, // Close the handle in use before accepting the next one. if (this->close () == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%s\n"), this->error ()), + ACE_LIB_TEXT ("%s\n"), this->error ()), -1); this->handle_ = handle; diff --git a/ace/Dirent.i b/ace/Dirent.i index e4ae8960993..4c731311c29 100644 --- a/ace/Dirent.i +++ b/ace/Dirent.i @@ -35,8 +35,8 @@ ACE_Dirent::ACE_Dirent (const ACE_TCHAR *dirname) { if (this->open (dirname) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Dirent::Dirent"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("Dirent::Dirent"))); } ACE_INLINE diff --git a/ace/Dynamic_Service.cpp b/ace/Dynamic_Service.cpp index 1b8c831103b..1c0e7b22311 100644 --- a/ace/Dynamic_Service.cpp +++ b/ace/Dynamic_Service.cpp @@ -21,7 +21,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, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/FIFO.cpp b/ace/FIFO.cpp index 0ebbe390b17..765067c375b 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, ACE_TEXT ("rendezvous_ = %s"), this->rendezvous_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("rendezvous_ = %s"), this->rendezvous_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -51,7 +51,7 @@ ACE_FIFO::ACE_FIFO (const ACE_TCHAR *fifo_name, { ACE_TRACE ("ACE_FIFO::ACE_FIFO"); if (this->open (fifo_name, flags, perms, sa) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_FIFO"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_FIFO"))); } ACE_FIFO::ACE_FIFO (void) diff --git a/ace/FIFO_Recv.cpp b/ace/FIFO_Recv.cpp index 3a847ce4f29..7b10a89e017 100644 --- a/ace/FIFO_Recv.cpp +++ b/ace/FIFO_Recv.cpp @@ -18,7 +18,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, ACE_TEXT ("aux_handle_ = %d"), this->aux_handle_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("aux_handle_ = %d"), this->aux_handle_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -78,5 +78,5 @@ ACE_FIFO_Recv::ACE_FIFO_Recv (const ACE_TCHAR *fifo_name, perms, persistent, sa) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_FIFO_Recv"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_FIFO_Recv"))); } diff --git a/ace/FIFO_Recv_Msg.cpp b/ace/FIFO_Recv_Msg.cpp index 74f0cf27f6f..714cc43986f 100644 --- a/ace/FIFO_Recv_Msg.cpp +++ b/ace/FIFO_Recv_Msg.cpp @@ -57,5 +57,5 @@ ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (const ACE_TCHAR *fifo_name, perms, persistent, sa) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_FIFO_Recv_Msg"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_FIFO_Recv_Msg"))); } diff --git a/ace/FIFO_Send.cpp b/ace/FIFO_Send.cpp index c44e4311a6a..a51a16f5f96 100644 --- a/ace/FIFO_Send.cpp +++ b/ace/FIFO_Send.cpp @@ -48,6 +48,6 @@ ACE_FIFO_Send::ACE_FIFO_Send (const ACE_TCHAR *fifo_name, perms, sa) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_FIFO_Send::ACE_FIFO_Send"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_FIFO_Send::ACE_FIFO_Send"))); } diff --git a/ace/FIFO_Send_Msg.cpp b/ace/FIFO_Send_Msg.cpp index c1186a143ba..844ce5e5cd9 100644 --- a/ace/FIFO_Send_Msg.cpp +++ b/ace/FIFO_Send_Msg.cpp @@ -63,5 +63,5 @@ ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg (const ACE_TCHAR *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, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_FIFO_Send_Msg"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_FIFO_Send_Msg"))); } diff --git a/ace/FILE_Addr.cpp b/ace/FILE_Addr.cpp index b9312ebbd48..bd43c34135b 100644 --- a/ace/FILE_Addr.cpp +++ b/ace/FILE_Addr.cpp @@ -31,13 +31,13 @@ ACE_FILE_Addr::set (const ACE_FILE_Addr &sa) MAXPATHLEN - 15) == -1) // -15 for ace-file-XXXXXX { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Temporary path too long, ") - ACE_TEXT ("defaulting to current directory\n"))); + ACE_LIB_TEXT ("Temporary path too long, ") + ACE_LIB_TEXT ("defaulting to current directory\n"))); this->filename_[0] = 0; } // Add the filename to the end - ACE_OS::strcat (this->filename_, ACE_TEXT ("ace-file-XXXXXX")); + ACE_OS::strcat (this->filename_, ACE_LIB_TEXT ("ace-file-XXXXXX")); #endif /* ACE_DEFAULT_TEMP_FILE */ @@ -104,6 +104,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, ACE_TEXT ("filename_ = %s"), this->filename_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_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 7e28fcfe791..50837e887af 100644 --- a/ace/FILE_Connector.cpp +++ b/ace/FILE_Connector.cpp @@ -17,7 +17,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, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/FILE_Connector.i b/ace/FILE_Connector.i index 27c4d94a080..ccb5985899f 100644 --- a/ace/FILE_Connector.i +++ b/ace/FILE_Connector.i @@ -19,9 +19,9 @@ ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io, reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("address %s, %p\n"), + ACE_LIB_TEXT ("address %s, %p\n"), remote_sap.get_path_name (), - ACE_TEXT ("ACE_FILE_IO"))); + ACE_LIB_TEXT ("ACE_FILE_IO"))); } ASYS_INLINE int diff --git a/ace/File_Lock.cpp b/ace/File_Lock.cpp index be9688b510e..4e7851848ae 100644 --- a/ace/File_Lock.cpp +++ b/ace/File_Lock.cpp @@ -27,8 +27,8 @@ ACE_File_Lock::ACE_File_Lock (ACE_HANDLE h) // ACE_TRACE ("ACE_File_Lock::ACE_File_Lock"); if (ACE_OS::flock_init (&this->lock_) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_File_Lock::ACE_File_Lock"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_File_Lock::ACE_File_Lock"))); this->set_handle (h); } @@ -40,8 +40,8 @@ ACE_File_Lock::ACE_File_Lock (const ACE_TCHAR *name, if (this->open (name, flags, perms) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p %s\n"), - ACE_TEXT ("ACE_File_Lock::ACE_File_Lock"), + ACE_LIB_TEXT ("%p %s\n"), + ACE_LIB_TEXT ("ACE_File_Lock::ACE_File_Lock"), name)); } diff --git a/ace/Filecache.cpp b/ace/Filecache.cpp index e8d15b9ed2c..f56a4b0ea40 100644 --- a/ace/Filecache.cpp +++ b/ace/Filecache.cpp @@ -145,7 +145,7 @@ ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry (const ACE_TCHAR *const &ext_id, ACE_Filecache_Object *const &int_id, ACE_Filecache_Hash_Entry *next, ACE_Filecache_Hash_Entry *prev) - : ext_id_ (ext_id ? ACE_OS::strdup (ext_id) : ACE_OS::strdup (ACE_TEXT (""))), + : ext_id_ (ext_id ? ACE_OS::strdup (ext_id) : ACE_OS::strdup (ACE_LIB_TEXT (""))), int_id_ (int_id), next_ (next), prev_ (prev) @@ -239,7 +239,7 @@ ACE_Filecache::insert_i (const ACE_TCHAR *filename, ACE_Filecache_Object (filename, filelock, 0, mapit), 0); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%t) CVF: creating %s\n"), filename)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" (%t) CVF: creating %s\n"), filename)); if (this->hash_.bind (filename, handle) == -1) { @@ -362,7 +362,7 @@ ACE_Filecache::fetch (const ACE_TCHAR *filename, int mapit) filelock.release (); } } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%t) CVF: found %s\n"), filename)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" (%t) CVF: found %s\n"), filename)); } return handle; @@ -522,7 +522,7 @@ ACE_Filecache_Object::ACE_Filecache_Object (const ACE_TCHAR *filename, if (this->handle_ == ACE_INVALID_HANDLE) { this->error_i (ACE_Filecache_Object::ACE_OPEN_FAILED, - ACE_TEXT ("ACE_Filecache_Object::ctor: open")); + ACE_LIB_TEXT ("ACE_Filecache_Object::ctor: open")); return; } @@ -533,7 +533,7 @@ ACE_Filecache_Object::ACE_Filecache_Object (const ACE_TCHAR *filename, PROT_READ, ACE_MAP_PRIVATE, 0, 0, this->sa_) != 0) { this->error_i (ACE_Filecache_Object::ACE_MEMMAP_FAILED, - ACE_TEXT ("ACE_Filecache_Object::ctor: map")); + ACE_LIB_TEXT ("ACE_Filecache_Object::ctor: map")); ACE_OS::close (this->handle_); this->handle_ = ACE_INVALID_HANDLE; return; @@ -575,7 +575,7 @@ ACE_Filecache_Object::ACE_Filecache_Object (const ACE_TCHAR *filename, if (this->handle_ == ACE_INVALID_HANDLE) { this->error_i (ACE_Filecache_Object::ACE_OPEN_FAILED, - ACE_TEXT ("ACE_Filecache_Object::acquire: open")); + ACE_LIB_TEXT ("ACE_Filecache_Object::acquire: open")); return; } @@ -583,7 +583,7 @@ ACE_Filecache_Object::ACE_Filecache_Object (const ACE_TCHAR *filename, if (ACE_OS::pwrite (this->handle_, "", 1, this->size_ - 1) != 1) { this->error_i (ACE_Filecache_Object::ACE_WRITE_FAILED, - ACE_TEXT ("ACE_Filecache_Object::acquire: write")); + ACE_LIB_TEXT ("ACE_Filecache_Object::acquire: write")); ACE_OS::close (this->handle_); return; } @@ -593,7 +593,7 @@ ACE_Filecache_Object::ACE_Filecache_Object (const ACE_TCHAR *filename, 0, 0, this->sa_) != 0) { this->error_i (ACE_Filecache_Object::ACE_MEMMAP_FAILED, - ACE_TEXT ("ACE_Filecache_Object::acquire: map")); + ACE_LIB_TEXT ("ACE_Filecache_Object::acquire: map")); ACE_OS::close (this->handle_); } @@ -682,7 +682,7 @@ int ACE_Filecache_Object::error_i (int error_value, const ACE_TCHAR *s) { s = s; - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p.\n"), s)); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p.\n"), s)); this->error_ = error_value; return error_value; } diff --git a/ace/Filecache.h b/ace/Filecache.h index 7f636f09795..ceff9a43128 100644 --- a/ace/Filecache.h +++ b/ace/Filecache.h @@ -269,7 +269,7 @@ public: // = error_ accessors int error (void) const; int error (int error_value, - const ACE_TCHAR *s = ACE_TEXT ("ACE_Filecache_Object")); + const ACE_TCHAR *s = ACE_LIB_TEXT ("ACE_Filecache_Object")); const ACE_TCHAR *filename (void) const; // filename_ accessor @@ -295,7 +295,7 @@ protected: private: int error_i (int error_value, - const ACE_TCHAR *s = ACE_TEXT ("ACE_Filecache_Object")); + const ACE_TCHAR *s = ACE_LIB_TEXT ("ACE_Filecache_Object")); // Internal error logging method, no locking. public: diff --git a/ace/Future.cpp b/ace/Future.cpp index e42c1bf99a4..54592d09c07 100644 --- a/ace/Future.cpp +++ b/ace/Future.cpp @@ -50,9 +50,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, ACE_TEXT (" (NON-NULL)\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" (NON-NULL)\n"))); else - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (NULL)\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" (NULL)\n"))); ACE_DEBUG ((LM_INFO,"value_ready_: \n")); this->value_ready_.dump (); @@ -280,7 +280,7 @@ ACE_Future<T>::ACE_Future (const T &r) : future_rep_ (FUTURE_REP::create ()) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (" (%t) funny constructor\n"))); + ACE_LIB_TEXT (" (%t) funny constructor\n"))); this->future_rep_->set (r, *this); } diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp index 5d7c24fb641..333660d762c 100644 --- a/ace/Get_Opt.cpp +++ b/ace/Get_Opt.cpp @@ -67,7 +67,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, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -93,7 +93,7 @@ ACE_Get_Opt::operator () (void) if (this->optind >= this->argc_ || *(this->nextchar_ = this->argv_[this->optind]) != '-') { - this->nextchar_ = ACE_const_cast (ACE_TCHAR *, ACE_TEXT ("")); + this->nextchar_ = ACE_const_cast (ACE_TCHAR *, ACE_LIB_TEXT ("")); return EOF; } @@ -102,7 +102,7 @@ ACE_Get_Opt::operator () (void) { // Found "--". ++this->optind; - this->nextchar_ = ACE_const_cast (ACE_TCHAR *, ACE_TEXT ("")); + this->nextchar_ = ACE_const_cast (ACE_TCHAR *, ACE_LIB_TEXT ("")); return EOF; } } @@ -123,7 +123,7 @@ ACE_Get_Opt::operator () (void) if (this->opterr && *this->optstring_ != ':') ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%s: illegal option -- %c\n"), + ACE_LIB_TEXT ("%s: illegal option -- %c\n"), this->argv_[0], opt)); return '?'; @@ -142,20 +142,20 @@ ACE_Get_Opt::operator () (void) else if (this->argc_ <= ++this->optind) { // No arg. - this->nextchar_ = ACE_const_cast (ACE_TCHAR *, ACE_TEXT ("")); + this->nextchar_ = ACE_const_cast (ACE_TCHAR *, ACE_LIB_TEXT ("")); if (*this->optstring_ == ':') return ':'; if (this->opterr) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%s: option requires an argument -- %c\n"), + ACE_LIB_TEXT ("%s: option requires an argument -- %c\n"), this->argv_[0], opt)); return '?'; } else // White space. this->optarg = this->argv_[this->optind]; - this->nextchar_ = ACE_const_cast (ACE_TCHAR *, ACE_TEXT ("")); + this->nextchar_ = ACE_const_cast (ACE_TCHAR *, ACE_LIB_TEXT ("")); ++this->optind; } diff --git a/ace/Handle_Set.cpp b/ace/Handle_Set.cpp index 0ba246da386..798c8bc2478 100644 --- a/ace/Handle_Set.cpp +++ b/ace/Handle_Set.cpp @@ -26,20 +26,20 @@ ACE_Handle_Set::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nsize_ = %d"), this->size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nmax_handle_ = %d"), this->max_handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n[ "))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsize_ = %d"), this->size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmax_handle_ = %d"), this->max_handle_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n[ "))); #if defined (ACE_WIN32) for (size_t i = 0; i < (size_t) this->mask_.fd_count + 1; i++) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT(" %x "), this->mask_.fd_array[i])); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" %x "), this->mask_.fd_array[i])); #else /* !ACE_WIN32 */ for (ACE_HANDLE i = 0; i < this->max_handle_ + 1; i++) if (this->is_set (i)) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT(" %d "), i)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" %d "), i)); #endif /* ACE_WIN32 */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT(" ]\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" ]\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -249,12 +249,12 @@ ACE_Handle_Set_Iterator::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); #if defined(ACE_WIN32) || !defined(ACE_HAS_BIG_FD_SET) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nhandle_index_ = %d"), this->handle_index_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhandle_index_ = %d"), this->handle_index_)); #elif defined(ACE_HAS_BIG_FD_SET) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nword_max_ = %d"), this->word_max_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nword_val_ = %d"), this->word_val_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nword_max_ = %d"), this->word_max_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nword_val_ = %d"), this->word_val_)); #endif - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nword_num_ = %d"), this->word_num_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nword_num_ = %d"), this->word_num_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Hash_Map_Manager_T.cpp b/ace/Hash_Map_Manager_T.cpp index 52a90711b10..c692077bd95 100644 --- a/ace/Hash_Map_Manager_T.cpp +++ b/ace/Hash_Map_Manager_T.cpp @@ -73,8 +73,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, ACE_TEXT ("next_ = %d"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("prev_ = %d"), this->prev_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("next_ = %d"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("prev_ = %d"), this->prev_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -82,8 +82,8 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const { ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("total_size_ = %d"), this->total_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("total_size_ = %d"), this->total_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_size_ = %d"), this->cur_size_)); this->allocator_->dump (); this->lock_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -378,8 +378,8 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>: ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("index_ = %d "), this->index_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %x"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("index_ = %d "), this->index_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("next_ = %x"), this->next_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Hash_Map_Manager_T.i b/ace/Hash_Map_Manager_T.i index db517f15678..2bd2911aba5 100644 --- a/ace/Hash_Map_Manager_T.i +++ b/ace/Hash_Map_Manager_T.i @@ -11,7 +11,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_H cur_size_ (0) { if (this->open (size, alloc) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Hash_Map_Manager_Ex\n"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_Hash_Map_Manager_Ex\n"))); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE @@ -22,7 +22,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_H cur_size_ (0) { if (this->open (ACE_DEFAULT_MAP_SIZE, alloc) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Hash_Map_Manager_Ex\n"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_Hash_Map_Manager_Ex\n"))); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp index 3ed9c6e50cf..122fcba474f 100644 --- a/ace/High_Res_Timer.cpp +++ b/ace/High_Res_Timer.cpp @@ -67,7 +67,7 @@ ACE_High_Res_Timer::get_cpuinfo (void) { ACE_TCHAR buf[128]; - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nReading /proc/cpuinfo..."))); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nReading /proc/cpuinfo..."))); while (ACE_OS::fgets (buf, sizeof buf, cpuinfo)) { @@ -100,7 +100,7 @@ ACE_High_Res_Timer::get_cpuinfo (void) 5) == 0) { supported = 1; - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" recognized Alpha chip..."))); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" recognized Alpha chip..."))); } } // Pentium CPU model? @@ -113,7 +113,7 @@ ACE_High_Res_Timer::get_cpuinfo (void) || ACE_OS::strcmp (arg, "Pro") == 0) { supported = 1; - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" recognized Pentium Pro/II chip..."))); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" recognized Pentium Pro/II chip..."))); } } else if (::sscanf (buf, "bogomips : %lf\n", &bmips) == 1 @@ -122,13 +122,13 @@ ACE_High_Res_Timer::get_cpuinfo (void) if (supported) { scale_factor = (ACE_UINT32) (bmips + 0.5); - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" setting the clock scale factor to %u"), scale_factor)); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" setting the clock scale factor to %u"), scale_factor)); } #if 0 else { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\nThe BogoMIPS metric is not supported on this platform" + ACE_LIB_TEXT ("\nThe BogoMIPS metric is not supported on this platform" "\n\tReport the results of the clock calibration and" "\n\tthe contents of /proc/cpuinfo to the ace-users mailing list"))); } @@ -138,7 +138,7 @@ ACE_High_Res_Timer::get_cpuinfo (void) #endif /* __alpha__ */ } - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (done)\n"))); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" (done)\n"))); ACE_OS::fclose (cpuinfo); } @@ -263,24 +263,24 @@ ACE_High_Res_Timer::dump (void) const ACE_TRACE ("ACE_High_Res_Timer::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nglobal_scale_factor_: %u\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nglobal_scale_factor_: %u\n"), global_scale_factor ())); #if defined (ACE_LACKS_LONGLONG_T) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (":\nstart_.hi (): %8x; start_.lo (): %8x;\n") - ACE_TEXT ("end_.hi (): %8x; end_.lo (): %8x;\n") - ACE_TEXT ("total_.hi (): %8x; total_.lo (): %8x;\n") - ACE_TEXT ("start_incr_.hi () %8x; start_incr_.lo (): %8x;\n"), + ACE_LIB_TEXT (":\nstart_.hi (): %8x; start_.lo (): %8x;\n") + ACE_LIB_TEXT ("end_.hi (): %8x; end_.lo (): %8x;\n") + ACE_LIB_TEXT ("total_.hi (): %8x; total_.lo (): %8x;\n") + ACE_LIB_TEXT ("start_incr_.hi () %8x; start_incr_.lo (): %8x;\n"), start_.hi (), start_.lo (), end_.hi (), end_.lo (), total_.hi (), total_.lo (), start_incr_.hi (), start_incr_.lo ())); #else /* ! ACE_LACKS_LONGLONG_T */ ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (":\nstart_.hi (): %8x; start_.lo (): %8x;\n") - ACE_TEXT ("end_.hi (): %8x; end_.lo (): %8x;\n") - ACE_TEXT ("total_.hi (): %8x; total_.lo (): %8x;\n") - ACE_TEXT ("start_incr_.hi () %8x; start_incr_.lo (): %8x;\n"), + ACE_LIB_TEXT (":\nstart_.hi (): %8x; start_.lo (): %8x;\n") + ACE_LIB_TEXT ("end_.hi (): %8x; end_.lo (): %8x;\n") + ACE_LIB_TEXT ("total_.hi (): %8x; total_.lo (): %8x;\n") + ACE_LIB_TEXT ("start_incr_.hi () %8x; start_incr_.lo (): %8x;\n"), ACE_CU64_TO_CU32 (start_ >> 32), ACE_CU64_TO_CU32 (start_ & 0xfffffffful), ACE_CU64_TO_CU32 (end_ >> 32), @@ -404,7 +404,7 @@ ACE_High_Res_Timer::print_ave (const ACE_TCHAR *str, { ACE_hrtime_t avg_nsecs = total_nanoseconds / (ACE_UINT32) count; ACE_OS::sprintf (buf, - ACE_TEXT (" count = %d, total (secs %lu, usecs %u), avg usecs = %lu\n"), + ACE_LIB_TEXT (" count = %d, total (secs %lu, usecs %u), avg usecs = %lu\n"), count, total_secs, (extra_nsecs + 500u) / 1000u, @@ -412,7 +412,7 @@ ACE_High_Res_Timer::print_ave (const ACE_TCHAR *str, } else ACE_OS::sprintf (buf, - ACE_TEXT (" total %3lu.%06lu secs\n"), + ACE_LIB_TEXT (" total %3lu.%06lu secs\n"), total_secs, (extra_nsecs + 500lu) / 1000lu); @@ -447,7 +447,7 @@ ACE_High_Res_Timer::print_total (const ACE_TCHAR *str, ACE_hrtime_t avg_nsecs = this->total_ / (ACE_UINT32) count; ACE_OS::sprintf (buf, - ACE_TEXT (" count = %d, total (secs %lu, usecs %u), avg usecs = %lu\n"), + ACE_LIB_TEXT (" count = %d, total (secs %lu, usecs %u), avg usecs = %lu\n"), count, total_secs, (extra_nsecs + 500u) / 1000u, @@ -455,7 +455,7 @@ ACE_High_Res_Timer::print_total (const ACE_TCHAR *str, } else ACE_OS::sprintf (buf, - ACE_TEXT (" total %3lu.%06u secs\n"), + ACE_LIB_TEXT (" total %3lu.%06u secs\n"), total_secs, (extra_nsecs + 500u) / 1000u); diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h index 608ed3dea55..5c1d2435d9c 100644 --- a/ace/High_Res_Timer.h +++ b/ace/High_Res_Timer.h @@ -93,7 +93,7 @@ public: #endif /* ACE_WIN32 */ static int get_env_global_scale_factor (const ACE_TCHAR *env - = ACE_TEXT ("ACE_SCALE_FACTOR")); + = ACE_LIB_TEXT ("ACE_SCALE_FACTOR")); // Sets the global_scale_factor to the value in the <env> // environment variable. Returns 0 on success, -1 on failure. Note // if <env> points to string "0" (value zero), this call will fail. diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp index bd1ec23fcde..193cefad21b 100644 --- a/ace/INET_Addr.cpp +++ b/ace/INET_Addr.cpp @@ -34,7 +34,7 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[], else { ACE_OS::sprintf (s, - ACE_TEXT ("%s:%d"), + ACE_LIB_TEXT ("%s:%d"), (ipaddr_format == 0 ? this->get_host_name () : this->get_host_addr ()), @@ -51,10 +51,10 @@ ACE_INET_Addr::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_TCHAR s[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16]; - ACE_OS::sprintf (s, ACE_TEXT ("%s:%d"), + ACE_OS::sprintf (s, ACE_LIB_TEXT ("%s:%d"), this->get_host_addr (), this->get_port_number ()); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s"), s)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("%s"), s)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -127,7 +127,7 @@ ACE_INET_Addr::string_to_addr (const ACE_TCHAR s[]) if (ip_addr == 0) // Assume it's a port number. { - if (ACE_OS::strspn (t, ACE_TEXT ("1234567890")) + if (ACE_OS::strspn (t, ACE_LIB_TEXT ("1234567890")) == ACE_OS::strlen (t)) { // port number u_short port = (u_short) ACE_OS::atoi (t); @@ -143,7 +143,7 @@ ACE_INET_Addr::string_to_addr (const ACE_TCHAR s[]) *ip_addr = '\0'; ++ip_addr; // skip over ':' if (ACE_OS::strspn (ip_addr, - ACE_TEXT ("1234567890")) == + ACE_LIB_TEXT ("1234567890")) == ACE_OS::strlen (ip_addr)) { u_short port = @@ -346,9 +346,9 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number, ((char *) (host_name))))); #else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr: %p\n"), + ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr: %p\n"), ((host_name == 0) ? - (ACE_TEXT ("<unknown>")) : + (ACE_LIB_TEXT ("<unknown>")) : host_name))); #endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ } @@ -394,8 +394,8 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number, ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); if (this->set (port_number, inet_address) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); } // Creates a ACE_INET_Addr from a PORT_NAME and the remote @@ -410,7 +410,7 @@ ACE_INET_Addr::ACE_INET_Addr (const ACE_TCHAR port_name[], host_name, protocol) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); + ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); } // Creates a ACE_INET_Addr from a PORT_NAME and an Internet address. @@ -425,7 +425,7 @@ ACE_INET_Addr::ACE_INET_Addr (const ACE_TCHAR port_name[], inet_address, protocol) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); + ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); } int @@ -512,7 +512,7 @@ ACE_INET_Addr::get_host_name (void) const static ACE_TCHAR name[MAXHOSTNAMELEN + 1]; if (this->get_host_name (name, MAXHOSTNAMELEN + 1) == -1) - ACE_OS::strcpy (name, ACE_TEXT ("<unknown>")); + ACE_OS::strcpy (name, ACE_LIB_TEXT ("<unknown>")); return name; } diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h index f0af225a163..a55c0b6ae66 100644 --- a/ace/INET_Addr.h +++ b/ace/INET_Addr.h @@ -62,13 +62,13 @@ public: ACE_INET_Addr (const ACE_TCHAR port_name[], const ACE_TCHAR host_name[], - const ACE_TCHAR protocol[] = ACE_TEXT ("tcp")); + const ACE_TCHAR protocol[] = ACE_LIB_TEXT ("tcp")); // Uses <getservbyname> to create an <ACE_INET_Addr> from a // <port_name>, the remote <host_name>, and the <protocol>. ACE_INET_Addr (const ACE_TCHAR port_name[], ACE_UINT32 ip_addr, - const ACE_TCHAR protocol[] = ACE_TEXT ("tcp")); + const ACE_TCHAR protocol[] = ACE_LIB_TEXT ("tcp")); // Uses <getservbyname> to create an <ACE_INET_Addr> from a // <port_name>, an Internet <ip_addr>, and the <protocol>. This // method assumes that <ip_addr> is in host byte order. @@ -102,13 +102,13 @@ public: int set (const ACE_TCHAR port_name[], const ACE_TCHAR host_name[], - const ACE_TCHAR protocol[] = ACE_TEXT ("tcp")); + const ACE_TCHAR protocol[] = ACE_LIB_TEXT ("tcp")); // Uses <getservbyname> to initialize an <ACE_INET_Addr> from a // <port_name>, the remote <host_name>, and the <protocol>. int set (const ACE_TCHAR port_name[], ACE_UINT32 ip_addr, - const ACE_TCHAR protocol[] = ACE_TEXT ("tcp")); + const ACE_TCHAR protocol[] = ACE_LIB_TEXT ("tcp")); // Uses <getservbyname> to initialize an <ACE_INET_Addr> from a // <port_name>, an <ip_addr>, and the <protocol>. This assumes that // <ip_addr> is already in network byte order. diff --git a/ace/IO_SAP.cpp b/ace/IO_SAP.cpp index e962e76163a..09146c11940 100644 --- a/ace/IO_SAP.cpp +++ b/ace/IO_SAP.cpp @@ -27,8 +27,8 @@ ACE_IO_SAP::dump (void) const ACE_TRACE ("ACE_IO_SAP::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %d"), this->handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %d"), this->pid_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("handle_ = %d"), this->handle_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npid_ = %d"), this->pid_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/IPC_SAP.cpp b/ace/IPC_SAP.cpp index 039abfa5bb1..c3a05093563 100644 --- a/ace/IPC_SAP.cpp +++ b/ace/IPC_SAP.cpp @@ -17,8 +17,8 @@ ACE_IPC_SAP::dump (void) const ACE_TRACE ("ACE_IPC_SAP::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %d"), this->handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %d"), this->pid_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("handle_ = %d"), this->handle_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npid_ = %d"), this->pid_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/LSOCK.cpp b/ace/LSOCK.cpp index 280c4651e77..c5f7309ead7 100644 --- a/ace/LSOCK.cpp +++ b/ace/LSOCK.cpp @@ -19,7 +19,7 @@ ACE_LSOCK::dump (void) const ACE_TRACE ("ACE_LSOCK::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("aux_handle_ = %d"), this->aux_handle_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_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 182ba5ea8f4..5bce9e7887d 100644 --- a/ace/LSOCK_CODgram.cpp +++ b/ace/LSOCK_CODgram.cpp @@ -51,6 +51,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, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_LSOCK_CODgram"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_LSOCK_CODgram"))); } #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ diff --git a/ace/LSOCK_Connector.cpp b/ace/LSOCK_Connector.cpp index 9b9c0166b2f..8bd17fd81c1 100644 --- a/ace/LSOCK_Connector.cpp +++ b/ace/LSOCK_Connector.cpp @@ -20,7 +20,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, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/LSOCK_Dgram.cpp b/ace/LSOCK_Dgram.cpp index ef32a26ba12..fd1a67c1363 100644 --- a/ace/LSOCK_Dgram.cpp +++ b/ace/LSOCK_Dgram.cpp @@ -59,8 +59,8 @@ ACE_LSOCK_Dgram::ACE_LSOCK_Dgram (const ACE_Addr &local, protocol_family, protocol) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_LSOCK_Dgram"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_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 9c951395c78..2d4cbd96813 100644 --- a/ace/Local_Name_Space_T.cpp +++ b/ace/Local_Name_Space_T.cpp @@ -349,7 +349,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, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Local_Name_Space::ACE_Local_Name_Space"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_Local_Name_Space::ACE_Local_Name_Space"))); } template <ACE_MEM_POOL_1, class ACE_LOCK> @@ -420,19 +420,19 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) size_t length = 0; length = sizeof lock_name_for_local_name_space / sizeof (ACE_TCHAR); ACE_OS::strncpy (lock_name_for_local_name_space, - ACE_TEXT ("name_space_"), + ACE_LIB_TEXT ("name_space_"), length); ACE_OS::strncat (lock_name_for_local_name_space, postfix, - length - ACE_OS::strlen (ACE_TEXT ("name_space_"))); + length - ACE_OS::strlen (ACE_LIB_TEXT ("name_space_"))); length = sizeof lock_name_for_backing_store / sizeof (ACE_TCHAR); ACE_OS::strncpy (lock_name_for_backing_store, - ACE_TEXT ("backing_store_"), + ACE_LIB_TEXT ("backing_store_"), length); ACE_OS::strncat (lock_name_for_backing_store, postfix, - length - ACE_OS::strlen (ACE_TEXT ("backing_store_"))); + length - ACE_OS::strlen (ACE_LIB_TEXT ("backing_store_"))); // Create the allocator with the appropriate options. ACE_NEW_RETURN (this->allocator_, @@ -442,7 +442,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) if (ACE_LOG_MSG->op_status ()) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Allocator::Allocator\n")), + ACE_LIB_TEXT ("Allocator::Allocator\n")), -1); ACE_NEW_RETURN (this->lock_, @@ -453,7 +453,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) // Now check if the backing store has been created successfully if (ACE_OS::access (this->context_file_, F_OK) != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("create_manager\n")), + ACE_LIB_TEXT ("create_manager\n")), -1); #endif /* ACE_LACKS_ACCESS */ @@ -465,7 +465,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) { this->name_space_map_ = (ACE_Name_Space_Map <ALLOCATOR> *) ns_map; if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_space_map_ = %d, ns_map = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("name_space_map_ = %d, ns_map = %d\n"), this->name_space_map_, ns_map)); } @@ -481,7 +481,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) { this->name_space_map_ = (ACE_Name_Space_Map <ALLOCATOR> *) ns_map; if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_space_map_ = %d, ns_map = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("name_space_map_ = %d, ns_map = %d\n"), this->name_space_map_, ns_map)); } else @@ -496,11 +496,11 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) if (this->allocator_->bind (ACE_NAME_SERVER_MAP, ns_map) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("create_manager\n")), -1); + ACE_LIB_TEXT ("create_manager\n")), -1); } if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_space_map_ = %d, ns_map = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("name_space_map_ = %d, ns_map = %d\n"), this->name_space_map_, ns_map)); } @@ -773,7 +773,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump_i (void) const const char *type = map_entry->int_id_.type (); #endif /* ! ACE_NLOGGING */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key=%s\nvalue=%s\ntype=%s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_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 cdb7313914b..6edb9684175 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_TEXT ("ACE_Tokens::dump:\n") - ACE_TEXT (" reference_cont_ = %d\n") - ACE_TEXT (" token_name_ = %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Tokens::dump:\n") + ACE_LIB_TEXT (" reference_cont_ = %d\n") + ACE_LIB_TEXT (" token_name_ = %s\n"), reference_count_, token_name_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("waiters_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("waiters_\n"))); this->waiters_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -54,19 +54,19 @@ ACE_TPQ_Entry::dump (void) const ACE_TRACE ("ACE_TPQ_Entry::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("ACE_TPQ_Entry::dump:\n") - ACE_TEXT (" nesting_level_ = %d\n") - ACE_TEXT (" client_id_ = %s\n"), + ACE_LIB_TEXT ("ACE_TPQ_Entry::dump:\n") + ACE_LIB_TEXT (" nesting_level_ = %d\n") + ACE_LIB_TEXT (" client_id_ = %s\n"), nesting_level_, client_id_)); if (next_ != 0) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next:.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("next:.\n"))); next_->dump (); } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TPQ_Entry::dump end.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_TPQ_Entry::dump end.\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -95,7 +95,7 @@ ACE_TPQ_Entry::ACE_TPQ_Entry (const ACE_Token_Proxy *new_proxy, // The cast is an attempt to get this to compile (and run, // hopefully) regardless of the type of ACE_thread_t. ACE_OS::sprintf (name, - ACE_TEXT ("/%s/%u/%lu"), + ACE_LIB_TEXT ("/%s/%u/%lu"), host_name, ACE_static_cast (u_int, ACE_OS::getpid ()), *ACE_reinterpret_cast (u_long *, &thread_id)); @@ -164,11 +164,11 @@ ACE_TSS_TPQ_Entry::dump (void) const (char *) " client_id_ = %s\n", (char *) client_id_ == 0 ? (char *) "0" : (char *) client_id_)); #else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TSS_TPQ_Entry::dump:\n") - ACE_TEXT (" client_id_ = %s\n"), - client_id_ == 0 ? ACE_TEXT ("0") : client_id_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_TSS_TPQ_Entry::dump:\n") + ACE_LIB_TEXT (" client_id_ = %s\n"), + client_id_ == 0 ? ACE_LIB_TEXT ("0") : client_id_)); #endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); ACE_TPQ_ENTRY::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -247,10 +247,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_TEXT ("ACE_TPQ_Iterator::dump:\n") - ACE_TEXT (" current_ = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_TPQ_Iterator::dump:\n") + ACE_LIB_TEXT (" current_ = %d\n"), (long) this->current_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("head_ and tail_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("head_ and tail_\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -259,14 +259,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_TEXT ("ACE_Token_Proxy_Queue::dump:\n") - ACE_TEXT (" size_ = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Proxy_Queue::dump:\n") + ACE_LIB_TEXT (" size_ = %d\n"), size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("head_ and tail_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("head_ and tail_\n"))); if (this->head_ != 0) this->head_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy_Queue::dump end.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Proxy_Queue::dump end.\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -348,7 +348,7 @@ ACE_Token_Proxy_Queue::dequeue (void) if (this->head_ == 0 && this->size_ != 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("incorrect size = %d\n"), + ACE_LIB_TEXT ("incorrect size = %d\n"), this->size_)); } @@ -421,12 +421,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_TEXT ("ACE_Mutex_Token::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("lock_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Mutex_Token::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("lock_\n"))); lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); ACE_Tokens::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Mutex_Token::dump end.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Mutex_Token::dump end.\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -662,13 +662,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_TEXT ("ACE_RW_Token::dump:\n") - ACE_TEXT ("num_writers_ = %d\n"), num_writers_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("lock_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_RW_Token::dump:\n") + ACE_LIB_TEXT ("num_writers_ = %d\n"), num_writers_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("lock_\n"))); this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); ACE_Tokens::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_RW_Token::dump end.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_RW_Token::dump end.\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -1046,18 +1046,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_TEXT ("ACE_Token_Proxy::dump:\n") - ACE_TEXT (" type = %d\n") - ACE_TEXT (" ignore_deadlock_ = %d\n") - ACE_TEXT (" debug_ = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Proxy::dump:\n") + ACE_LIB_TEXT (" type = %d\n") + ACE_LIB_TEXT (" ignore_deadlock_ = %d\n") + ACE_LIB_TEXT (" debug_ = %d\n"), (int) this->type (), ignore_deadlock_, debug_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("mutex_, and waiter_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("mutex_, and waiter_\n"))); if (this->token_ != 0) this->token_->dump (); this->waiter_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy::dump end.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Proxy::dump end.\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -1073,7 +1073,7 @@ ACE_Token_Proxy::client_id (void) const const ACE_TCHAR *id = temp->client_id (); if (id == 0) - return ACE_TEXT ("ERROR NO CLIENT ID"); + return ACE_LIB_TEXT ("ERROR NO CLIENT ID"); else return id; } @@ -1145,7 +1145,7 @@ ACE_Token_Proxy::open (const ACE_TCHAR *token_name, // We must have a name. if (token_name == 0) { - ACE_OS::sprintf (name, ACE_TEXT ("token %lx"), + ACE_OS::sprintf (name, ACE_LIB_TEXT ("token %lx"), ACE_reinterpret_cast (long, this)); token_name = name; } @@ -1158,7 +1158,7 @@ ACE_Token_Proxy::open (const ACE_TCHAR *token_name, if (this->token_ == 0) { errno = ENOMEM; - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Can't allocate mutex")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("Can't allocate mutex")), -1); } return 0; @@ -1173,7 +1173,7 @@ ACE_Token_Proxy::acquire (int notify, if (this->token_ == 0) { errno = ENOENT; - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Not open.\n")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("Not open.\n")), -1); } // Make sure no one calls our token_acquired until we have a chance @@ -1203,8 +1203,8 @@ ACE_Token_Proxy::acquire (int notify, case EWOULDBLOCK : if (this->debug_) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) waiting for %s, owner is %s, ") - ACE_TEXT ("total waiters == %d\n"), + ACE_LIB_TEXT ("(%t) waiting for %s, owner is %s, ") + ACE_LIB_TEXT ("total waiters == %d\n"), this->name (), this->token_->owner_id (), token_->no_of_waiters ())); @@ -1224,8 +1224,8 @@ ACE_Token_Proxy::acquire (int notify, default : waiter_->cond_var_.mutex ().release (); ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Token Proxy acquire.")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("Token Proxy acquire.")), -1); } } @@ -1234,7 +1234,7 @@ ACE_Token_Proxy::acquire (int notify, { if (debug_) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) acquired %s\n"), + ACE_LIB_TEXT ("(%t) acquired %s\n"), this->name ())); waiter_->cond_var_.mutex ().release (); } @@ -1250,7 +1250,7 @@ ACE_Token_Proxy::tryacquire (void (*sleep_hook)(void *)) { errno = ENOENT; ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Not open.\n")), + ACE_LIB_TEXT ("Not open.\n")), -1); } @@ -1268,7 +1268,7 @@ ACE_Token_Proxy::renew (int requeue_position, { errno = ENOENT; ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Not open.\n")), + ACE_LIB_TEXT ("Not open.\n")), -1); } @@ -1281,10 +1281,10 @@ ACE_Token_Proxy::renew (int requeue_position, // check for error if (errno != EWOULDBLOCK) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p renew failed\n"), ACE_TEXT ("ACE_Token_Proxy")), -1); + ACE_LIB_TEXT ("%p renew failed\n"), ACE_LIB_TEXT ("ACE_Token_Proxy")), -1); if (this->debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) renew blocking for %s, owner is %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) renew blocking for %s, owner is %s\n"), this->name (), token_->owner_id ())); @@ -1295,7 +1295,7 @@ ACE_Token_Proxy::renew (int requeue_position, // we have the token { if (this->debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) renewed %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) renewed %s\n"), this->name ())); waiter_->cond_var_.mutex ().release (); return 0; @@ -1330,12 +1330,12 @@ ACE_Token_Proxy::handle_options (ACE_Synch_Options &options, // We come here if a timeout occurs or some serious // ACE_Condition object error. cv.mutex ().release (); - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("condition variable wait") - ACE_TEXT (" bombed.")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("condition variable wait") + ACE_LIB_TEXT (" bombed.")), -1); } if (this->debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) unblocking.\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) unblocking.\n"), this->client_id ())); cv.mutex ().release (); return 0; // operation succeeded @@ -1351,7 +1351,7 @@ ACE_Token_Proxy::release (ACE_Synch_Options &) { errno = ENOENT; if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Must open before releasing.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Must open before releasing.\n"))); ACE_RETURN (-1); } @@ -1360,13 +1360,13 @@ ACE_Token_Proxy::release (ACE_Synch_Options &) // Release failed. this->token_->remove (this->waiter_); if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %p.\n"), ACE_TEXT ("release failed"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) %p.\n"), ACE_LIB_TEXT ("release failed"))); return -1; } else { if (this->debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) released %s, owner is %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) released %s, owner is %s\n"), this->name (), token_->owner_id ())); @@ -1431,9 +1431,9 @@ ACE_Token_Name::dump (void) const (char *) " token_name_ = %s\n", (char *) token_name_ == 0 ? (char *) "no name" : (char *) token_name_)); #else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Name::dump:\n") - ACE_TEXT (" token_name_ = %s\n"), - token_name_ == 0 ? ACE_TEXT ("no name") : token_name_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Name::dump:\n") + ACE_LIB_TEXT (" token_name_ = %s\n"), + token_name_ == 0 ? ACE_LIB_TEXT ("no name") : token_name_)); #endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Local_Tokens.i b/ace/Local_Tokens.i index 0434936ab9c..9a195950729 100644 --- a/ace/Local_Tokens.i +++ b/ace/Local_Tokens.i @@ -121,7 +121,7 @@ ACE_Tokens::dec_reference (void) ACE_TRACE ("ACE_Tokens::dec_reference"); if (this->reference_count_ == 0) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("dec_reference already zero"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("dec_reference already zero"))); return 0; } @@ -189,7 +189,7 @@ ACE_Tokens::owner_id () { ACE_TRACE ("ACE_Tokens::owner_id"); if (this->owner () == 0) - return ACE_TEXT ("no owner"); + return ACE_LIB_TEXT ("no owner"); else return this->owner ()->client_id (); } @@ -302,7 +302,7 @@ ACE_Token_Name::name (const ACE_TCHAR *new_name) ACE_TRACE ("ACE_Token_Name::name"); if (new_name == 0) - new_name = ACE_TEXT ("no name"); + new_name = ACE_LIB_TEXT ("no name"); int n = ACE_OS::strlen (new_name) + 1; diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index c68079e96a4..0a95701fa87 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -858,10 +858,10 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { #if defined (ACE_LACKS_FLOATING_POINT) ACE_UINT32 value = va_arg (argp, ACE_UINT32); - ACE_OS::sprintf (bp, ACE_TEXT ("%ld"), value); + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%ld"), value); #else double value = va_arg (argp, double); - ACE_OS::sprintf (bp, ACE_TEXT ("%f"), value); + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%f"), value); #endif /* ACE_LACKS_FLOATING_POINT */ } break; @@ -869,20 +869,20 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, type = SKIP_SPRINTF; abort_prog = 1; exit_value = va_arg (argp, int); - ACE_OS::sprintf (bp, ACE_TEXT ("Aborting...")); + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("Aborting...")); // Make sure to NULL terminate this... break; case 'l': - ACE_OS::sprintf (bp, ACE_TEXT ("%d"), this->linenum ()); + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%d"), this->linenum ()); type = SKIP_SPRINTF; break; case 'N': { // @@ UNICODE const ACE_TCHAR *file = this->file (); - ACE_OS::sprintf (bp, ACE_TEXT ("%s"), + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%s"), file ? file - : ACE_TEXT ("<unknown file>")); + : ACE_LIB_TEXT ("<unknown file>")); type = SKIP_SPRINTF; break; } @@ -891,11 +891,11 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, // @@ UNICODE ACE_OS::strcpy (bp, ACE_Log_Msg::program_name_ ? ACE_Log_Msg::program_name_ : - ACE_TEXT ("<unknown>")); + ACE_LIB_TEXT ("<unknown>")); break; case 'P': // Format the current process id. type = SKIP_SPRINTF; - ACE_OS::sprintf (bp, ACE_TEXT ("%d"), + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%d"), ACE_static_cast (int, this->getpid ())); break; case 'p': // Format the string assocated with the errno value. @@ -906,7 +906,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, // @@ WINCE There is no strerror available on CE. // Have to double check if this change is valid. if (errno >= 0 && errno < sys_nerr) - ACE_OS::sprintf (bp, ACE_TEXT ("%s: %s"), + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%s: %s"), va_arg (argp, ACE_TCHAR *), strerror (errno)); else @@ -941,13 +941,13 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { const ACE_TCHAR *message = ACE::sock_error (errno); - ACE_OS::sprintf (bp, ACE_TEXT ("%s: %s"), + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%s: %s"), va_arg (argp, const ACE_TCHAR *), message); } else { - ACE_OS::sprintf (bp, ACE_TEXT ("%s: %s"), + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%s: %s"), va_arg (argp, ACE_TCHAR *), lpMsgBuf); // Free the buffer. @@ -955,7 +955,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, } #elif !defined (ACE_HAS_WINCE) ACE_OS::sprintf (bp, - ACE_TEXT ( + ACE_LIB_TEXT ( "%s: <unknown error> = %d"), va_arg (argp, ACE_TCHAR *), errno); #endif /* ACE_WIN32 */ @@ -971,7 +971,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, // Have to double check if this change is valid. if (errno >= 0 && errno < sys_nerr) ACE_OS::sprintf (bp, - ACE_TEXT ("%s"), + ACE_LIB_TEXT ("%s"), strerror (errno)); else #endif /* ACE_HAS_WINCE */ @@ -1006,20 +1006,20 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, const ACE_TCHAR *message = ACE::sock_error (errno); ACE_OS::sprintf (bp, - ACE_TEXT ("%s"), + ACE_LIB_TEXT ("%s"), message); } else { ACE_OS::sprintf (bp, - ACE_TEXT ("%s"), + ACE_LIB_TEXT ("%s"), lpMsgBuf); // Free the buffer. ::LocalFree (lpMsgBuf); } #elif !defined (ACE_HAS_WINCE) ACE_OS::sprintf (bp, - ACE_TEXT ("<unknown error> = %d"), + ACE_LIB_TEXT ("<unknown error> = %d"), errno); #endif /* ACE_WIN32 */ } @@ -1027,7 +1027,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, } case 'R': // Format the return status of the operation. this->op_status (va_arg (argp, int)); - ACE_OS::sprintf (bp, ACE_TEXT ("%d"), this->op_status ()); + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%d"), this->op_status ()); break; case '{': // Increment the trace_depth, then indent @@ -1086,10 +1086,10 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, if (sig >= 0 && sig < ACE_NSIG) ACE_OS::strcpy (bp, _sys_siglist[sig]); else - ACE_OS::sprintf (bp, ACE_TEXT ("<unknown signal> %d"), + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("<unknown signal> %d"), sig); #else - ACE_OS::sprintf (bp, ACE_TEXT ("signal %d"), sig); + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("signal %d"), sig); #endif /* ACE_HAS_SYS_SIGLIST */ break; } @@ -1100,7 +1100,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, ACE_TCHAR day_and_time[35]; ACE::timestamp (day_and_time, sizeof day_and_time); - ACE_OS::sprintf (bp, ACE_TEXT ("%s"), day_and_time); + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%s"), day_and_time); break; } case 'T': // Format the timestamp in @@ -1109,7 +1109,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, type = SKIP_SPRINTF; ACE_TCHAR day_and_time[35]; ACE_OS::sprintf (bp, - ACE_TEXT ("%s"), + ACE_LIB_TEXT ("%s"), ACE::timestamp (day_and_time, sizeof day_and_time)); break; @@ -1117,7 +1117,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, case 't': // Format thread id. type = SKIP_SPRINTF; #if defined (ACE_WIN32) - ACE_OS::sprintf (bp, ACE_TEXT ("%u"), ACE_Thread::self ()); + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%u"), ACE_Thread::self ()); #elif defined (AIX) && (ACE_AIX_MINOR_VERS <= 2) // AIX's pthread_t (ACE_hthread_t) is a pointer, and it's // a little ugly to send that through a %u format. So, @@ -1129,9 +1129,9 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, // 2. OSF/1 V3.2 has that def, and I'm not sure what affect // this would have on that. // -Steve Huston, 19-Aug-97 - ACE_OS::sprintf (bp, ACE_TEXT ("%u"), thread_self()); + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%u"), thread_self()); #elif defined (DIGITAL_UNIX) - ACE_OS::sprintf (bp, ACE_TEXT ("%u"), + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%u"), pthread_getselfseq_np()); #else ACE_hthread_t t_id; @@ -1141,19 +1141,19 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, // HP-UX 10.x DCE's thread ID is a pointer. Grab the // more meaningful, readable, thread ID. This will match // the one seen in the debugger as well. - ACE_OS::sprintf (bp, ACE_TEXT ("%u"), + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%u"), pthread_getunique_np(&t_id)); # elif defined (ACE_MVS) // MVS's pthread_t is a struct... yuck. So use the ACE 5.0 // code for it. - ACE_OS::sprintf (bp, ACE_TEXT ("%u"), t_id); + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%u"), t_id); # else // Yes, this is an ugly C-style cast, but the correct // C++ cast is different depending on whether the t_id // is an integral type or a pointer type. FreeBSD uses // a pointer type, but doesn't have a _np function to // get an integral type, like the OSes above. - ACE_OS::sprintf (bp, ACE_TEXT ("%lu"), + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%lu"), (unsigned long)t_id); # endif /* ACE_HAS_PTHREADS_DRAFT4 && HPUX_10 */ @@ -1475,21 +1475,21 @@ ACE_Log_Msg::log_hexdump (ACE_Log_Priority log_priority, if (text) sz = ACE_OS::sprintf (msg_buf, - ACE_TEXT ("%s - "), + ACE_LIB_TEXT ("%s - "), text); sz += ACE_OS::sprintf (msg_buf + sz, - ACE_TEXT ("HEXDUMP %d bytes"), + ACE_LIB_TEXT ("HEXDUMP %d bytes"), size); if (len < size) ACE_OS::sprintf (msg_buf + sz, - ACE_TEXT (" (showing first %d bytes)"), + ACE_LIB_TEXT (" (showing first %d bytes)"), len); // Now print out the formatted buffer. this->log (log_priority, - ACE_TEXT ("%s\n%s"), + ACE_LIB_TEXT ("%s\n%s"), msg_buf, buf); return 0; @@ -1533,35 +1533,35 @@ ACE_Log_Msg::dump (void) const ACE_TRACE ("ACE_Log_Msg::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("status_ = %d\n"), this->status_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nerrnum_ = %d\n"), this->errnum_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nlinenum_ = %d\n"), this->linenum_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nfile_ = %s\n"), this->file_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_ = %s\n"), this->msg_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nrestart_ = %d\n"), this->restart_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nostream_ = %x\n"), this->ostream_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_callback_ = %x\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("status_ = %d\n"), this->status_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nerrnum_ = %d\n"), this->errnum_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nlinenum_ = %d\n"), this->linenum_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nfile_ = %s\n"), this->file_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmsg_ = %s\n"), this->msg_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nrestart_ = %d\n"), this->restart_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nostream_ = %x\n"), this->ostream_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmsg_callback_ = %x\n"), this->msg_callback_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nprogram_name_ = %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nprogram_name_ = %s\n"), this->program_name_ ? this->program_name_ - : ACE_TEXT ("<unknown>"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nlocal_host_ = %s\n"), + : ACE_LIB_TEXT ("<unknown>"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nlocal_host_ = %s\n"), this->local_host_ ? this->local_host_ - : ACE_TEXT ("<unknown>"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %d\n"), this->getpid ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags_ = %x\n"), this->flags_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntrace_depth_ = %d\n"), + : ACE_LIB_TEXT ("<unknown>"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npid_ = %d\n"), this->getpid ())); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nflags_ = %x\n"), this->flags_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntrace_depth_ = %d\n"), this->trace_depth_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\trace_active_ = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\trace_active_ = %d\n"), this->trace_active_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\tracing_enabled_ = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\tracing_enabled_ = %d\n"), this->tracing_enabled_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npriority_mask_ = %x\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npriority_mask_ = %x\n"), this->priority_mask_)); if (this->thr_desc_ != 0 && this->thr_desc_->state () != 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\thr_state_ = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\thr_state_ = %d\n"), this->thr_desc_->state ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_off_ = %d\n"), this->msg_off_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmsg_off_ = %d\n"), this->msg_off_)); // Be sure that there is a message_queue_, with multiple threads. ACE_MT (ACE_Log_Msg_Manager::get_lock ()); @@ -1955,7 +1955,7 @@ ACE_Log_Msg_Attributes::inherit_log_msg (ACE_OS_Thread_Descriptor *thr_desc) //Initialize the task specific logger ACE_LOG_MSG->open(new_name); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) starting %s thread at %D\n"),new_name)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) starting %s thread at %D\n"),new_name)); # endif /* ACE_PSOS */ #endif /* ! ACE_THREADS_DONT_INHERIT_LOG_MSG && ! ACE_HAS_MINIMAL_ACE_OS */ } diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h index 769937fc592..62f2c8e4e90 100644 --- a/ace/Log_Msg.h +++ b/ace/Log_Msg.h @@ -35,7 +35,7 @@ ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \ ace___->set (ACE_TEXT_CHAR_TO_TCHAR(__FILE__), __LINE__, -1, __ace_error, ace___->restart (), \ ace___->msg_ostream (), ace___->msg_callback ()); \ - ace___->log (LM_ERROR, ACE_TEXT ("ACE_ASSERT: file %N, line %l assertion failed for '%s'.%a\n"), #X, -1); \ + ace___->log (LM_ERROR, ACE_LIB_TEXT ("ACE_ASSERT: file %N, line %l assertion failed for '%s'.%a\n"), #X, -1); \ } } while (0) #endif /* ACE_NDEBUG */ diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp index fe776004b5a..767c04f4356 100644 --- a/ace/Log_Record.cpp +++ b/ace/Log_Record.cpp @@ -18,18 +18,18 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Log_Record) const ACE_TCHAR *ACE_Log_Record::priority_names_[] = { - ACE_TEXT ("<none>"), - ACE_TEXT ("LM_SHUTDOWN"), - ACE_TEXT ("LM_TRACE"), - ACE_TEXT ("LM_DEBUG"), - ACE_TEXT ("LM_INFO"), - ACE_TEXT ("LM_NOTICE"), - ACE_TEXT ("LM_WARNING"), - ACE_TEXT ("LM_STARTUP"), - ACE_TEXT ("LM_ERROR"), - ACE_TEXT ("LM_CRITICAL"), - ACE_TEXT ("LM_ALERT"), - ACE_TEXT ("LM_EMERGENCY")}; + ACE_LIB_TEXT ("<none>"), + ACE_LIB_TEXT ("LM_SHUTDOWN"), + ACE_LIB_TEXT ("LM_TRACE"), + ACE_LIB_TEXT ("LM_DEBUG"), + ACE_LIB_TEXT ("LM_INFO"), + ACE_LIB_TEXT ("LM_NOTICE"), + ACE_LIB_TEXT ("LM_WARNING"), + ACE_LIB_TEXT ("LM_STARTUP"), + ACE_LIB_TEXT ("LM_ERROR"), + ACE_LIB_TEXT ("LM_CRITICAL"), + ACE_LIB_TEXT ("LM_ALERT"), + ACE_LIB_TEXT ("LM_EMERGENCY")}; const ACE_TCHAR * ACE_Log_Record::priority_name (ACE_Log_Priority p) @@ -57,11 +57,11 @@ ACE_Log_Record::dump (void) const // ACE_TRACE ("ACE_Log_Record::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("length_ = %d\n"), this->length_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntype_ = %d\n"), this->type_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntime_stamp_ = (%d, %d)\n"), this->time_stamp_.sec (), this->time_stamp_.usec ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %d\n"), this->pid_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_data_ = %s\n"), this->msg_data_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("length_ = %d\n"), this->length_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntype_ = %d\n"), this->type_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntime_stamp_ = (%d, %d)\n"), this->time_stamp_.sec (), this->time_stamp_.usec ())); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npid_ = %d\n"), this->pid_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmsg_data_ = %s\n"), this->msg_data_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -144,7 +144,7 @@ ACE_Log_Record::format_msg (const ACE_TCHAR *host_name, ctp[24] = '\0'; // NUL-terminate after the date. ACE_OS::sprintf (timestamp, - ACE_TEXT ("%s.%03ld %s"), + ACE_LIB_TEXT ("%s.%03ld %s"), ctp + 4, this->time_stamp_.usec () / 1000, ctp + 20); @@ -155,15 +155,15 @@ ACE_Log_Record::format_msg (const ACE_TCHAR *host_name, { # if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) const ACE_TCHAR *lhost_name = (const ACE_TCHAR *) ((host_name == 0) - ? ((char *) ACE_TEXT ("<local_host>")) + ? ((char *) ACE_LIB_TEXT ("<local_host>")) : ((char *) host_name)); # else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ const ACE_TCHAR *lhost_name = ((host_name == 0) - ? ACE_TEXT ("<local_host>") + ? ACE_LIB_TEXT ("<local_host>") : host_name); # endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ ACE_OS::sprintf (verbose_msg, - ACE_TEXT ("%s@%s@%ld@%s@%s"), + ACE_LIB_TEXT ("%s@%s@%ld@%s@%s"), timestamp, lhost_name, this->pid_, @@ -172,13 +172,13 @@ ACE_Log_Record::format_msg (const ACE_TCHAR *host_name, } else if (ACE_BIT_ENABLED (verbose_flag, ACE_Log_Msg::VERBOSE_LITE)) ACE_OS::sprintf (verbose_msg, - ACE_TEXT ("%s@%s@%s"), + ACE_LIB_TEXT ("%s@%s@%s"), timestamp, ACE_Log_Record::priority_name (ACE_Log_Priority (this->type_)), this->msg_data_); else ACE_OS::sprintf (verbose_msg, - ACE_TEXT ("%s"), + ACE_LIB_TEXT ("%s"), this->msg_data_); return 0; } diff --git a/ace/Logging_Strategy.cpp b/ace/Logging_Strategy.cpp index 09144ec1ffb..43d5336e831 100644 --- a/ace/Logging_Strategy.cpp +++ b/ace/Logging_Strategy.cpp @@ -25,45 +25,45 @@ ACE_Logging_Strategy::priorities (ACE_TCHAR *priority_string, // Parse string and alternate priority mask. - for (ACE_TCHAR *priority = ACE_OS::strtok (priority_string, ACE_TEXT("|")); + for (ACE_TCHAR *priority = ACE_OS::strtok (priority_string, ACE_LIB_TEXT ("|")); priority != 0; - priority = ACE_OS::strtok (0, ACE_TEXT("|"))) + priority = ACE_OS::strtok (0, ACE_LIB_TEXT ("|"))) { - if (ACE_OS::strcmp (priority, ACE_TEXT("TRACE")) == 0) + if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("TRACE")) == 0) ACE_SET_BITS (priority_mask, LM_TRACE); - else if (ACE_OS::strcmp (priority, ACE_TEXT("~TRACE")) == 0) + else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~TRACE")) == 0) ACE_CLR_BITS (priority_mask, LM_TRACE); - else if (ACE_OS::strcmp (priority, ACE_TEXT("DEBUG")) == 0) + else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("DEBUG")) == 0) ACE_SET_BITS (priority_mask, LM_DEBUG); - else if (ACE_OS::strcmp (priority, ACE_TEXT("~DEBUG")) == 0) + else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~DEBUG")) == 0) ACE_CLR_BITS (priority_mask, LM_DEBUG); - else if (ACE_OS::strcmp (priority, ACE_TEXT("INFO")) == 0) + else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("INFO")) == 0) ACE_SET_BITS (priority_mask, LM_INFO); - else if (ACE_OS::strcmp (priority, ACE_TEXT("~INFO")) == 0) + else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~INFO")) == 0) ACE_CLR_BITS (priority_mask, LM_INFO); - else if (ACE_OS::strcmp (priority, ACE_TEXT("NOTICE")) == 0) + else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("NOTICE")) == 0) ACE_SET_BITS (priority_mask, LM_NOTICE); - else if (ACE_OS::strcmp (priority, ACE_TEXT("~NOTICE")) == 0) + else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~NOTICE")) == 0) ACE_CLR_BITS (priority_mask, LM_NOTICE); - else if (ACE_OS::strcmp (priority, ACE_TEXT("WARNING")) == 0) + else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("WARNING")) == 0) ACE_SET_BITS (priority_mask, LM_WARNING); - else if (ACE_OS::strcmp (priority, ACE_TEXT("~WARNING")) == 0) + else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~WARNING")) == 0) ACE_CLR_BITS (priority_mask, LM_WARNING); - else if (ACE_OS::strcmp (priority, ACE_TEXT("ERROR")) == 0) + else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("ERROR")) == 0) ACE_SET_BITS (priority_mask, LM_ERROR); - else if (ACE_OS::strcmp (priority, ACE_TEXT("~ERROR")) == 0) + else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~ERROR")) == 0) ACE_CLR_BITS (priority_mask, LM_ERROR); - else if (ACE_OS::strcmp (priority, ACE_TEXT("CRITICAL")) == 0) + else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("CRITICAL")) == 0) ACE_SET_BITS (priority_mask, LM_CRITICAL); - else if (ACE_OS::strcmp (priority, ACE_TEXT("~CRITICAL")) == 0) + else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~CRITICAL")) == 0) ACE_CLR_BITS (priority_mask, LM_CRITICAL); - else if (ACE_OS::strcmp (priority, ACE_TEXT("ALERT")) == 0) + else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("ALERT")) == 0) ACE_SET_BITS (priority_mask, LM_ALERT); - else if (ACE_OS::strcmp (priority, ACE_TEXT("~ALERT")) == 0) + else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~ALERT")) == 0) ACE_CLR_BITS (priority_mask, LM_ALERT); - else if (ACE_OS::strcmp (priority, ACE_TEXT("EMERGENCY")) == 0) + else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("EMERGENCY")) == 0) ACE_SET_BITS (priority_mask, LM_EMERGENCY); - else if (ACE_OS::strcmp (priority, ACE_TEXT("~EMERGENCY")) == 0) + else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~EMERGENCY")) == 0) ACE_CLR_BITS (priority_mask, LM_EMERGENCY); } @@ -81,21 +81,21 @@ ACE_Logging_Strategy::priorities (ACE_TCHAR *priority_string, void ACE_Logging_Strategy::tokenize (ACE_TCHAR *flag_string) { - for (ACE_TCHAR *flag = ACE_OS::strtok (flag_string, ACE_TEXT("|")); + for (ACE_TCHAR *flag = ACE_OS::strtok (flag_string, ACE_LIB_TEXT ("|")); flag != 0; - flag = ACE_OS::strtok (0, ACE_TEXT("|"))) + flag = ACE_OS::strtok (0, ACE_LIB_TEXT ("|"))) { - if (ACE_OS::strcmp (flag, ACE_TEXT("STDERR")) == 0) + if (ACE_OS::strcmp (flag, ACE_LIB_TEXT ("STDERR")) == 0) ACE_SET_BITS (this->flags_, ACE_Log_Msg::STDERR); - else if (ACE_OS::strcmp (flag, ACE_TEXT("LOGGER")) == 0) + else if (ACE_OS::strcmp (flag, ACE_LIB_TEXT ("LOGGER")) == 0) ACE_SET_BITS (this->flags_, ACE_Log_Msg::LOGGER); - else if (ACE_OS::strcmp (flag, ACE_TEXT("OSTREAM")) == 0) + else if (ACE_OS::strcmp (flag, ACE_LIB_TEXT ("OSTREAM")) == 0) ACE_SET_BITS (this->flags_, ACE_Log_Msg::OSTREAM); - else if (ACE_OS::strcmp (flag, ACE_TEXT("VERBOSE")) == 0) + else if (ACE_OS::strcmp (flag, ACE_LIB_TEXT ("VERBOSE")) == 0) ACE_SET_BITS (this->flags_, ACE_Log_Msg::VERBOSE); - else if (ACE_OS::strcmp (flag, ACE_TEXT("VERBOSE_LITE")) == 0) + else if (ACE_OS::strcmp (flag, ACE_LIB_TEXT ("VERBOSE_LITE")) == 0) ACE_SET_BITS (this->flags_, ACE_Log_Msg::VERBOSE_LITE); - else if (ACE_OS::strcmp (flag, ACE_TEXT("SILENT")) == 0) + else if (ACE_OS::strcmp (flag, ACE_LIB_TEXT ("SILENT")) == 0) ACE_SET_BITS (this->flags_, ACE_Log_Msg::SILENT); } } @@ -111,7 +111,7 @@ ACE_Logging_Strategy::parse_args (int argc, ACE_TCHAR *argv[]) this->interval_ = 0; this->max_size_ = ACE_DEFAULT_MAX_LOGFILE_SIZE; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("f:i:m:p:s:t:w"), 0); + ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT ("f:i:m:p:s:t:w"), 0); for (int c; (c = get_opt ()) != -1; ) { @@ -173,14 +173,14 @@ ACE_Logging_Strategy::ACE_Logging_Strategy (void) MAXPATHLEN - 7) == -1) // 7 for "logfile" { ACE_ERROR ((LM_ERROR, - ACE_TEXT("Temporary path too long, ") - ACE_TEXT("defaulting to current directory\n"))); + ACE_LIB_TEXT ("Temporary path too long, ") + ACE_LIB_TEXT ("defaulting to current directory\n"))); this->filename_[0] = 0; } // Add the filename to the end ACE_OS::strcat (this->filename_, - ACE_TEXT("logfile")); + ACE_LIB_TEXT ("logfile")); #endif /* ACE_DEFAULT_LOGFILE */ } @@ -261,7 +261,7 @@ ACE_Logging_Strategy::init (int argc, ACE_TCHAR *argv[]) ACE_Log_Msg::instance ()->set_flags (this->flags_); } - return ACE_LOG_MSG->open (ACE_TEXT("Logging_Strategy"), + return ACE_LOG_MSG->open (ACE_LIB_TEXT ("Logging_Strategy"), ACE_LOG_MSG->flags (), ACE_DEFAULT_LOGGER_KEY); } @@ -275,7 +275,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, // Lock out any other logging. if (ACE_LOG_MSG->acquire ()) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Cannot acquire lock!\n")), + ACE_LIB_TEXT ("Cannot acquire lock!\n")), -1); // Close the current ostream. @@ -289,7 +289,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, ACE_TCHAR backup[MAXPATHLEN+1]; ACE_OS::strcpy (backup, this->filename_); - ACE_OS::strcat (backup, ACE_TEXT(".old")); + ACE_OS::strcat (backup, ACE_LIB_TEXT (".old")); // Remove any existing .old file; ignore error as file may // not exist. @@ -302,7 +302,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, } else ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Backup file name too long; backup logfile not saved.\n"))); + ACE_LIB_TEXT ("Backup file name too long; backup logfile not saved.\n"))); // Open a new log file by the same name output_file->open (ACE_TEXT_ALWAYS_CHAR(this->filename_), ios::out); diff --git a/ace/MEM_Acceptor.cpp b/ace/MEM_Acceptor.cpp index 3812c5a7885..ad93c7dcee9 100644 --- a/ace/MEM_Acceptor.cpp +++ b/ace/MEM_Acceptor.cpp @@ -45,7 +45,7 @@ ACE_MEM_Acceptor::ACE_MEM_Acceptor (const ACE_MEM_Addr &remote_sap, backlog, protocol) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_MEM_Acceptor::ACE_MEM_Acceptor"))); + ACE_LIB_TEXT ("ACE_MEM_Acceptor::ACE_MEM_Acceptor"))); } int @@ -116,7 +116,7 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream, if (this->mmap_prefix_ != 0) { ACE_OS::sprintf (buf, - ACE_TEXT ("%s_%d_"), + ACE_LIB_TEXT ("%s_%d_"), this->mmap_prefix_, local_addr.get_port_number ()); } @@ -127,13 +127,13 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream, if (ACE::get_temp_dir (buf, MAXPATHLEN - 24) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Temporary path too long, ") - ACE_TEXT ("defaulting to current directory\n"))); + ACE_LIB_TEXT ("Temporary path too long, ") + ACE_LIB_TEXT ("defaulting to current directory\n"))); buf[0] = 0; } ACE_OS::sprintf (name, - ACE_TEXT ("MEM_Acceptor_%d_"), + ACE_LIB_TEXT ("MEM_Acceptor_%d_"), local_addr.get_port_number ()); ACE_OS::strcat (buf, name); } diff --git a/ace/MEM_Addr.cpp b/ace/MEM_Addr.cpp index 685eb402428..952834b9d61 100644 --- a/ace/MEM_Addr.cpp +++ b/ace/MEM_Addr.cpp @@ -57,7 +57,7 @@ ACE_MEM_Addr::initialize_local (u_short port_number) return -1; this->external_.set (port_number, name); - this->internal_.set (port_number, ACE_TEXT ("localhost")); + this->internal_.set (port_number, ACE_LIB_TEXT ("localhost")); return 0; } diff --git a/ace/MEM_Connector.cpp b/ace/MEM_Connector.cpp index 9c6ca6ed918..11472186492 100644 --- a/ace/MEM_Connector.cpp +++ b/ace/MEM_Connector.cpp @@ -17,7 +17,7 @@ ACE_MEM_Connector::dump (void) const ACE_TRACE ("ACE_MEM_Connector::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -63,8 +63,8 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream, if (!this->address_.same_host (remote_sap)) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) MEM_Connector can't connect ") - ACE_TEXT ("to %s:%d which is not a local endpoint"), + ACE_LIB_TEXT ("(%P|%t) MEM_Connector can't connect ") + ACE_LIB_TEXT ("to %s:%d which is not a local endpoint"), remote_sap.get_host_name (), remote_sap.get_port_number ()), -1); diff --git a/ace/MEM_SAP.cpp b/ace/MEM_SAP.cpp index bbb9a1849b4..95b88d8f444 100644 --- a/ace/MEM_SAP.cpp +++ b/ace/MEM_SAP.cpp @@ -19,7 +19,7 @@ ACE_MEM_SAP::dump (void) const if (this->shm_malloc_ != 0) this->shm_malloc_->dump (); else - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_MEM_SAP uninitialized.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_MEM_SAP uninitialized.\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp index 0b71a8b8f36..1069bc318d4 100644 --- a/ace/Malloc.cpp +++ b/ace/Malloc.cpp @@ -28,8 +28,8 @@ ACE_Control_Block::ACE_Malloc_Header::dump (void) const ACE_TRACE ("ACE_Malloc_Header::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_block = %x"), (ACE_Malloc_Header *) this->next_block_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize = %d\n"), this->size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_block = %x"), (ACE_Malloc_Header *) this->next_block_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsize = %d\n"), this->size_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -37,20 +37,20 @@ void ACE_Control_Block::print_alignment_info (void) { ACE_TRACE ("ACE_Control_Block::print_alignment_info"); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Start ---> ACE_Control_Block::print_alignment_info:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Start ---> ACE_Control_Block::print_alignment_info:\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Sizeof ptr: %d\n") - ACE_TEXT ("Sizeof size_t: %d\n") - ACE_TEXT ("Sizeof long: %d\n") - ACE_TEXT ("Sizeof double: %d\n") - ACE_TEXT ("Sizeof ACE_MALLOC_ALIGN: %d\n") - ACE_TEXT ("sizeof ACE_MALLOC_PADDING: %d\n") - ACE_TEXT ("Sizeof ACE_MALLOC_HEADER_SIZE: %d\n") - ACE_TEXT ("Sizeof ACE_MALLOC_PADDING_SIZE: %d\n") - ACE_TEXT ("Sizeof ACE_CONTROL_BLOCK_SIZE: %d\n") - ACE_TEXT ("Sizeof ACE_CONTROL_BLOCK_ALIGN_LONGS: %d\n") - ACE_TEXT ("Sizeof (MALLOC_HEADER): %d\n") - ACE_TEXT ("Sizeof (CONTROL_BLOCK): %d\n"), + ACE_LIB_TEXT ("Sizeof ptr: %d\n") + ACE_LIB_TEXT ("Sizeof size_t: %d\n") + ACE_LIB_TEXT ("Sizeof long: %d\n") + ACE_LIB_TEXT ("Sizeof double: %d\n") + ACE_LIB_TEXT ("Sizeof ACE_MALLOC_ALIGN: %d\n") + ACE_LIB_TEXT ("sizeof ACE_MALLOC_PADDING: %d\n") + ACE_LIB_TEXT ("Sizeof ACE_MALLOC_HEADER_SIZE: %d\n") + ACE_LIB_TEXT ("Sizeof ACE_MALLOC_PADDING_SIZE: %d\n") + ACE_LIB_TEXT ("Sizeof ACE_CONTROL_BLOCK_SIZE: %d\n") + ACE_LIB_TEXT ("Sizeof ACE_CONTROL_BLOCK_ALIGN_LONGS: %d\n") + ACE_LIB_TEXT ("Sizeof (MALLOC_HEADER): %d\n") + ACE_LIB_TEXT ("Sizeof (CONTROL_BLOCK): %d\n"), sizeof (char *), sizeof (size_t), sizeof (long), @@ -64,7 +64,7 @@ ACE_Control_Block::print_alignment_info (void) sizeof (ACE_Malloc_Header), sizeof (ACE_Control_Block) )); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("End <--- ACE_Control_Block::print_alignment_info:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("End <--- ACE_Control_Block::print_alignment_info:\n"))); } void @@ -73,22 +73,22 @@ ACE_Control_Block::dump (void) const ACE_TRACE ("ACE_Control_Block::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Name Node:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Name Node:\n"))); for (ACE_Name_Node *nextn = this->name_head_; nextn != 0; nextn = nextn->next_) nextn->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("freep_ = %x"), (ACE_Malloc_Header *) this->freep_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("freep_ = %x"), (ACE_Malloc_Header *) this->freep_)); this->base_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nMalloc Header:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nMalloc Header:\n"))); for (ACE_Malloc_Header *nexth = ((ACE_Malloc_Header *)this->freep_)->next_block_; nexth != 0 && nexth != &this->base_; nexth = nexth->next_block_) nexth->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -148,13 +148,13 @@ ACE_Control_Block::ACE_Name_Node::dump (void) const ACE_TRACE ("ACE_Name_Node"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("pointer = %x"), (const char *) this->pointer_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nnext_ = %x"), (ACE_Name_Node *) this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("pointer = %x"), (const char *) this->pointer_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_ = %x"), (ACE_Name_Node *) this->next_)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("\nname_ = (%x, %s)"), + ACE_LIB_TEXT ("\nname_ = (%x, %s)"), (const char *) this->name_, (const char *) this->name_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -165,8 +165,8 @@ ACE_PI_Control_Block::ACE_Malloc_Header::dump (void) const ACE_TRACE ("ACE_Malloc_Header::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_block = %x"), (ACE_Malloc_Header *) this->next_block_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize = %d\n"), this->size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_block = %x"), (ACE_Malloc_Header *) this->next_block_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsize = %d\n"), this->size_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -174,20 +174,20 @@ void ACE_PI_Control_Block::print_alignment_info (void) { ACE_TRACE ("ACE_Control_Block::print_alignment_info"); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Start ---> ACE_PI_Control_Block::print_alignment_info:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Start ---> ACE_PI_Control_Block::print_alignment_info:\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Sizeof ptr: %d\n") - ACE_TEXT ("Sizeof size_t: %d\n") - ACE_TEXT ("Sizeof long: %d\n") - ACE_TEXT ("Sizeof double: %d\n") - ACE_TEXT ("Sizeof ACE_MALLOC_ALIGN: %d\n") - ACE_TEXT ("sizeof ACE_MALLOC_PADDING: %d\n") - ACE_TEXT ("Sizeof ACE_MALLOC_HEADER_SIZE: %d\n") - ACE_TEXT ("Sizeof ACE_PI_MALLOC_PADDING_SIZE: %d\n") - ACE_TEXT ("Sizeof ACE_PI_CONTROL_BLOCK_SIZE: %d\n") - ACE_TEXT ("Sizeof ACE_PI_CONTROL_BLOCK_ALIGN_LONGS: %d\n") - ACE_TEXT ("Sizeof (MALLOC_HEADER): %d\n") - ACE_TEXT ("Sizeof (CONTROL_BLOCK): %d\n"), + ACE_LIB_TEXT ("Sizeof ptr: %d\n") + ACE_LIB_TEXT ("Sizeof size_t: %d\n") + ACE_LIB_TEXT ("Sizeof long: %d\n") + ACE_LIB_TEXT ("Sizeof double: %d\n") + ACE_LIB_TEXT ("Sizeof ACE_MALLOC_ALIGN: %d\n") + ACE_LIB_TEXT ("sizeof ACE_MALLOC_PADDING: %d\n") + ACE_LIB_TEXT ("Sizeof ACE_MALLOC_HEADER_SIZE: %d\n") + ACE_LIB_TEXT ("Sizeof ACE_PI_MALLOC_PADDING_SIZE: %d\n") + ACE_LIB_TEXT ("Sizeof ACE_PI_CONTROL_BLOCK_SIZE: %d\n") + ACE_LIB_TEXT ("Sizeof ACE_PI_CONTROL_BLOCK_ALIGN_LONGS: %d\n") + ACE_LIB_TEXT ("Sizeof (MALLOC_HEADER): %d\n") + ACE_LIB_TEXT ("Sizeof (CONTROL_BLOCK): %d\n"), sizeof (char *), sizeof (size_t), sizeof (long), @@ -201,7 +201,7 @@ ACE_PI_Control_Block::print_alignment_info (void) sizeof (ACE_Malloc_Header), sizeof (ACE_PI_Control_Block) )); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("End <--- ACE_PI_Control_Block::print_alignment_info:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("End <--- ACE_PI_Control_Block::print_alignment_info:\n"))); } void @@ -210,22 +210,22 @@ ACE_PI_Control_Block::dump (void) const ACE_TRACE ("ACE_Control_Block::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Name Node:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Name Node:\n"))); for (ACE_Name_Node *nextn = this->name_head_; nextn != 0; nextn = nextn->next_) nextn->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("freep_ = %x"), (ACE_Malloc_Header *) this->freep_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("freep_ = %x"), (ACE_Malloc_Header *) this->freep_)); this->base_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nMalloc Header:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nMalloc Header:\n"))); for (ACE_Malloc_Header *nexth = ((ACE_Malloc_Header *)this->freep_)->next_block_; nexth != 0 && nexth != &this->base_; nexth = nexth->next_block_) nexth->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -281,13 +281,13 @@ ACE_PI_Control_Block::ACE_Name_Node::dump (void) const ACE_TRACE ("ACE_Name_Node"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("pointer = %x"), (const char *) this->pointer_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nnext_ = %x"), (ACE_Name_Node *) this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("pointer = %x"), (const char *) this->pointer_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_ = %x"), (ACE_Name_Node *) this->next_)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("\nname_ = (%x, %s)"), + ACE_LIB_TEXT ("\nname_ = (%x, %s)"), (const char *) this->name_, (const char *) this->name_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ @@ -398,10 +398,10 @@ ACE_Static_Allocator_Base::dump (void) const ACE_TRACE ("ACE_Static_Base_Allocator::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\noffset_ = %d"), this->offset_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize_ = %d\n"), this->size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\noffset_ = %d"), this->offset_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsize_ = %d\n"), this->size_)); ACE_HEX_DUMP ((LM_DEBUG, this->buffer_, this->size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -425,10 +425,10 @@ ACE_Malloc_Stats::dump (void) const int ninuse = this->ninuse_.value (); int nchunks = this->nchunks_.value (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("nblocks = %d"), nblocks)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nninuse = %d"), ninuse)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nnchunks = %d"), nchunks)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("nblocks = %d"), nblocks)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nninuse = %d"), ninuse)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnchunks = %d"), nchunks)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp index 1c245f7d407..27102d4e60f 100644 --- a/ace/Malloc_T.cpp +++ b/ace/Malloc_T.cpp @@ -58,12 +58,21 @@ ACE_Allocator_Adapter<MALLOC>::protect (void *addr, size_t len, int flags) } template <class MALLOC> -ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (const ACE_TCHAR *pool_name) - : allocator_ (pool_name) +ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (const char *pool_name) + : allocator_ (ACE_TEXT_CHAR_TO_TCHAR (pool_name)) { ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter"); } +#if defined (ACE_HAS_WCHAR) +template <class MALLOC> +ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (const wchar_t *pool_name) + : allocator_ (ACE_TEXT_WCHAR_TO_TCHAR (pool_name)) +{ + ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter"); +} +#endif /* ACE_HAS_WCHAR */ + template <class MALLOC> ACE_Allocator_Adapter<MALLOC>::~ACE_Allocator_Adapter (void) { @@ -93,8 +102,8 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->memory_pool_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("cb_ptr_ = %x"), this->cb_ptr_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("cb_ptr_ = %x"), this->cb_ptr_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); this->cb_ptr_->dump (); #if defined (ACE_HAS_MALLOC_STATS) if (this->cb_ptr_ != 0) @@ -115,14 +124,14 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::print_stats (void) const return; this->cb_ptr_->malloc_stats_.dump (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) contents of freelist:\n"))); + ACE_LIB_TEXT ("(%P|%t) contents of freelist:\n"))); for (MALLOC_HEADER *currp = this->cb_ptr_->freep_->next_block_; ; currp = currp->next_block_) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) ptr = %u, MALLOC_HEADER units = %d, byte units = %d\n"), + ACE_LIB_TEXT ("(%P|%t) ptr = %u, MALLOC_HEADER units = %d, byte units = %d\n"), currp, currp->size_, currp->size_ * sizeof (MALLOC_HEADER))); @@ -165,12 +174,12 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::open (void) first_time); if (this->cb_ptr_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("init_acquire failed")), + ACE_LIB_TEXT ("(%P|%t) %p\n"), + ACE_LIB_TEXT ("init_acquire failed")), -1); else if (first_time) { - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) first time in, control block = %u\n"), this->cb_ptr_)); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) first time in, control block = %u\n"), this->cb_ptr_)); MALLOC_HEADER::init_ptr (&this->cb_ptr_->freep_, &this->cb_ptr_->base_, @@ -231,8 +240,8 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"); if (this->open () == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); } template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> @@ -246,8 +255,8 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"); if (this->open () == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p"), - ACE_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); + ACE_LIB_TEXT ("%p"), + ACE_LIB_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); } #if !defined (ACE_HAS_TEMPLATE_TYPEDEFS) @@ -262,8 +271,8 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"); if (this->open () == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p"), - ACE_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); + ACE_LIB_TEXT ("%p"), + ACE_LIB_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); } #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ @@ -280,7 +289,7 @@ template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove (void) { ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove"); - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) destroying ACE_Malloc_T\n"))); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) destroying ACE_Malloc_T\n"))); int result = 0; #if defined (ACE_HAS_MALLOC_STATS) @@ -398,8 +407,8 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_malloc (size_t nbytes) // wchar before printing out. The compiler will complain // about this since a destructor would present in a SEH block //ACE_ERROR_RETURN ((LM_ERROR, - // ACE_TEXT ("(%P|%t) %p\n"), - // ACE_TEXT ("malloc")), + // ACE_LIB_TEXT ("(%P|%t) %p\n"), + // ACE_LIB_TEXT ("malloc")), // 0); } prevp = currp; @@ -708,8 +717,8 @@ ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->curr_->dump (); this->guard_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %s"), this->name_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("name_ = %s"), this->name_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -801,8 +810,8 @@ ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->curr_->dump (); this->guard_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %s"), this->name_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("name_ = %s"), this->name_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h index ec4792c09cd..19b903771ef 100644 --- a/ace/Malloc_T.h +++ b/ace/Malloc_T.h @@ -113,17 +113,34 @@ public: #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ // = Initialization. - ACE_Allocator_Adapter (const ACE_TCHAR *pool_name = 0); + ACE_Allocator_Adapter (const char *pool_name = 0); - ACE_Allocator_Adapter (const ACE_TCHAR *pool_name, - const ACE_TCHAR *lock_name, + ACE_Allocator_Adapter (const char *pool_name, + const char *lock_name, MEMORY_POOL_OPTIONS options = 0) - : allocator_ (pool_name, lock_name, options) + : allocator_ (ACE_TEXT_CHAR_TO_TCHAR (pool_name), + ACE_TEXT_CHAR_TO_TCHAR (lock_name), + options) { ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter"); } // Constructor (this has to be inline to avoid bugs with some C++ compilers. +#if defined (ACE_HAS_WCHAR) + ACE_Allocator_Adapter (const wchar_t *pool_name); + + ACE_Allocator_Adapter (const wchar_t *pool_name, + const wchar_t *lock_name, + MEMORY_POOL_OPTIONS options = 0) + : allocator_ (ACE_TEXT_WCHAR_TO_TCHAR (pool_name), + ACE_TEXT_WCHAR_TO_TCHAR (lock_name), + options) + { + ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter"); + } + // Constructor (this has to be inline to avoid bugs with some C++ compilers. +#endif /* ACE_HAS_WCHAR */ + virtual ~ACE_Allocator_Adapter (void); // Destructor. diff --git a/ace/Map_Manager.cpp b/ace/Map_Manager.cpp index 63cd4983b28..b4c095162dc 100644 --- a/ace/Map_Manager.cpp +++ b/ace/Map_Manager.cpp @@ -554,11 +554,11 @@ template <class EXT_ID, class INT_ID> void ACE_Map_Entry<EXT_ID, INT_ID>::dump (void) const { ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %d"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("prev_ = %d"), this->prev_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("next_ = %d"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("prev_ = %d"), this->prev_)); #if defined (ACE_HAS_LAZY_MAP_MANAGER) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("free_ = %d"), this->free_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("free_ = %d"), this->free_)); #endif /* ACE_HAS_LAZY_MAP_MANAGER */ ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -568,8 +568,8 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> void ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const { ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("total_size_ = %d"), this->total_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("total_size_ = %d"), this->total_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_size_ = %d"), this->cur_size_)); this->allocator_->dump (); this->lock_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -579,7 +579,7 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> void ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const { ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %d"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("next_ = %d"), this->next_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Map_Manager.i b/ace/Map_Manager.i index 64eaca8af96..31a8372ecc9 100644 --- a/ace/Map_Manager.i +++ b/ace/Map_Manager.i @@ -42,7 +42,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Manager (size_t size, cur_size_ (0) { if (this->open (size, alloc) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Map_Manager\n"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_Map_Manager\n"))); } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE @@ -53,7 +53,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Manager (ACE_Allocator *alloc cur_size_ (0) { if (this->open (ACE_DEFAULT_MAP_SIZE, alloc) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Map_Manager\n"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_Map_Manager\n"))); } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int diff --git a/ace/Mem_Map.cpp b/ace/Mem_Map.cpp index 3082fcc9b45..e3843b5de45 100644 --- a/ace/Mem_Map.cpp +++ b/ace/Mem_Map.cpp @@ -19,12 +19,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, ACE_TEXT ("base_addr_ = %x"), this->base_addr_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nfilename_ = %s"), this->filename_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nlength_ = %d"), this->length_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandle_ = %d"), this->handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nfile_mapping_ = %d"), this->file_mapping_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nclose_handle_ = %d"), this->close_handle_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base_addr_ = %x"), this->base_addr_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nfilename_ = %s"), this->filename_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nlength_ = %d"), this->length_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhandle_ = %d"), this->handle_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nfile_mapping_ = %d"), this->file_mapping_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nclose_handle_ = %d"), this->close_handle_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -264,8 +264,8 @@ ACE_Mem_Map::ACE_Mem_Map (const ACE_TCHAR *file_name, offset, sa) < 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Mem_Map::ACE_Mem_Map"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Mem_Map::ACE_Mem_Map"))); } // Map a file from an open file descriptor HANDLE. This function will @@ -297,8 +297,8 @@ ACE_Mem_Map::ACE_Mem_Map (ACE_HANDLE handle, offset, sa) < 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Mem_Map::ACE_Mem_Map"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_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 fd1a8270ea7..9ea71f3e1f9 100644 --- a/ace/Memory_Pool.cpp +++ b/ace/Memory_Pool.cpp @@ -47,7 +47,7 @@ ACE_Local_Memory_Pool::acquire (size_t nbytes, if (this->allocated_chunks_.insert (cp.get ()) != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) insertion into set failed\n")), + ACE_LIB_TEXT ("(%P|%t) insertion into set failed\n")), 0); return cp.release (); @@ -203,14 +203,14 @@ ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool (const ACE_TCHAR *backing_store_name, MAXPATHLEN - 17) == -1) // -17 for ace-malloc-XXXXXX { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Temporary path too long, ") - ACE_TEXT ("defaulting to current directory\n"))); + ACE_LIB_TEXT ("Temporary path too long, ") + ACE_LIB_TEXT ("defaulting to current directory\n"))); this->backing_store_name_[0] = 0; } // Add the filename to the end ACE_OS::strcat (this->backing_store_name_, - ACE_TEXT ("ace-malloc-XXXXXX")); + ACE_LIB_TEXT ("ace-malloc-XXXXXX")); #endif /* ACE_DEFAULT_BACKING_STORE */ } @@ -264,7 +264,7 @@ ACE_MMAP_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, "", 1) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), + ACE_LIB_TEXT ("(%P|%t) %p\n"), this->backing_store_name_), -1); } @@ -296,7 +296,7 @@ ACE_MMAP_Memory_Pool::map_file (off_t map_size) { #if 0 ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) addr = %u, base_addr = %u, map_size = %u, %p\n"), + ACE_LIB_TEXT ("(%P|%t) addr = %u, base_addr = %u, map_size = %u, %p\n"), this->mmap_.addr (), this->base_addr_, map_size, @@ -384,16 +384,16 @@ ACE_MMAP_Memory_Pool::init_acquire (size_t nbytes, 0, this->sa_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("open")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("open")), 0); return this->mmap_.addr (); } else ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("open")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("open")), 0); } @@ -420,7 +420,7 @@ int ACE_MMAP_Memory_Pool::remap (void *addr) { ACE_TRACE ("ACE_MMAP_Memory_Pool::remap"); - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Remapping with fault address at: %X\n"), addr)); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Remapping with fault address at: %X\n"), addr)); off_t current_map_size = ACE_OS::filesize (this->mmap_.handle ()); // ACE_OS::lseek (this->mmap_.handle (), 0, SEEK_END); @@ -471,9 +471,9 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t if (signum != SIGSEGV) return -1; else - ; // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) received %S\n"), signum)); + ; // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) received %S\n"), signum)); - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) new mapping address = %u\n"), (char *) this->base_addr_ + current_map_size)); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) new mapping address = %u\n"), (char *) this->base_addr_ + current_map_size)); #if defined (ACE_HAS_SIGINFO_T) && !defined (ACE_LACKS_SI_ADDR) // Make sure that the pointer causing the problem is within the @@ -481,7 +481,7 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t if (siginfo != 0) { - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_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) return -1; // ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) address %u out of range\n", @@ -553,7 +553,7 @@ 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, ACE_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_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) @@ -562,7 +562,7 @@ ACE_Sbrk_Memory_Pool::acquire (size_t nbytes, cp), 0); else - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d, new break = %u\n"), nbytes, rounded_bytes, cp)); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d, new break = %u\n"), nbytes, rounded_bytes, cp)); return cp; } @@ -622,11 +622,11 @@ ACE_Shared_Memory_Pool::in_use (off_t &offset, { if (ACE_OS::shmctl (st[counter].shmid_, IPC_STAT, &buf) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("shmctl")), + ACE_LIB_TEXT ("(%P|%t) %p\n"), + ACE_LIB_TEXT ("shmctl")), -1); offset += buf.shm_segsz; - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); } return 0; @@ -649,8 +649,8 @@ ACE_Shared_Memory_Pool::find_seg (const void* const searchPtr, { if (ACE_OS::shmctl (st[counter].shmid_, IPC_STAT, &buf) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("shmctl")), + ACE_LIB_TEXT ("(%P|%t) %p\n"), + ACE_LIB_TEXT ("shmctl")), -1); offset += buf.shm_segsz; @@ -663,7 +663,7 @@ ACE_Shared_Memory_Pool::find_seg (const void* const searchPtr, offset -= buf.shm_segsz; return 0; } - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); } return 0; @@ -696,8 +696,8 @@ ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, this->file_perms_ | IPC_CREAT | IPC_EXCL); if (shmid == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("shmget")), + ACE_LIB_TEXT ("(%P|%t) %p\n"), + ACE_LIB_TEXT ("shmget")), 0); st[counter].shmid_ = shmid; st[counter].used_ = 1; @@ -724,7 +724,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, ACE_TEXT ("signal %S occurred\n"), signum)); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("signal %S occurred\n"), signum)); #if defined (ACE_HAS_SIGINFO_T) && !defined (ACE_LACKS_SI_ADDR) off_t offset; @@ -733,12 +733,12 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) if (siginfo != 0) { - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_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, - ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("in_use"))); + ACE_LIB_TEXT ("(%P|%t) %p\n"), + ACE_LIB_TEXT ("in_use"))); #if !defined(_UNICOS) else if (!(siginfo->si_code == SEGV_MAPERR && siginfo->si_addr < (((char *) this->base_addr_) + offset) @@ -771,8 +771,8 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) if (this->find_seg ((const void *)siginfo->si_addr, offset, counter) == -1) #endif /* ! _UNICOS */ ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("in_use")), + ACE_LIB_TEXT ("(%P|%t) %p\n"), + ACE_LIB_TEXT ("in_use")), -1); void *address = (void *) (((char *) this->base_addr_) + offset); @@ -847,8 +847,8 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool (const ACE_TCHAR *backing_store_n if (this->signal_handler_.register_handler (SIGSEGV, this) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Sig_Handler::register_handler"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Sig_Handler::register_handler"))); } // Ask system for more shared memory. @@ -861,14 +861,14 @@ ACE_Shared_Memory_Pool::acquire (size_t nbytes, rounded_bytes = this->round_up (nbytes); - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_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, ACE_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); return ((char *) this->base_addr_) + offset; } @@ -896,8 +896,8 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes, { if (errno != EEXIST) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("shmget")), + ACE_LIB_TEXT ("(%P|%t) %p\n"), + ACE_LIB_TEXT ("shmget")), 0); first_time = 0; @@ -905,8 +905,8 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes, if (shmid == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("shmget")), + ACE_LIB_TEXT ("(%P|%t) %p\n"), + ACE_LIB_TEXT ("shmget")), 0); // This implementation doesn't care if we don't get the key we diff --git a/ace/Message_Block.cpp b/ace/Message_Block.cpp index a26e910e344..ce9ae206bb0 100644 --- a/ace/Message_Block.cpp +++ b/ace/Message_Block.cpp @@ -128,15 +128,15 @@ ACE_Data_Block::dump (void) const ACE_TRACE ("ACE_Data_Block::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("-----( Data Block )-----\n") - ACE_TEXT ("type_ = %d\n") - ACE_TEXT ("cur_size_ = %u\n") - ACE_TEXT ("max_size_ = %u\n") - ACE_TEXT ("flags_ = %u\n") - ACE_TEXT ("base_ = %u\n") - ACE_TEXT ("locking_strategy_ = %u\n") - ACE_TEXT ("reference_count_ = %u\n") - ACE_TEXT ("---------------------------\n"), + ACE_LIB_TEXT ("-----( Data Block )-----\n") + ACE_LIB_TEXT ("type_ = %d\n") + ACE_LIB_TEXT ("cur_size_ = %u\n") + ACE_LIB_TEXT ("max_size_ = %u\n") + ACE_LIB_TEXT ("flags_ = %u\n") + ACE_LIB_TEXT ("base_ = %u\n") + ACE_LIB_TEXT ("locking_strategy_ = %u\n") + ACE_LIB_TEXT ("reference_count_ = %u\n") + ACE_LIB_TEXT ("---------------------------\n"), this->type_, this->cur_size_, this->max_size_, @@ -154,14 +154,14 @@ ACE_Message_Block::dump (void) const ACE_TRACE ("ACE_Message_Block::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("-----( Message Block )-----\n") - ACE_TEXT ("priority_ = %d\n") - ACE_TEXT ("next_ = %u\n") - ACE_TEXT ("prev_ = %u\n") - ACE_TEXT ("cont_ = %u\n") - ACE_TEXT ("rd_ptr_ = %u\n") - ACE_TEXT ("wr_ptr_ = %u\n") - ACE_TEXT ("---------------------------\n"), + ACE_LIB_TEXT ("-----( Message Block )-----\n") + ACE_LIB_TEXT ("priority_ = %d\n") + ACE_LIB_TEXT ("next_ = %u\n") + ACE_LIB_TEXT ("prev_ = %u\n") + ACE_LIB_TEXT ("cont_ = %u\n") + ACE_LIB_TEXT ("rd_ptr_ = %u\n") + ACE_LIB_TEXT ("wr_ptr_ = %u\n") + ACE_LIB_TEXT ("---------------------------\n"), this->priority_, this->next_, this->prev_, @@ -339,7 +339,7 @@ ACE_Message_Block::ACE_Message_Block (const char *data, 0, // data_block allocator 0) == -1) // message_block allocator ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_Message_Block"))); + ACE_LIB_TEXT ("ACE_Message_Block"))); } ACE_Message_Block::ACE_Message_Block (ACE_Allocator *message_block_allocator) @@ -361,7 +361,7 @@ ACE_Message_Block::ACE_Message_Block (ACE_Allocator *message_block_allocator) 0, // data_block allocator message_block_allocator) == -1) // message_block allocator ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_Message_Block"))); + ACE_LIB_TEXT ("ACE_Message_Block"))); } ACE_Message_Block::ACE_Message_Block (size_t size, @@ -393,7 +393,7 @@ ACE_Message_Block::ACE_Message_Block (size_t size, data_block_allocator, message_block_allocator) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_Message_Block"))); + ACE_LIB_TEXT ("ACE_Message_Block"))); } int @@ -479,7 +479,7 @@ ACE_Message_Block::ACE_Message_Block (size_t size, data_block_allocator, message_block_allocator) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_Message_Block"))); + ACE_LIB_TEXT ("ACE_Message_Block"))); } ACE_Message_Block::ACE_Message_Block (ACE_Data_Block *data_block, @@ -502,7 +502,7 @@ ACE_Message_Block::ACE_Message_Block (ACE_Data_Block *data_block, data_block->data_block_allocator (), message_block_allocator) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_Message_Block"))); + ACE_LIB_TEXT ("ACE_Message_Block"))); } int @@ -1084,13 +1084,13 @@ ACE_Dynamic_Message_Strategy::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("static_bit_field_mask_ = %u\n") - ACE_TEXT ("static_bit_field_shift_ = %u\n") - ACE_TEXT ("dynamic_priority_max_ = %u\n") - ACE_TEXT ("dynamic_priority_offset_ = %u\n") - ACE_TEXT ("max_late_ = [%d sec, %d usec]\n") - ACE_TEXT ("min_pending_ = [%d sec, %d usec]\n") - ACE_TEXT ("pending_shift_ = [%d sec, %d usec]\n"), + ACE_LIB_TEXT ("static_bit_field_mask_ = %u\n") + ACE_LIB_TEXT ("static_bit_field_shift_ = %u\n") + ACE_LIB_TEXT ("dynamic_priority_max_ = %u\n") + ACE_LIB_TEXT ("dynamic_priority_offset_ = %u\n") + ACE_LIB_TEXT ("max_late_ = [%d sec, %d usec]\n") + ACE_LIB_TEXT ("min_pending_ = [%d sec, %d usec]\n") + ACE_LIB_TEXT ("pending_shift_ = [%d sec, %d usec]\n"), this->static_bit_field_mask_, this->static_bit_field_shift_, this->dynamic_priority_max_, @@ -1127,10 +1127,10 @@ ACE_Deadline_Message_Strategy::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Dynamic_Message_Strategy base class: \n"))); this->ACE_Dynamic_Message_Strategy::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nderived class: ACE_Deadline_Message_Strategy\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nderived class: ACE_Deadline_Message_Strategy\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -1157,10 +1157,10 @@ ACE_Laxity_Message_Strategy::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Dynamic_Message_Strategy base class: \n"))); this->ACE_Dynamic_Message_Strategy::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nderived class: ACE_Laxity_Message_Strategy\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nderived class: ACE_Laxity_Message_Strategy\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Message_Queue.cpp b/ace/Message_Queue.cpp index 95897147a25..bd4189d2f3c 100644 --- a/ace/Message_Queue.cpp +++ b/ace/Message_Queue.cpp @@ -23,14 +23,14 @@ ACE_Message_Queue_Vx::dump (void) const ACE_TRACE ("ACE_Message_Queue_Vx::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("deactivated = %d\n") - ACE_TEXT ("low_water_mark = %d\n") - ACE_TEXT ("high_water_mark = %d\n") - ACE_TEXT ("cur_bytes = %d\n") - ACE_TEXT ("cur_length = %d\n") - ACE_TEXT ("cur_count = %d\n") - ACE_TEXT ("head_ = %u\n") - ACE_TEXT ("MSG_Q_ID = %u\n"), + ACE_LIB_TEXT ("deactivated = %d\n") + ACE_LIB_TEXT ("low_water_mark = %d\n") + ACE_LIB_TEXT ("high_water_mark = %d\n") + ACE_LIB_TEXT ("cur_bytes = %d\n") + ACE_LIB_TEXT ("cur_length = %d\n") + ACE_LIB_TEXT ("cur_count = %d\n") + ACE_LIB_TEXT ("head_ = %u\n") + ACE_LIB_TEXT ("MSG_Q_ID = %u\n"), this->deactivated_, this->low_water_mark_, this->high_water_mark_, @@ -52,7 +52,7 @@ ACE_Message_Queue_Vx::ACE_Message_Queue_Vx (size_t max_messages, ACE_TRACE ("ACE_Message_Queue_Vx::ACE_Message_Queue_Vx"); if (this->open (max_messages_, max_message_length_, ns) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("open"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("open"))); } ACE_Message_Queue_Vx::~ACE_Message_Queue_Vx (void) @@ -60,7 +60,7 @@ ACE_Message_Queue_Vx::~ACE_Message_Queue_Vx (void) ACE_TRACE ("ACE_Message_Queue_Vx::~ACE_Message_Queue_Vx"); if (this->tail_ != 0 && this->close () == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("close"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("close"))); } // Don't bother locking since if someone calls this function more than @@ -420,13 +420,13 @@ ACE_Message_Queue_NT::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("deactivated = %d\n") - ACE_TEXT ("max_cthrs_ = %d\n") - ACE_TEXT ("cur_thrs_ = %d\n") - ACE_TEXT ("cur_bytes = %d\n") - ACE_TEXT ("cur_length = %d\n") - ACE_TEXT ("cur_count = %d\n") - ACE_TEXT ("completion_port_ = %x\n"), + ACE_LIB_TEXT ("deactivated = %d\n") + ACE_LIB_TEXT ("max_cthrs_ = %d\n") + ACE_LIB_TEXT ("cur_thrs_ = %d\n") + ACE_LIB_TEXT ("cur_bytes = %d\n") + ACE_LIB_TEXT ("cur_length = %d\n") + ACE_LIB_TEXT ("cur_count = %d\n") + ACE_LIB_TEXT ("completion_port_ = %x\n"), this->deactivated_, this->max_cthrs_, this->cur_thrs_, diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp index 0aa4cd749b3..f61670e90a5 100644 --- a/ace/Message_Queue_T.cpp +++ b/ace/Message_Queue_T.cpp @@ -119,14 +119,14 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dump (void) const ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("deactivated = %d\n") - ACE_TEXT ("low_water_mark = %d\n") - ACE_TEXT ("high_water_mark = %d\n") - ACE_TEXT ("cur_bytes = %d\n") - ACE_TEXT ("cur_length = %d\n") - ACE_TEXT ("cur_count = %d\n") - ACE_TEXT ("head_ = %u\n") - ACE_TEXT ("tail_ = %u\n"), + ACE_LIB_TEXT ("deactivated = %d\n") + ACE_LIB_TEXT ("low_water_mark = %d\n") + ACE_LIB_TEXT ("high_water_mark = %d\n") + ACE_LIB_TEXT ("cur_bytes = %d\n") + ACE_LIB_TEXT ("cur_length = %d\n") + ACE_LIB_TEXT ("cur_count = %d\n") + ACE_LIB_TEXT ("head_ = %u\n") + ACE_LIB_TEXT ("tail_ = %u\n"), this->deactivated_, this->low_water_mark_, this->high_water_mark_, @@ -135,9 +135,9 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dump (void) const this->cur_count_, this->head_, this->tail_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("not_full_cond: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("not_full_cond: \n"))); not_full_cond_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("not_empty_cond: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("not_empty_cond: \n"))); not_empty_cond_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -178,7 +178,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::ACE_Message_Queue (size_t hwm, if (this->open (hwm, lwm, ns) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("open"))); + ACE_LIB_TEXT ("open"))); } template <ACE_SYNCH_DECL> @@ -187,7 +187,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::~ACE_Message_Queue (void) ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::~ACE_Message_Queue"); if (this->head_ != 0 && this->close () == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("close"))); + ACE_LIB_TEXT ("close"))); } // Don't bother locking since if someone calls this function more than @@ -452,7 +452,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_head_i (ACE_Message_Block *&first_item { if (this->head_ ==0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Attempting to dequeue from empty queue")), + ACE_LIB_TEXT ("Attempting to dequeue from empty queue")), -1); ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_head_i"); first_item = this->head_; @@ -938,16 +938,16 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dump (void) const ACE_TRACE ("ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Message_Queue<ACE_SYNCH_USE> (base class): \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Message_Queue<ACE_SYNCH_USE> (base class): \n"))); this->ACE_Message_Queue<ACE_SYNCH_USE>::dump (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("pending_head_ = %u\n") - ACE_TEXT ("pending_tail_ = %u\n") - ACE_TEXT ("late_head_ = %u\n") - ACE_TEXT ("late_tail_ = %u\n") - ACE_TEXT ("beyond_late_head_ = %u\n") - ACE_TEXT ("beyond_late_tail_ = %u\n"), + ACE_LIB_TEXT ("pending_head_ = %u\n") + ACE_LIB_TEXT ("pending_tail_ = %u\n") + ACE_LIB_TEXT ("late_head_ = %u\n") + ACE_LIB_TEXT ("late_tail_ = %u\n") + ACE_LIB_TEXT ("beyond_late_head_ = %u\n") + ACE_LIB_TEXT ("beyond_late_tail_ = %u\n"), this->pending_head_, this->pending_tail_, this->late_head_, @@ -955,7 +955,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dump (void) const this->beyond_late_head_, this->beyond_late_tail_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("message_strategy_ : \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("message_strategy_ : \n"))); message_strategy_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -1353,7 +1353,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::refresh_pending_queue (const ACE_Time_ { // if we got here, something is *seriously* wrong with the queue ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Unexpected message priority status [%d] (expected LATE)"), + ACE_LIB_TEXT ("Unexpected message priority status [%d] (expected LATE)"), (int) current_status), -1); } @@ -1395,7 +1395,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::refresh_pending_queue (const ACE_Time_ if (current_status != ACE_Dynamic_Message_Strategy::PENDING) // if we got here, something is *seriously* wrong with the queue ACE_ERROR_RETURN((LM_ERROR, - ACE_TEXT ("Unexpected message priority status [%d] (expected PENDING)"), + ACE_LIB_TEXT ("Unexpected message priority status [%d] (expected PENDING)"), (int) current_status), -1); @@ -1417,7 +1417,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::refresh_pending_queue (const ACE_Time_ default: // if we got here, something is *seriously* wrong with the queue ACE_ERROR_RETURN((LM_ERROR, - ACE_TEXT ("Unknown message priority status [%d]"), + ACE_LIB_TEXT ("Unknown message priority status [%d]"), (int) current_status), -1); } @@ -1473,7 +1473,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::refresh_late_queue (const ACE_Time_Val else if (current_status != ACE_Dynamic_Message_Strategy::LATE) // if we got here, something is *seriously* wrong with the queue ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Unexpected message priority status [%d] (expected LATE)"), + ACE_LIB_TEXT ("Unexpected message priority status [%d] (expected LATE)"), (int) current_status), -1); } @@ -1494,14 +1494,14 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::refresh_late_queue (const ACE_Time_Val case ACE_Dynamic_Message_Strategy::PENDING: // if we got here, something is *seriously* wrong with the queue ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Unexpected message priority status ") - ACE_TEXT ("[%d] (expected LATE or BEYOND_LATE)"), + ACE_LIB_TEXT ("Unexpected message priority status ") + ACE_LIB_TEXT ("[%d] (expected LATE or BEYOND_LATE)"), (int) current_status), -1); default: // if we got here, something is *seriously* wrong with the queue ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Unknown message priority status [%d]"), + ACE_LIB_TEXT ("Unknown message priority status [%d]"), (int) current_status), -1); } diff --git a/ace/Module.cpp b/ace/Module.cpp index 9ac03b7e1cb..caba448b72b 100644 --- a/ace/Module.cpp +++ b/ace/Module.cpp @@ -191,8 +191,8 @@ ACE_Module<ACE_SYNCH_USE>::ACE_Module (const ACE_TCHAR *mod_name, if (this->open (mod_name, writer_q, reader_q, args, flags) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Module"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Module"))); } template <ACE_SYNCH_DECL> int diff --git a/ace/Name_Proxy.cpp b/ace/Name_Proxy.cpp index aa6dea87a09..cccd599912c 100644 --- a/ace/Name_Proxy.cpp +++ b/ace/Name_Proxy.cpp @@ -14,7 +14,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, ACE_TEXT ("reactor_ = %x"), this->reactor_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("reactor_ = %x"), this->reactor_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -53,8 +53,8 @@ ACE_Name_Proxy::ACE_Name_Proxy (const ACE_INET_Addr &remote_addr, if (this->open (remote_addr, options) == -1 && options[ACE_Synch_Options::USE_TIMEOUT] && errno != EWOULDBLOCK) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Name_Proxy::ACE_Name_Proxy"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Name_Proxy::ACE_Name_Proxy"))); } // Obtain underlying handle. @@ -75,16 +75,16 @@ ACE_Name_Proxy::request_reply (ACE_Name_Request &request) if (length == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("encode failed")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("encode failed")), -1); // Transmit request via a blocking send. if (this->peer_.send_n (buffer, length) != length) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("send_n failed")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("send_n failed")), -1); else { @@ -95,13 +95,13 @@ ACE_Name_Proxy::request_reply (ACE_Name_Request &request) if (this->peer_.recv_n (&reply, sizeof reply) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("recv failed")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("recv failed")), -1); else if (reply.decode () == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("decode failed")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("decode failed")), -1); errno = int (reply.errnum ()); return reply.status (); @@ -117,16 +117,16 @@ ACE_Name_Proxy::send_request (ACE_Name_Request &request) if (length == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("encode failed")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("encode failed")), -1); // Transmit request via a blocking send. else if (this->peer_.send_n (buffer, length) != length) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("send_n failed")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("send_n failed")), -1); return 0; } @@ -145,11 +145,11 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) case -1: // FALLTHROUGH ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("****************** recv_reply returned -1\n"))); + ACE_LIB_TEXT ("****************** recv_reply returned -1\n"))); default: ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p got %d bytes, expected %d bytes\n"), - ACE_TEXT ("recv failed"), + ACE_LIB_TEXT ("%p got %d bytes, expected %d bytes\n"), + ACE_LIB_TEXT ("recv failed"), n, sizeof (ACE_UINT32))); // FALLTHROUGH @@ -172,8 +172,8 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) if (n != ssize_t (length - sizeof (ACE_UINT32))) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p expected %d, got %d\n"), - ACE_TEXT ("invalid length"), + ACE_LIB_TEXT ("%p expected %d, got %d\n"), + ACE_LIB_TEXT ("invalid length"), length, n)); return -1; @@ -183,8 +183,8 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) if (reply.decode () == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("decode failed"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("decode failed"))); return -1; } } diff --git a/ace/Name_Request_Reply.cpp b/ace/Name_Request_Reply.cpp index 262522c7938..5e10e033089 100644 --- a/ace/Name_Request_Reply.cpp +++ b/ace/Name_Request_Reply.cpp @@ -319,82 +319,82 @@ ACE_Name_Request::dump (void) const { ACE_TRACE ("ACE_Name_Request::dump"); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("*******\nlength = %d\n"), + ACE_LIB_TEXT ("*******\nlength = %d\n"), this->length ())); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("message-type = "))); + ACE_LIB_TEXT ("message-type = "))); switch (this->msg_type ()) { case ACE_Name_Request::BIND: ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("BIND\n"))); + ACE_LIB_TEXT ("BIND\n"))); break; case ACE_Name_Request::REBIND: ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("REBIND\n"))); + ACE_LIB_TEXT ("REBIND\n"))); break; case ACE_Name_Request::RESOLVE: ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("RESOLVE\n"))); + ACE_LIB_TEXT ("RESOLVE\n"))); break; case ACE_Name_Request::UNBIND: ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("UNBIND\n"))); + ACE_LIB_TEXT ("UNBIND\n"))); break; case ACE_Name_Request::LIST_NAMES: ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("LIST_NAMES\n"))); + ACE_LIB_TEXT ("LIST_NAMES\n"))); break; case ACE_Name_Request::LIST_VALUES: ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("LIST_VALUES\n"))); + ACE_LIB_TEXT ("LIST_VALUES\n"))); break; case ACE_Name_Request::LIST_TYPES: ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("LIST_TYPES\n"))); + ACE_LIB_TEXT ("LIST_TYPES\n"))); break; case ACE_Name_Request::LIST_NAME_ENTRIES: ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("LIST_NAME_ENTRIES\n"))); + ACE_LIB_TEXT ("LIST_NAME_ENTRIES\n"))); break; case ACE_Name_Request::LIST_VALUE_ENTRIES: ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("LIST_VALUE_ENTRIES\n"))); + ACE_LIB_TEXT ("LIST_VALUE_ENTRIES\n"))); break; case ACE_Name_Request::LIST_TYPE_ENTRIES: ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("LIST_TYPE_ENTRIES\n"))); + ACE_LIB_TEXT ("LIST_TYPE_ENTRIES\n"))); break; default: ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("<unknown type> = %d\n"), + ACE_LIB_TEXT ("<unknown type> = %d\n"), this->msg_type ())); break; } if (this->block_forever ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("blocking forever\n"))); + ACE_LIB_TEXT ("blocking forever\n"))); else { #if !defined (ACE_NLOGGING) ACE_Time_Value tv = this->timeout (); #endif /* ! ACE_NLOGGING */ ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("waiting for %d secs and %d usecs\n"), + ACE_LIB_TEXT ("waiting for %d secs and %d usecs\n"), tv.sec (), tv.usec ())); } ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("*******\nname_len = %d\n"), + ACE_LIB_TEXT ("*******\nname_len = %d\n"), this->name_len ())); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("*******\nvalue_len = %d\n"), + ACE_LIB_TEXT ("*******\nvalue_len = %d\n"), this->value_len ())); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("+++++++\n"))); + ACE_LIB_TEXT ("+++++++\n"))); } // Default constructor. @@ -532,24 +532,24 @@ ACE_Name_Reply::dump (void) const { ACE_TRACE ("ACE_Name_Reply::dump"); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("*******\nlength = %d\nerrnum = %d"), + ACE_LIB_TEXT ("*******\nlength = %d\nerrnum = %d"), this->length (), this->errnum ())); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("type = "))); + ACE_LIB_TEXT ("type = "))); switch (this->msg_type ()) { case 0: ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("SUCCESS\n"))); + ACE_LIB_TEXT ("SUCCESS\n"))); break; case -1: ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("FAILURE\n"))); + ACE_LIB_TEXT ("FAILURE\n"))); break; default: ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("<unknown type> = %d\n"), + ACE_LIB_TEXT ("<unknown type> = %d\n"), this->msg_type ())); break; } diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp index c6f16d9db2b..c5fc634276b 100644 --- a/ace/Naming_Context.cpp +++ b/ace/Naming_Context.cpp @@ -47,7 +47,7 @@ ACE_Naming_Context::local (void) { ACE_TRACE ("ACE_Naming_Context::local"); return ACE_OS::strcmp (this->netnameserver_host_, - ACE_TEXT ("localhost")) == 0 + ACE_LIB_TEXT ("localhost")) == 0 || ACE_OS::strcmp (this->netnameserver_host_, this->hostname_) == 0; } @@ -101,7 +101,7 @@ ACE_Naming_Context::open (Context_Scope_Type scope_in, int lite) if (ACE_LOG_MSG->op_status () != 0 || this->name_space_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("NAME_SPACE::NAME_SPACE\n")), + ACE_LIB_TEXT ("NAME_SPACE::NAME_SPACE\n")), -1); return 0; } @@ -151,8 +151,8 @@ ACE_Naming_Context::ACE_Naming_Context (Context_Scope_Type scope_in, // Initialize. if (this->open (scope_in, lite) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Naming_Context::ACE_Naming_Context"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Naming_Context::ACE_Naming_Context"))); } ACE_Name_Options * @@ -386,7 +386,7 @@ ACE_Naming_Context::init (int argc, ACE_TCHAR *argv[]) { if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("ACE_Naming_Context::init\n"))); + ACE_LIB_TEXT ("ACE_Naming_Context::init\n"))); this->name_options_->parse_args (argc, argv); return this->open (this->name_options_->context ()); } @@ -396,7 +396,7 @@ ACE_Naming_Context::fini (void) { if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("ACE_Naming_Context::fini\n"))); + ACE_LIB_TEXT ("ACE_Naming_Context::fini\n"))); this->close_down (); return 0; } @@ -422,9 +422,9 @@ ACE_Name_Options::ACE_Name_Options (void) if (ACE::get_temp_dir (this->namespace_dir_, MAXPATHLEN) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Temporary path too long, ") - ACE_TEXT ("defaulting to current directory\n"))); - ACE_OS::strcat (this->namespace_dir_, ACE_TEXT (".")); + ACE_LIB_TEXT ("Temporary path too long, ") + ACE_LIB_TEXT ("defaulting to current directory\n"))); + ACE_OS::strcat (this->namespace_dir_, ACE_LIB_TEXT (".")); ACE_OS::strcat (this->namespace_dir_, ACE_DIRECTORY_SEPARATOR_STR); } #endif /* ACE_DEFAULT_NAMESPACE_DIR */ @@ -593,18 +593,18 @@ ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[]) // clean it up in the destructor). this->database (this->process_name ()); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("b:c:dh:l:P:p:s:T:vr")); + ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT ("b:c:dh:l:P:p:s:T:vr")); for (int c; (c = get_opt ()) != -1; ) switch (c) { case 'c': { - if (ACE_OS::strcmp (get_opt.optarg, ACE_TEXT ("PROC_LOCAL")) == 0) + if (ACE_OS::strcmp (get_opt.optarg, ACE_LIB_TEXT ("PROC_LOCAL")) == 0) this->context (ACE_Naming_Context::PROC_LOCAL); - else if (ACE_OS::strcmp (get_opt.optarg, ACE_TEXT ("NODE_LOCAL")) == 0) + else if (ACE_OS::strcmp (get_opt.optarg, ACE_LIB_TEXT ("NODE_LOCAL")) == 0) this->context (ACE_Naming_Context::NODE_LOCAL); - else if (ACE_OS::strcmp (get_opt.optarg, ACE_TEXT ("NET_LOCAL")) == 0) + else if (ACE_OS::strcmp (get_opt.optarg, ACE_LIB_TEXT ("NET_LOCAL")) == 0) this->context (ACE_Naming_Context::NET_LOCAL); } break; @@ -633,9 +633,9 @@ ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[]) this->base_address ((char *) ACE_OS::atoi (get_opt.optarg)); break; case 'T': - if (ACE_OS::strcasecmp (get_opt.optarg, ACE_TEXT ("ON")) == 0) + if (ACE_OS::strcasecmp (get_opt.optarg, ACE_LIB_TEXT ("ON")) == 0) ACE_Trace::start_tracing (); - else if (ACE_OS::strcasecmp (get_opt.optarg, ACE_TEXT ("OFF")) == 0) + else if (ACE_OS::strcasecmp (get_opt.optarg, ACE_LIB_TEXT ("OFF")) == 0) ACE_Trace::stop_tracing (); break; case 'v': diff --git a/ace/OS.cpp b/ace/OS.cpp index 930c5bec60b..dd19613e2e3 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -14,18 +14,18 @@ ACE_RCSID(ace, OS, "$Id$") #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) # if defined (ACE_HAS_WINCE) -const wchar_t *ACE_OS::day_of_week_name[] = {ACE_TEXT ("Sun"), ACE_TEXT ("Mon"), - ACE_TEXT ("Tue"), ACE_TEXT ("Wed"), - ACE_TEXT ("Thu"), ACE_TEXT ("Fri"), - ACE_TEXT ("Sat")}; -const wchar_t *ACE_OS::month_name[] = {ACE_TEXT ("Jan"), ACE_TEXT ("Feb"), - ACE_TEXT ("Mar"), ACE_TEXT ("Apr"), - ACE_TEXT ("May"), ACE_TEXT ("Jun"), - ACE_TEXT ("Jul"), ACE_TEXT ("Aug"), - ACE_TEXT ("Sep"), ACE_TEXT ("Oct"), - ACE_TEXT ("Nov"), ACE_TEXT ("Dec") }; - -static const ACE_TCHAR *ACE_OS_CTIME_R_FMTSTR = ACE_TEXT ("%3s %3s %02d %02d:%02d:%02d %04d\n"); +const wchar_t *ACE_OS::day_of_week_name[] = {ACE_LIB_TEXT ("Sun"), ACE_LIB_TEXT ("Mon"), + ACE_LIB_TEXT ("Tue"), ACE_LIB_TEXT ("Wed"), + ACE_LIB_TEXT ("Thu"), ACE_LIB_TEXT ("Fri"), + ACE_LIB_TEXT ("Sat")}; +const wchar_t *ACE_OS::month_name[] = {ACE_LIB_TEXT ("Jan"), ACE_LIB_TEXT ("Feb"), + ACE_LIB_TEXT ("Mar"), ACE_LIB_TEXT ("Apr"), + ACE_LIB_TEXT ("May"), ACE_LIB_TEXT ("Jun"), + ACE_LIB_TEXT ("Jul"), ACE_LIB_TEXT ("Aug"), + ACE_LIB_TEXT ("Sep"), ACE_LIB_TEXT ("Oct"), + ACE_LIB_TEXT ("Nov"), ACE_LIB_TEXT ("Dec") }; + +static const ACE_TCHAR *ACE_OS_CTIME_R_FMTSTR = ACE_LIB_TEXT ("%3s %3s %02d %02d:%02d:%02d %04d\n"); # endif /* ACE_HAS_WINCE */ # if defined (ACE_WIN32) @@ -439,8 +439,8 @@ ACE_Time_Value::dump (void) const ACE_OS_TRACE ("ACE_Time_Value::dump"); #if 0 ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntv_sec_ = %d"), this->tv_.tv_sec)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntv_usec_ = %d\n"), this->tv_.tv_usec)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntv_sec_ = %d"), this->tv_.tv_sec)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntv_usec_ = %d\n"), this->tv_.tv_usec)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* 0 */ } @@ -549,7 +549,7 @@ ACE_OS::uname (struct utsname *name) # if defined (ACE_WIN32) size_t maxnamelen = sizeof name->nodename; ACE_OS::strcpy (name->sysname, - ACE_TEXT ("Win32")); + ACE_LIB_TEXT ("Win32")); OSVERSIONINFO vinfo; vinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); @@ -571,7 +571,7 @@ ACE_OS::uname (struct utsname *name) # else ::GetSystemInfo(&sinfo); - ACE_OS::strcpy (name->sysname, ACE_TEXT ("Win32")); + ACE_OS::strcpy (name->sysname, ACE_LIB_TEXT ("Win32")); # endif /* ACE_HAS_PHARLAP */ if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT) @@ -579,14 +579,14 @@ ACE_OS::uname (struct utsname *name) // Get information from the two structures ACE_OS::sprintf (name->release, # if defined (ACE_HAS_WINCE) - ACE_TEXT ("Windows CE %d.%d"), + ACE_LIB_TEXT ("Windows CE %d.%d"), # else - ACE_TEXT ("Windows NT %d.%d"), + ACE_LIB_TEXT ("Windows NT %d.%d"), # endif /* ACE_HAS_WINCE */ vinfo.dwMajorVersion, vinfo.dwMinorVersion); ACE_OS::sprintf (name->version, - ACE_TEXT ("Build %d %s"), + ACE_LIB_TEXT ("Build %d %s"), vinfo.dwBuildNumber, vinfo.szCSDVersion); @@ -596,77 +596,77 @@ ACE_OS::uname (struct utsname *name) // subtype. The -1 is necessary for because of the space // between processor and subtype in the machine name. const int bufsize = ((sizeof (name->machine) / sizeof (ACE_TCHAR)) / 2) - 1; - ACE_TCHAR processor[bufsize] = ACE_TEXT ("Unknown"); - ACE_TCHAR subtype[bufsize] = ACE_TEXT ("Unknown"); + ACE_TCHAR processor[bufsize] = ACE_LIB_TEXT ("Unknown"); + ACE_TCHAR subtype[bufsize] = ACE_LIB_TEXT ("Unknown"); WORD arch = sinfo.wProcessorArchitecture; switch (arch) { case PROCESSOR_ARCHITECTURE_INTEL: - ACE_OS::strcpy (processor, ACE_TEXT ("Intel")); + ACE_OS::strcpy (processor, ACE_LIB_TEXT ("Intel")); if (sinfo.wProcessorLevel == 3) - ACE_OS::strcpy (subtype, ACE_TEXT ("80386")); + ACE_OS::strcpy (subtype, ACE_LIB_TEXT ("80386")); else if (sinfo.wProcessorLevel == 4) - ACE_OS::strcpy (subtype, ACE_TEXT ("80486")); + ACE_OS::strcpy (subtype, ACE_LIB_TEXT ("80486")); else if (sinfo.wProcessorLevel == 5) - ACE_OS::strcpy (subtype, ACE_TEXT ("Pentium")); + ACE_OS::strcpy (subtype, ACE_LIB_TEXT ("Pentium")); else if (sinfo.wProcessorLevel == 6) - ACE_OS::strcpy (subtype, ACE_TEXT ("Pentium Pro")); + ACE_OS::strcpy (subtype, ACE_LIB_TEXT ("Pentium Pro")); else if (sinfo.wProcessorLevel == 7) // I'm guessing here - ACE_OS::strcpy (subtype, ACE_TEXT ("Pentium II")); + ACE_OS::strcpy (subtype, ACE_LIB_TEXT ("Pentium II")); break; case PROCESSOR_ARCHITECTURE_MIPS: - ACE_OS::strcpy (processor, ACE_TEXT ("MIPS")); - ACE_OS::strcpy (subtype, ACE_TEXT ("R4000")); + ACE_OS::strcpy (processor, ACE_LIB_TEXT ("MIPS")); + ACE_OS::strcpy (subtype, ACE_LIB_TEXT ("R4000")); break; case PROCESSOR_ARCHITECTURE_ALPHA: - ACE_OS::strcpy (processor, ACE_TEXT ("Alpha")); - ACE_OS::sprintf (subtype, ACE_TEXT ("%d"), sinfo.wProcessorLevel); + ACE_OS::strcpy (processor, ACE_LIB_TEXT ("Alpha")); + ACE_OS::sprintf (subtype, ACE_LIB_TEXT ("%d"), sinfo.wProcessorLevel); break; case PROCESSOR_ARCHITECTURE_PPC: - ACE_OS::strcpy (processor, ACE_TEXT ("PPC")); + ACE_OS::strcpy (processor, ACE_LIB_TEXT ("PPC")); if (sinfo.wProcessorLevel == 1) - ACE_OS::strcpy (subtype, ACE_TEXT ("601")); + ACE_OS::strcpy (subtype, ACE_LIB_TEXT ("601")); else if (sinfo.wProcessorLevel == 3) - ACE_OS::strcpy (subtype, ACE_TEXT ("603")); + ACE_OS::strcpy (subtype, ACE_LIB_TEXT ("603")); else if (sinfo.wProcessorLevel == 4) - ACE_OS::strcpy (subtype, ACE_TEXT ("604")); + ACE_OS::strcpy (subtype, ACE_LIB_TEXT ("604")); else if (sinfo.wProcessorLevel == 6) - ACE_OS::strcpy (subtype, ACE_TEXT ("603+")); + ACE_OS::strcpy (subtype, ACE_LIB_TEXT ("603+")); else if (sinfo.wProcessorLevel == 9) - ACE_OS::strcpy (subtype, ACE_TEXT ("804+")); + ACE_OS::strcpy (subtype, ACE_LIB_TEXT ("804+")); else if (sinfo.wProcessorLevel == 20) - ACE_OS::strcpy (subtype, ACE_TEXT ("620")); + ACE_OS::strcpy (subtype, ACE_LIB_TEXT ("620")); break; case PROCESSOR_ARCHITECTURE_UNKNOWN: default: // @@ We could provide WinCE specific info here. But let's // defer that to some later point. - ACE_OS::strcpy (processor, ACE_TEXT ("Unknown")); + ACE_OS::strcpy (processor, ACE_LIB_TEXT ("Unknown")); break; } - ACE_OS::sprintf (name->machine, ACE_TEXT ("%s %s"), processor, subtype); + ACE_OS::sprintf (name->machine, ACE_LIB_TEXT ("%s %s"), processor, subtype); } else if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) { // Get Windows 95 Information - ACE_OS::strcpy (name->release, ACE_TEXT ("Windows 95")); - ACE_OS::sprintf (name->version, ACE_TEXT ("%d"), LOWORD (vinfo.dwBuildNumber)); + ACE_OS::strcpy (name->release, ACE_LIB_TEXT ("Windows 95")); + ACE_OS::sprintf (name->version, ACE_LIB_TEXT ("%d"), LOWORD (vinfo.dwBuildNumber)); if (sinfo.dwProcessorType == PROCESSOR_INTEL_386) - ACE_OS::strcpy (name->machine, ACE_TEXT ("Intel 80386")); + ACE_OS::strcpy (name->machine, ACE_LIB_TEXT ("Intel 80386")); else if (sinfo.dwProcessorType == PROCESSOR_INTEL_486) - ACE_OS::strcpy (name->machine, ACE_TEXT ("Intel 80486")); + ACE_OS::strcpy (name->machine, ACE_LIB_TEXT ("Intel 80486")); else if (sinfo.dwProcessorType == PROCESSOR_INTEL_PENTIUM) - ACE_OS::strcpy (name->machine, ACE_TEXT ("Intel Pentium")); + ACE_OS::strcpy (name->machine, ACE_LIB_TEXT ("Intel Pentium")); } else { // We don't know what this is! - ACE_OS::strcpy (name->release, ACE_TEXT ("???")); - ACE_OS::strcpy (name->version, ACE_TEXT ("???")); - ACE_OS::strcpy (name->machine, ACE_TEXT ("???")); + ACE_OS::strcpy (name->release, ACE_LIB_TEXT ("???")); + ACE_OS::strcpy (name->version, ACE_LIB_TEXT ("???")); + ACE_OS::strcpy (name->machine, ACE_LIB_TEXT ("???")); } return ACE_OS::hostname (name->nodename, maxnamelen); @@ -874,17 +874,17 @@ ACE_OS::ace_flock_t::dump (void) const #if 0 ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %u"), this->handle_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("handle_ = %u"), this->handle_)); #if defined (ACE_WIN32) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nInternal = %d"), this->overlapped_.Internal)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nInternalHigh = %d"), this->overlapped_.InternalHigh)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nOffsetHigh = %d"), this->overlapped_.OffsetHigh)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhEvent = %d"), this->overlapped_.hEvent)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nInternal = %d"), this->overlapped_.Internal)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nInternalHigh = %d"), this->overlapped_.InternalHigh)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nOffsetHigh = %d"), this->overlapped_.OffsetHigh)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhEvent = %d"), this->overlapped_.hEvent)); #elif !defined (CHORUS) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_whence = %d"), this->lock_.l_whence)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_start = %d"), this->lock_.l_start)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_len = %d"), this->lock_.l_len)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_type = %d"), this->lock_.l_type)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nl_whence = %d"), this->lock_.l_whence)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nl_start = %d"), this->lock_.l_start)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nl_len = %d"), this->lock_.l_len)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nl_type = %d"), this->lock_.l_type)); #endif /* ACE_WIN32 */ ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* 0 */ @@ -1614,9 +1614,9 @@ ACE_TSS_Info::dump (void) #if 0 ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %u\n"), this->key_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("destructor_ = %u\n"), this->destructor_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("tss_obj_ = %u\n"), this->tss_obj_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("key_ = %u\n"), this->key_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("destructor_ = %u\n"), this->destructor_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("tss_obj_ = %u\n"), this->tss_obj_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* 0 */ } @@ -2405,7 +2405,7 @@ int ACE_SEH_Default_Exception_Selector (void *) { #if 0 ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Win32 structured exception exiting thread\n"))); + ACE_LIB_TEXT ("(%t) Win32 structured exception exiting thread\n"))); #endif /* 0 */ return (DWORD) ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION; } @@ -4084,7 +4084,7 @@ ACE_OS::unique_name (const void *object, // <object>. ACE_TCHAR temp_name[ACE_UNIQUE_NAME_LEN]; ACE_OS::sprintf (temp_name, - ACE_TEXT ("%lx%d"), + ACE_LIB_TEXT ("%lx%d"), ACE_reinterpret_cast (long, object), ACE_static_cast (int, ACE_OS::getpid ())); ACE_OS::strncpy (name, @@ -4197,7 +4197,7 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, // The OS layer should not print stuff out. // In fact this functions should go into ACE_ARGV!! // ACE_ERROR ((LM_ERROR, - // ACE_TEXT ("unmatched %c detected\n"), + // ACE_LIB_TEXT ("unmatched %c detected\n"), // quote)); argc--; break; @@ -4552,14 +4552,14 @@ ACE_OS::mktemp (ACE_TCHAR *s) return 0; else { - ACE_TCHAR *xxxxxx = ACE_OS::strstr (s, ACE_TEXT ("XXXXXX")); + ACE_TCHAR *xxxxxx = ACE_OS::strstr (s, ACE_LIB_TEXT ("XXXXXX")); if (xxxxxx == 0) // the template string doesn't contain "XXXXXX"! return s; else { - ACE_TCHAR unique_letter = ACE_TEXT ('a'); + ACE_TCHAR unique_letter = ACE_LIB_TEXT ('a'); struct stat sb; // Find an unused filename for this process. It is assumed @@ -4569,20 +4569,20 @@ ACE_OS::mktemp (ACE_TCHAR *s) // template). This appears to match the behavior of the // SunOS 5.5 mktemp(). ACE_OS::sprintf (xxxxxx, - ACE_TEXT ("%05d%c"), + ACE_LIB_TEXT ("%05d%c"), ACE_OS::getpid (), unique_letter); while (ACE_OS::stat (s, &sb) >= 0) { - if (++unique_letter <= ACE_TEXT ('z')) + if (++unique_letter <= ACE_LIB_TEXT ('z')) ACE_OS::sprintf (xxxxxx, - ACE_TEXT ("%05d%c"), + ACE_LIB_TEXT ("%05d%c"), ACE_OS::getpid (), unique_letter); else { // maximum of 26 unique files per template, per process - ACE_OS::sprintf (xxxxxx, ACE_TEXT ("%s"), ACE_TEXT ("")); + ACE_OS::sprintf (xxxxxx, ACE_LIB_TEXT ("%s"), ACE_LIB_TEXT ("")); return s; } } @@ -4605,10 +4605,10 @@ ACE_OS::socket_init (int version_high, int version_low) if (error != 0) # if defined (ACE_HAS_WINCE) { - wchar_t fmt[] = ACE_TEXT ("%s failed, WSAGetLastError returned %d"); + wchar_t fmt[] = ACE_LIB_TEXT ("%s failed, WSAGetLastError returned %d"); wchar_t buf[80]; // @@ Eliminate magic number. - ACE_OS::sprintf (buf, fmt, ACE_TEXT ("WSAStartup"), error); - ::MessageBox (NULL, buf, ACE_TEXT ("WSAStartup failed!"), MB_OK); + ACE_OS::sprintf (buf, fmt, ACE_LIB_TEXT ("WSAStartup"), error); + ::MessageBox (NULL, buf, ACE_LIB_TEXT ("WSAStartup failed!"), MB_OK); } # else ACE_OS::fprintf (stderr, @@ -4636,10 +4636,10 @@ ACE_OS::socket_fini (void) { int error = ::WSAGetLastError (); # if defined (ACE_HAS_WINCE) - wchar_t fmt[] = ACE_TEXT ("%s failed, WSAGetLastError returned %d"); + wchar_t fmt[] = ACE_LIB_TEXT ("%s failed, WSAGetLastError returned %d"); wchar_t buf[80]; // @@ Eliminate magic number. - ACE_OS::sprintf (buf, fmt, ACE_TEXT ("WSACleanup"), error); - ::MessageBox (NULL, buf , ACE_TEXT ("WSACleanup failed!"), MB_OK); + ACE_OS::sprintf (buf, fmt, ACE_LIB_TEXT ("WSACleanup"), error); + ::MessageBox (NULL, buf , ACE_LIB_TEXT ("WSACleanup failed!"), MB_OK); # else ACE_OS::fprintf (stderr, "ACE_OS::socket_fini; WSACleanup failed, " @@ -4860,7 +4860,7 @@ ACE_OS::inet_aton (const ACE_TCHAR *host_name, struct in_addr *addr) if (ip_addr == (ACE_UINT32) htonl ((ACE_UINT32) ~0) // Broadcast addresses are weird... - && ACE_OS::strcmp (host_name, ACE_TEXT ("255.255.255.255")) != 0) + && ACE_OS::strcmp (host_name, ACE_LIB_TEXT ("255.255.255.255")) != 0) return 0; else if (addr == 0) return 0; @@ -6655,7 +6655,7 @@ ACE_OS_Object_Manager::init (void) ACE_OS_Object_Manager::preallocated_object[ ACE_OS_MONITOR_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_TEXT ("ACE_OS_MONITOR_LOCK")); + __LINE__, ACE_LIB_TEXT ("ACE_OS_MONITOR_LOCK")); ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t, ACE_TSS_CLEANUP_LOCK) if (ACE_OS::recursive_mutex_init (ACE_reinterpret_cast ( @@ -6663,7 +6663,7 @@ ACE_OS_Object_Manager::init (void) ACE_OS_Object_Manager::preallocated_object[ ACE_TSS_CLEANUP_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_TEXT ("ACE_TSS_CLEANUP_LOCK")); + __LINE__, ACE_LIB_TEXT ("ACE_TSS_CLEANUP_LOCK")); ACE_OS_PREALLOCATE_OBJECT (ACE_thread_mutex_t, ACE_LOG_MSG_INSTANCE_LOCK) if (ACE_OS::thread_mutex_init (ACE_reinterpret_cast ( @@ -6671,7 +6671,7 @@ ACE_OS_Object_Manager::init (void) ACE_OS_Object_Manager::preallocated_object[ ACE_LOG_MSG_INSTANCE_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_TEXT ("ACE_LOG_MSG_INSTANCE_LOCK")); + __LINE__, ACE_LIB_TEXT ("ACE_LOG_MSG_INSTANCE_LOCK")); # if defined (ACE_HAS_TSS_EMULATION) ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t, ACE_TSS_KEY_LOCK) @@ -6680,7 +6680,7 @@ ACE_OS_Object_Manager::init (void) ACE_OS_Object_Manager::preallocated_object[ ACE_TSS_KEY_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_TEXT ("ACE_TSS_KEY_LOCK")); + __LINE__, ACE_LIB_TEXT ("ACE_TSS_KEY_LOCK")); # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t, ACE_TSS_BASE_LOCK) @@ -6689,7 +6689,7 @@ ACE_OS_Object_Manager::init (void) ACE_OS_Object_Manager::preallocated_object[ ACE_TSS_BASE_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_TEXT ("ACE_TSS_BASE_LOCK")); + __LINE__, ACE_LIB_TEXT ("ACE_TSS_BASE_LOCK")); # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */ # endif /* ACE_HAS_TSS_EMULATION */ # endif /* ACE_MT_SAFE */ @@ -6767,7 +6767,7 @@ ACE_OS_Object_Manager::fini (void) ACE_thread_mutex_t *, ACE_OS_Object_Manager::preallocated_object[ACE_OS_MONITOR_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_TEXT ("ACE_OS_MONITOR_LOCK")); + __LINE__, ACE_LIB_TEXT ("ACE_OS_MONITOR_LOCK")); # endif /* ! __Lynx__ */ ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_thread_mutex_t, ACE_OS_MONITOR_LOCK) @@ -6778,7 +6778,7 @@ ACE_OS_Object_Manager::fini (void) ACE_OS_Object_Manager::preallocated_object[ ACE_TSS_CLEANUP_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_TEXT ("ACE_TSS_CLEANUP_LOCK")); + __LINE__, ACE_LIB_TEXT ("ACE_TSS_CLEANUP_LOCK")); # endif /* ! __Lynx__ */ ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_recursive_thread_mutex_t, ACE_TSS_CLEANUP_LOCK) @@ -6789,7 +6789,7 @@ ACE_OS_Object_Manager::fini (void) ACE_OS_Object_Manager::preallocated_object [ACE_LOG_MSG_INSTANCE_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_TEXT ("ACE_LOG_MSG_INSTANCE_LOCK ")); + __LINE__, ACE_LIB_TEXT ("ACE_LOG_MSG_INSTANCE_LOCK ")); # endif /* ! __Lynx__ */ ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_thread_mutex_t, ACE_LOG_MSG_INSTANCE_LOCK) @@ -6801,7 +6801,7 @@ ACE_OS_Object_Manager::fini (void) ACE_OS_Object_Manager::preallocated_object[ ACE_TSS_KEY_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_TEXT ("ACE_TSS_KEY_LOCK")); + __LINE__, ACE_LIB_TEXT ("ACE_TSS_KEY_LOCK")); # endif /* ! __Lynx__ */ ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_recursive_thread_mutex_t, ACE_TSS_KEY_LOCK) @@ -6813,7 +6813,7 @@ ACE_OS_Object_Manager::fini (void) ACE_OS_Object_Manager::preallocated_object[ ACE_TSS_BASE_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_TEXT ("ACE_TSS_BASE_LOCK")); + __LINE__, ACE_LIB_TEXT ("ACE_TSS_BASE_LOCK")); # endif /* ! __Lynx__ */ ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_recursive_thread_mutex_t, ACE_TSS_BASE_LOCK) @@ -6881,7 +6881,7 @@ ACE_OS_Object_Manager::print_error_message (u_int line_number, NULL); ::MessageBox (NULL, lpMsgBuf, - ACE_TEXT ("ACE_OS error"), + ACE_LIB_TEXT ("ACE_OS error"), MB_OK); #endif } @@ -66,7 +66,7 @@ enum ACE_Recyclable_State #endif /* ACE_DEFAULT_PAGEFILE_POOL_CHUNK */ #if !defined (ACE_DEFAULT_PAGEFILE_POOL_NAME) -#define ACE_DEFAULT_PAGEFILE_POOL_NAME ACE_TEXT ("Default_ACE_Pagefile_Memory_Pool") +#define ACE_DEFAULT_PAGEFILE_POOL_NAME ACE_LIB_TEXT ("Default_ACE_Pagefile_Memory_Pool") #endif /* ACE_DEFAULT_PAGEFILE_POOL_NAME */ #if !defined (ACE_DEFAULT_MESSAGE_BLOCK_PRIORITY) @@ -271,16 +271,16 @@ typedef long id_t; # if !defined (ACE_DEFAULT_LOGGER_KEY) # if defined (ACE_HAS_STREAM_PIPES) -# define ACE_DEFAULT_LOGGER_KEY ACE_TEXT ("/tmp/server_daemon") +# define ACE_DEFAULT_LOGGER_KEY ACE_LIB_TEXT ("/tmp/server_daemon") # else -# define ACE_DEFAULT_LOGGER_KEY ACE_TEXT ("localhost:10012") +# define ACE_DEFAULT_LOGGER_KEY ACE_LIB_TEXT ("localhost:10012") # endif /* ACE_HAS_STREAM_PIPES */ # endif /* ACE_DEFAULT_LOGGER_KEY */ // The way to specify the local host for loopback IP. This is usually // "localhost" but it may need changing on some platforms. # if !defined (ACE_LOCALHOST) -# define ACE_LOCALHOST ACE_TEXT ("localhost") +# define ACE_LOCALHOST ACE_LIB_TEXT ("localhost") # endif # if !defined (ACE_DEFAULT_SERVER_HOST) @@ -382,8 +382,8 @@ typedef long id_t; // ACE. // Helpful dump macros. -# define ACE_BEGIN_DUMP ACE_TEXT ("\n====\n(%P|%t|%x)") -# define ACE_END_DUMP ACE_TEXT ("====\n") +# define ACE_BEGIN_DUMP ACE_LIB_TEXT ("\n====\n(%P|%t|%x)") +# define ACE_END_DUMP ACE_LIB_TEXT ("====\n") // A free list which create more elements when there aren't enough // elements. @@ -763,11 +763,11 @@ typedef struct # define ACE_PLATFORM_A "pSOS" # define ACE_PLATFORM_EXE_SUFFIX_A "" -# define ACE_DLL_SUFFIX ACE_TEXT (".so") -# define ACE_DLL_PREFIX ACE_TEXT ("lib") -# define ACE_LD_SEARCH_PATH ACE_TEXT ("LD_LIBRARY_PATH") -# define ACE_LD_SEARCH_PATH_SEPARATOR_STR ACE_TEXT (":") -# define ACE_LOGGER_KEY ACE_TEXT ("/tmp/server_daemon") +# define ACE_DLL_SUFFIX ACE_LIB_TEXT (".so") +# define ACE_DLL_PREFIX ACE_LIB_TEXT ("lib") +# define ACE_LD_SEARCH_PATH ACE_LIB_TEXT ("LD_LIBRARY_PATH") +# define ACE_LD_SEARCH_PATH_SEPARATOR_STR ACE_LIB_TEXT (":") +# define ACE_LOGGER_KEY ACE_LIB_TEXT ("/tmp/server_daemon") # define ACE_MAX_DEFAULT_PORT 65535 @@ -981,7 +981,7 @@ extern "C" pthread_t pthread_self (void); # if (ACE_NTRACE == 1) # define ACE_TRACE(X) # else -# define ACE_TRACE(X) ACE_Trace ____ (ACE_TEXT (X), __LINE__, ACE_TEXT (__FILE__)) +# define ACE_TRACE(X) ACE_Trace ____ (ACE_LIB_TEXT (X), __LINE__, ACE_LIB_TEXT (__FILE__)) # endif /* ACE_NTRACE */ // By default we perform no tracing on the OS layer, otherwise the @@ -2943,7 +2943,7 @@ typedef void (*ACE_SignalHandlerV)(...); // Used for dynamic linking # if !defined (ACE_DEFAULT_SVC_CONF) -# define ACE_DEFAULT_SVC_CONF ACE_TEXT (".\\svc.conf") +# define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (".\\svc.conf") # endif /* ACE_DEFAULT_SVC_CONF */ // The following are #defines and #includes that are specific to @@ -2997,10 +2997,10 @@ typedef void (*ACE_SignalHandlerV)(...); // Define the pathname separator characters for Win32 (ugh). # define ACE_DIRECTORY_SEPARATOR_STR_A "\\" # define ACE_DIRECTORY_SEPARATOR_CHAR_A '\\' -# define ACE_LD_SEARCH_PATH ACE_TEXT ("PATH") -# define ACE_LD_SEARCH_PATH_SEPARATOR_STR ACE_TEXT (";") -# define ACE_DLL_SUFFIX ACE_TEXT (".dll") -# define ACE_DLL_PREFIX ACE_TEXT ("") +# define ACE_LD_SEARCH_PATH ACE_LIB_TEXT ("PATH") +# define ACE_LD_SEARCH_PATH_SEPARATOR_STR ACE_LIB_TEXT (";") +# define ACE_DLL_SUFFIX ACE_LIB_TEXT (".dll") +# define ACE_DLL_PREFIX ACE_LIB_TEXT ("") // This will help until we figure out everything: # define NFDBITS 32 /* only used in unused functions... */ @@ -3266,7 +3266,7 @@ typedef ACE_UINT64 ACE_hrtime_t; // Used for dynamic linking. # if !defined (ACE_DEFAULT_SVC_CONF) -# define ACE_DEFAULT_SVC_CONF ACE_TEXT ("./svc.conf") +# define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT ("./svc.conf") # endif /* ACE_DEFAULT_SVC_CONF */ // The following are #defines and #includes that are specific to UNIX. @@ -3713,10 +3713,10 @@ extern "C" # define ACE_PLATFORM_EXE_SUFFIX_W ACE_TEXT_WIDE(ACE_PLATFORM_EXE_SUFFIX_A) # endif /* ACE_HAS_WCHAR */ -# define ACE_DIRECTORY_SEPARATOR_STR ACE_TEXT(ACE_DIRECTORY_SEPARATOR_STR_A) -# define ACE_DIRECTORY_SEPARATOR_CHAR ACE_TEXT(ACE_DIRECTORY_SEPARATOR_CHAR_A) -# define ACE_PLATFORM ACE_TEXT(ACE_PLATFORM_A) -# define ACE_PLATFORM_EXE_SUFFIX ACE_TEXT(ACE_PLATFORM_EXE_SUFFIX_A) +# define ACE_DIRECTORY_SEPARATOR_STR ACE_LIB_TEXT (ACE_DIRECTORY_SEPARATOR_STR_A) +# define ACE_DIRECTORY_SEPARATOR_CHAR ACE_LIB_TEXT (ACE_DIRECTORY_SEPARATOR_CHAR_A) +# define ACE_PLATFORM ACE_LIB_TEXT (ACE_PLATFORM_A) +# define ACE_PLATFORM_EXE_SUFFIX ACE_LIB_TEXT (ACE_PLATFORM_EXE_SUFFIX_A) // Theses defines are used by the ACE Name Server. # if !defined (ACE_DEFAULT_LOCALNAME_A) @@ -3726,13 +3726,28 @@ extern "C" # define ACE_DEFAULT_GLOBALNAME_A "globalnames" # endif /* ACE_DEFAULT_GLOBALNAME_A */ +// ACE_DEFAULT_NAMESPACE_DIR is for legacy mode apps. A better +// way of doing this is something like ACE::get_temp_dir, since +// this directory may not exist +# if defined (ACE_LEGACY_MODE) +# if defined (ACE_WIN32) +# define ACE_DEFAULT_NAMESPACE_DIR_A "C:\\temp" +# else /* ACE_WIN32 */ +# define ACE_DEFAULT_NAMESPACE_DIR_A "/tmp" +# endif /* ACE_WIN32 */ +# if defined (ACE_HAS_WCHAR) +# define ACE_DEFAULT_NAMESPACE_DIR_W ACE_TEXT_WIDE(ACE_DEFAULT_NAMESPACE_DIR_A) +# endif /* ACE_HAS_WCHAR */ +# define ACE_DEFAULT_NAMESPACE_DIR ACE_LIB_TEXT(ACE_DEFAULT_NAMESPACE_DIR_A) +# endif /* ACE_LEGACY_MODE */ + # if defined (ACE_HAS_WCHAR) # define ACE_DEFAULT_LOCALNAME_W ACE_TEXT_WIDE(ACE_DEFAULT_LOCALNAME_A) # define ACE_DEFAULT_GLOBALNAME_W ACE_TEXT_WIDE(ACE_DEFAULT_GLOBALNAME_A) # endif /* ACE_HAS_WCHAR */ -# define ACE_DEFAULT_LOCALNAME ACE_TEXT(ACE_DEFAULT_LOCALNAME_A) -# define ACE_DEFAULT_GLOBALNAME ACE_TEXT(ACE_DEFAULT_GLOBALNAME_A) +# define ACE_DEFAULT_LOCALNAME ACE_LIB_TEXT (ACE_DEFAULT_LOCALNAME_A) +# define ACE_DEFAULT_GLOBALNAME ACE_LIB_TEXT (ACE_DEFAULT_GLOBALNAME_A) // defined Win32 specific macros for UNIX platforms # if !defined (O_BINARY) @@ -4877,7 +4892,11 @@ public: static double ceil (double x); // This method computes the smallest integral value not less than x. - static ACE_TCHAR *getenv (const ACE_TCHAR *symbol); + static char *getenv (const char *symbol); +# if defined (ACE_HAS_WCHAR) && defined (ACE_WIN32) + static wchar_t *getenv (const wchar_t *symbol); +# endif /* ACE_HAS_WCHAR && ACE_WIN32 */ + static int putenv (const ACE_TCHAR *string); static ACE_TCHAR *strenvdup (const ACE_TCHAR *str); static ACE_TCHAR *getenvstrings (void); @@ -4923,8 +4942,14 @@ public: # endif /* ACE_WIN32 && ACE_HAS_WTHREADS */ // = A set of wrappers for determining config info. - static ACE_TCHAR *cuserid (ACE_TCHAR *user, - size_t maxlen = 32); + static char *cuserid (char *user, + size_t maxlen = 32); + +# if defined (ACE_HAS_WCHAR) + static wchar_t *cuserid (wchar_t *user, + size_t maxlen = 32); +# endif /* ACE_HAS_WCHAR */ + static int uname (struct utsname *name); static long sysinfo (int cmd, char *buf, @@ -6779,7 +6804,7 @@ extern "C" ACE_Export void ace_mutex_lock_cleanup_adapter (void *args); # define ACE_DEFAULT_MUTEX_W ACE_TEXT_WIDE(ACE_DEFAULT_MUTEX_A) # endif /* ACE_HAS_WCHAR */ -# define ACE_DEFAULT_MUTEX ACE_TEXT(ACE_DEFAULT_MUTEX_A) +# define ACE_DEFAULT_MUTEX ACE_LIB_TEXT (ACE_DEFAULT_MUTEX_A) # if !defined (ACE_MAIN) # define ACE_MAIN main @@ -1314,8 +1314,8 @@ ACE_OS::shm_unlink (const ACE_TCHAR *path) # endif /* ACE_HAS_PACE */ } -ACE_INLINE ACE_TCHAR * -ACE_OS::cuserid (ACE_TCHAR *user, size_t maxlen) +ACE_INLINE char * +ACE_OS::cuserid (char *user, size_t maxlen) { ACE_OS_TRACE ("ACE_OS::cuserid"); #if defined (VXWORKS) @@ -1338,7 +1338,7 @@ ACE_OS::cuserid (ACE_TCHAR *user, size_t maxlen) ACE_UNUSED_ARG (maxlen); ACE_NOTSUP_RETURN (0); #elif defined (ACE_WIN32) - BOOL result = ACE_TEXT_GetUserName (user, (u_long *) &maxlen); + BOOL result = GetUserNameA (user, (u_long *) &maxlen); if (result == FALSE) ACE_FAIL_RETURN (0); else @@ -1373,7 +1373,7 @@ ACE_OS::cuserid (ACE_TCHAR *user, size_t maxlen) ::endpwent (); size_t max_length = 0; - ACE_TCHAR *userid = 0; + char *userid = 0; if (user == 0) { @@ -1381,12 +1381,12 @@ ACE_OS::cuserid (ACE_TCHAR *user, size_t maxlen) // zero pointer was passed in as the destination. #if defined (_POSIX_SOURCE) - static ACE_TCHAR tmp[L_cuserid]; + static char tmp[L_cuserid]; #else - static ACE_TCHAR tmp[9]; // 8 character user ID + NULL + static char tmp[9]; // 8 character user ID + NULL #endif /* _POSIX_SOURCE */ - max_length = sizeof(tmp) / sizeof(ACE_TCHAR); + max_length = sizeof(tmp); userid = tmp; } @@ -1409,10 +1409,39 @@ ACE_OS::cuserid (ACE_TCHAR *user, size_t maxlen) #else // Hackish because of missing buffer size! ACE_UNUSED_ARG (maxlen); - ACE_OSCALL_RETURN (::cuserid (user), ACE_TCHAR *, 0); + ACE_OSCALL_RETURN (::cuserid (user), char *, 0); #endif /* VXWORKS */ } +#if defined (ACE_HAS_WCHAR) +ACE_INLINE wchar_t * +ACE_OS::cuserid (wchar_t *user, size_t maxlen) +{ +# if defined (ACE_WIN32) + BOOL result = GetUserNameW (user, (u_long *) &maxlen); + if (result == FALSE) + ACE_FAIL_RETURN (0); + else + return user; +# else /* ACE_WIN32 */ + char *char_user; + wchar_t *result = 0; + + ACE_NEW_RETURN (char_user, char[maxlen], 0); + + if (ACE_OS::cuserid (char_user, maxlen)) + { + ACE_OS::strcpy (user, ACE_Ascii_To_Wide (char_user).wchar_rep ()); + result = user; + } + + delete char_user; + + return result; +# endif /* ACE_WIN32 */ +} +#endif /* ACE_HAS_WCHAR */ + ACE_INLINE int ACE_OS::atexit (ACE_EXIT_HOOK func) { @@ -6808,7 +6837,7 @@ ACE_OS::inet_ntop (int family, const void *addrptr, ACE_TCHAR *strptr, size_t le // doesn't appear to be very portable. For now, hope that using // sprintf() will not cause any string/memory overrun problems. ACE_OS::sprintf (temp, - ACE_TEXT ("%d.%d.%d.%d"), + ACE_LIB_TEXT ("%d.%d.%d.%d"), p[0], p[1], p[2], p[3]); if (ACE_OS::strlen (temp) >= len) @@ -8261,7 +8290,7 @@ ACE_OS::access (const char *path, int amode) #elif defined (ACE_HAS_WINCE) // @@ WINCE: There should be a Win32 API that can do this. // Hard coded read access here. - FILE* handle = ACE_OS::fopen (path, ACE_TEXT ("r")); + FILE* handle = ACE_OS::fopen (path, ACE_LIB_TEXT ("r")); ACE_UNUSED_ARG (amode); ACE_OS::fclose (handle); @@ -8363,7 +8392,7 @@ ACE_OS::hostname (char name[], size_t maxnamelen) if (ACE_OS::strlen (name) == 0) { // Try the HOST environment variable. - ACE_TCHAR *const hostenv = ::getenv (ACE_TEXT ("HOST")); + ACE_TCHAR *const hostenv = ::getenv (ACE_LIB_TEXT ("HOST")); if (hostenv) ACE_OS::strncpy (name, hostenv, maxnamelen); } @@ -8543,7 +8572,7 @@ ACE_OS::dlclose (ACE_SHLIB_HANDLE handle) // SunOS4 does not automatically call _fini()! void *ptr; - ACE_OSCALL (::dlsym (handle, ACE_TEXT ("_fini")), void *, 0, ptr); + ACE_OSCALL (::dlsym (handle, ACE_LIB_TEXT ("_fini")), void *, 0, ptr); if (ptr != 0) (*((int (*)(void)) ptr)) (); // Call _fini hook explicitly. @@ -8637,7 +8666,7 @@ ACE_OS::dlopen (const ACE_TCHAR *fname, // Some systems (e.g., SunOS4) do not automatically call _init(), so // we'll have to call it manually. - ACE_OSCALL (::dlsym (handle, ACE_TEXT ("_init")), void *, 0, ptr); + ACE_OSCALL (::dlsym (handle, ACE_LIB_TEXT ("_init")), void *, 0, ptr); if (ptr != 0 && (*((int (*)(void)) ptr)) () == -1) // Call _init hook explicitly. { @@ -11033,8 +11062,8 @@ ACE_OS::mkdir (const ACE_TCHAR *path, mode_t mode) #endif /* ACE_HAS_PACE */ } -ACE_INLINE ACE_TCHAR * -ACE_OS::getenv (const ACE_TCHAR *symbol) +ACE_INLINE char * +ACE_OS::getenv (const char *symbol) { ACE_OS_TRACE ("ACE_OS::getenv"); #if defined (ACE_HAS_PACE) @@ -11042,13 +11071,19 @@ ACE_OS::getenv (const ACE_TCHAR *symbol) #elif defined (ACE_HAS_WINCE) || defined (ACE_PSOS) ACE_UNUSED_ARG (symbol); ACE_NOTSUP_RETURN (0); -#elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OSCALL_RETURN (::_wgetenv (symbol), ACE_TCHAR *, 0); #else /* ACE_HAS_WINCE || ACE_PSOS */ ACE_OSCALL_RETURN (::getenv (symbol), char *, 0); #endif /* symbol */ } +#if defined (ACE_HAS_WCHAR) && defined (ACE_WIN32) +ACE_INLINE wchar_t * +ACE_OS::getenv (const wchar_t *symbol) +{ + ACE_OSCALL_RETURN (::_wgetenv (symbol), wchar_t *, 0); +} +#endif /* ACE_HAS_WCHAR && ACE_WIN32 */ + ACE_INLINE int ACE_OS::putenv (const ACE_TCHAR *string) { @@ -11610,14 +11645,14 @@ ACE_OS::fopen_mode_to_open_mode_converter (ACE_TCHAR x, int &hmode) { switch (x) { - case ACE_TEXT ('r'): + case ACE_LIB_TEXT ('r'): if (ACE_BIT_DISABLED (hmode, _O_RDWR)) { ACE_CLR_BITS (hmode, _O_WRONLY); ACE_SET_BITS (hmode, _O_RDONLY); } break; - case ACE_TEXT ('w'): + case ACE_LIB_TEXT ('w'): if (ACE_BIT_DISABLED (hmode, _O_RDWR)) { ACE_CLR_BITS (hmode, _O_RDONLY); @@ -11625,7 +11660,7 @@ ACE_OS::fopen_mode_to_open_mode_converter (ACE_TCHAR x, int &hmode) } ACE_SET_BITS (hmode, _O_CREAT | _O_TRUNC); break; - case ACE_TEXT ('a'): + case ACE_LIB_TEXT ('a'): if (ACE_BIT_DISABLED (hmode, _O_RDWR)) { ACE_CLR_BITS (hmode, _O_RDONLY); @@ -11633,15 +11668,15 @@ ACE_OS::fopen_mode_to_open_mode_converter (ACE_TCHAR x, int &hmode) } ACE_SET_BITS (hmode, _O_CREAT | _O_APPEND); break; - case ACE_TEXT ('+'): + case ACE_LIB_TEXT ('+'): ACE_CLR_BITS (hmode, _O_RDONLY | _O_WRONLY); ACE_SET_BITS (hmode, _O_RDWR); break; - case ACE_TEXT ('t'): + case ACE_LIB_TEXT ('t'): ACE_CLR_BITS (hmode, _O_BINARY); ACE_SET_BITS (hmode, _O_TEXT); break; - case ACE_TEXT ('b'): + case ACE_LIB_TEXT ('b'): ACE_CLR_BITS (hmode, _O_TEXT); ACE_SET_BITS (hmode, _O_BINARY); break; @@ -11663,7 +11698,7 @@ ACE_OS::strenvdup (const ACE_TCHAR *str) #else ACE_TCHAR *temp = 0; - if (str[0] == ACE_TEXT ('$') + if (str[0] == ACE_LIB_TEXT ('$') && (temp = ACE_OS::getenv (&str[1])) != 0) return ACE_OS::strdup (temp); else diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp index f3bec50b9ff..69386704777 100644 --- a/ace/Object_Manager.cpp +++ b/ace/Object_Manager.cpp @@ -122,7 +122,7 @@ ACE_Object_Manager_Preallocations::ACE_Object_Manager_Preallocations (void) // service descriptors that are used for initialization below. #if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_OTHER) ACE_STATIC_SVC_DEFINE (ACE_Naming_Context_initializer, - ACE_TEXT ("ACE_Naming_Context"), + ACE_LIB_TEXT ("ACE_Naming_Context"), ACE_SVC_OBJ_T, &ACE_SVC_NAME (ACE_Naming_Context), ACE_Service_Type::DELETE_THIS | @@ -132,7 +132,7 @@ ACE_Object_Manager_Preallocations::ACE_Object_Manager_Preallocations (void) #endif /* ! ACE_HAS_WINCE && ! ACE_LACKS_ACE_OTHER */ ACE_STATIC_SVC_DEFINE (ACE_Service_Manager_initializer, - ACE_TEXT ("ACE_Service_Manager"), + ACE_LIB_TEXT ("ACE_Service_Manager"), ACE_SVC_OBJ_T, &ACE_SVC_NAME (ACE_Service_Manager), ACE_Service_Type::DELETE_THIS | diff --git a/ace/Obstack.cpp b/ace/Obstack.cpp index 5a92c271359..9eedd3e6327 100644 --- a/ace/Obstack.cpp +++ b/ace/Obstack.cpp @@ -16,9 +16,9 @@ ACE_Obstack::dump (void) const ACE_TRACE ("ACE_Obstack::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("size_ = %d\n"), this->size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("head_ = %x\n"), this->head_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("curr_ = %x\n"), this->curr_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("size_ = %d\n"), this->size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("head_ = %x\n"), this->head_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("curr_ = %x\n"), this->curr_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -30,8 +30,8 @@ ACE_Obchunk::dump (void) const ACE_TRACE ("ACE_Obchunk::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("end_ = %x\n"), this->end_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("cur_ = %x\n"), this->cur_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("end_ = %x\n"), this->end_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("cur_ = %x\n"), this->cur_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/POSIX_Asynch_IO.cpp b/ace/POSIX_Asynch_IO.cpp index 779e1aa23b3..e51aa4514e7 100644 --- a/ace/POSIX_Asynch_IO.cpp +++ b/ace/POSIX_Asynch_IO.cpp @@ -2023,7 +2023,7 @@ ACE_POSIX_AIOCB_Asynch_Accept::accept (ACE_Message_Block &message_block, size_t available_space = total_size - space_in_use; size_t space_needed = bytes_to_read + 2 * address_size; if (available_space < space_needed) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Buffer too small\n")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("Buffer too small\n")), -1); // Common code for both WIN and POSIX. ACE_POSIX_Asynch_Accept_Result *result = 0; @@ -2167,7 +2167,7 @@ ACE_POSIX_SIG_Asynch_Accept::accept (ACE_Message_Block &message_block, size_t available_space = total_size - space_in_use; size_t space_needed = bytes_to_read + 2 * address_size; if (available_space < space_needed) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Buffer too small\n")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("Buffer too small\n")), -1); // Common code for both WIN and POSIX. ACE_POSIX_Asynch_Accept_Result *result = 0; diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp index 1bb269ca593..69dd85ef66a 100644 --- a/ace/Parse_Node.cpp +++ b/ace/Parse_Node.cpp @@ -33,7 +33,7 @@ ACE_Stream_Node::apply (void) if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("did stream on %s, error = %d\n"), + ACE_LIB_TEXT ("did stream on %s, error = %d\n"), this->node_->name (), ace_yyerrno)); } @@ -71,11 +71,11 @@ ACE_Stream_Node::ACE_Stream_Node (const ACE_Static_Node *str_ops, const ACE_Parse_Node *str_mods) #if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) : ACE_Parse_Node (str_ops == 0 ? ACE_static_cast (ACE_TCHAR *, - ACE_TEXT ("<unknown>")) + ACE_LIB_TEXT ("<unknown>")) : ACE_static_cast (ACE_TCHAR *, str_ops->name ())), #else - : ACE_Parse_Node ((str_ops == 0 ? ACE_TEXT ("<unknown>") : str_ops->name ())), + : ACE_Parse_Node ((str_ops == 0 ? ACE_LIB_TEXT ("<unknown>") : str_ops->name ())), #endif /* defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ node_ (str_ops), mods_ (str_mods) @@ -116,7 +116,7 @@ ACE_Parse_Node::print (void) const ACE_TRACE ("ACE_Parse_Node::print"); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("svc = %s\n"), + ACE_LIB_TEXT ("svc = %s\n"), this->name ())); if (this->next_) @@ -169,7 +169,7 @@ ACE_Suspend_Node::apply (void) if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("did suspend on %s, error = %d\n"), + ACE_LIB_TEXT ("did suspend on %s, error = %d\n"), this->name (), ace_yyerrno)); } @@ -183,7 +183,7 @@ ACE_Resume_Node::apply (void) if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("did resume on %s, error = %d\n"), + ACE_LIB_TEXT ("did resume on %s, error = %d\n"), this->name (), ace_yyerrno)); } @@ -211,7 +211,7 @@ ACE_Remove_Node::apply (void) if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("did remove on %s, error = %d\n"), + ACE_LIB_TEXT ("did remove on %s, error = %d\n"), this->name (), ace_yyerrno)); } @@ -242,7 +242,7 @@ ACE_Dynamic_Node::apply (void) if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("did dynamic on %s, error = %d\n"), + ACE_LIB_TEXT ("did dynamic on %s, error = %d\n"), this->name (), ace_yyerrno)); } @@ -307,7 +307,7 @@ ACE_Static_Node::apply (void) if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("did static on %s, error = %d\n"), + ACE_LIB_TEXT ("did static on %s, error = %d\n"), this->name (), ace_yyerrno)); } @@ -406,19 +406,19 @@ ACE_Location_Node::open_handle (void) ace_yyerrno++; ACE_ERROR ((LM_ERROR, - ACE_TEXT ("dlopen failed for %s"), + ACE_LIB_TEXT ("dlopen failed for %s"), dl_pathname)); ACE_TCHAR *errmsg = ACE_OS::dlerror (); if (errmsg != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (": %s\n"), + ACE_LIB_TEXT (": %s\n"), errmsg), 0); else ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("\n")), + ACE_LIB_TEXT ("\n")), 0); } else @@ -459,19 +459,19 @@ ACE_Object_Node::symbol (ACE_Service_Object_Exterminator *) ace_yyerrno++; ACE_ERROR ((LM_ERROR, - ACE_TEXT ("dlsym failed for object %s\n"), + ACE_LIB_TEXT ("dlsym failed for object %s\n"), object_name)); ACE_TCHAR *errmsg = ACE_OS::dlerror (); if (errmsg != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (": %s\n"), + ACE_LIB_TEXT (": %s\n"), errmsg), 0); else ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("\n")), + ACE_LIB_TEXT ("\n")), 0); } return this->symbol_; @@ -545,19 +545,19 @@ ACE_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler) ace_yyerrno++; ACE_ERROR ((LM_ERROR, - ACE_TEXT ("dlsym failed for function %s\n"), + ACE_LIB_TEXT ("dlsym failed for function %s\n"), function_name)); ACE_TCHAR *errmsg = ACE_OS::dlerror (); if (errmsg != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (": %s\n"), + ACE_LIB_TEXT (": %s\n"), errmsg), 0); else ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("\n")), + ACE_LIB_TEXT ("\n")), 0); } } @@ -568,7 +568,7 @@ ACE_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler) { ace_yyerrno++; ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), + ACE_LIB_TEXT ("%p\n"), this->function_name_), 0); } @@ -606,7 +606,7 @@ ACE_Dummy_Node::apply (void) if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("did operations on stream %s, error = %d\n"), + ACE_LIB_TEXT ("did operations on stream %s, error = %d\n"), this->name (), ace_yyerrno)); } @@ -671,7 +671,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler) ace_yyerrno++; ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("no static service registered for function %s\n"), + ACE_LIB_TEXT ("no static service registered for function %s\n"), function_name), 0); } @@ -684,7 +684,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler) { ace_yyerrno++; ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), + ACE_LIB_TEXT ("%p\n"), this->function_name_), 0); } diff --git a/ace/Pipe.cpp b/ace/Pipe.cpp index c42ce929e28..1cc4153861b 100644 --- a/ace/Pipe.cpp +++ b/ace/Pipe.cpp @@ -16,9 +16,9 @@ ACE_Pipe::dump (void) const { ACE_TRACE ("ACE_Pipe::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handles_[0] = %d"), this->handles_[0])); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandles_[1] = %d"), this->handles_[1])); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("handles_[0] = %d"), this->handles_[0])); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhandles_[1] = %d"), this->handles_[1])); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -106,8 +106,8 @@ ACE_Pipe::open (int buffer_size) ACE_UNUSED_ARG (buffer_size); if (ACE_OS::pipe (this->handles_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("pipe")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("pipe")), -1); int arg = RMSGN; @@ -122,8 +122,8 @@ ACE_Pipe::open (int buffer_size) { this->close (); ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ioctl")), -1); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ioctl")), -1); } #else /* ! ACE_WIN32 && ! ACE_LACKS_SOCKETPAIR && ! ACE_HAS_STREAM_PIPES */ if (ACE_OS::socketpair (AF_UNIX, @@ -131,8 +131,8 @@ ACE_Pipe::open (int buffer_size) 0, this->handles_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("socketpair")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("socketpair")), -1); # if defined (ACE_LACKS_SOCKET_BUFSIZ) ACE_UNUSED_ARG (buffer_size); @@ -197,7 +197,7 @@ ACE_Pipe::ACE_Pipe (ACE_HANDLE handles[2]) if (this->open (handles) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_Pipe::ACE_Pipe"))); + ACE_LIB_TEXT ("ACE_Pipe::ACE_Pipe"))); } ACE_Pipe::ACE_Pipe (ACE_HANDLE read, diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp index 1f4f74fb0ae..2a8049416b2 100644 --- a/ace/Proactor.cpp +++ b/ace/Proactor.cpp @@ -149,8 +149,8 @@ ACE_Proactor_Timer_Handler::svc (void) default: // Error. ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%N:%l:(%P | %t):%p\n"), - ACE_TEXT ("ACE_Proactor_Timer_Handler::svc:wait failed")), + ACE_LIB_TEXT ("%N:%l:(%P | %t):%p\n"), + ACE_LIB_TEXT ("ACE_Proactor_Timer_Handler::svc:wait failed")), -1); } } @@ -175,8 +175,8 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (TIMER_QUEUE &timer_queue, if (this->proactor_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%t) No Proactor set in ACE_Proactor_Handle_Timeout_Upcall,") - ACE_TEXT (" no completion port to post timeout to?!@\n")), + ACE_LIB_TEXT ("(%t) No Proactor set in ACE_Proactor_Handle_Timeout_Upcall,") + ACE_LIB_TEXT (" no completion port to post timeout to?!@\n")), -1); // Create the Asynch_Timer. @@ -188,16 +188,16 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (TIMER_QUEUE &timer_queue, -1); if (asynch_timer == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%N:%l:(%P | %t):%p\n"), - ACE_TEXT ("ACE_Proactor_Handle_Timeout_Upcall::timeout:") - ACE_TEXT ("create_asynch_timer failed")), + ACE_LIB_TEXT ("%N:%l:(%P | %t):%p\n"), + ACE_LIB_TEXT ("ACE_Proactor_Handle_Timeout_Upcall::timeout:") + ACE_LIB_TEXT ("create_asynch_timer failed")), -1); // Post a completion. if (asynch_timer->post_completion (this->proactor_->implementation ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Failure in dealing with timers: ") - ACE_TEXT ("PostQueuedCompletionStatus failed\n")), + ACE_LIB_TEXT ("Failure in dealing with timers: ") + ACE_LIB_TEXT ("PostQueuedCompletionStatus failed\n")), -1); return 0; } @@ -236,8 +236,8 @@ ACE_Proactor_Handle_Timeout_Upcall::proactor (ACE_Proactor &proactor) } else ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("ACE_Proactor_Handle_Timeout_Upcall is only suppose") - ACE_TEXT (" to be used with ONE (and only one) Proactor\n")), + ACE_LIB_TEXT ("ACE_Proactor_Handle_Timeout_Upcall is only suppose") + ACE_LIB_TEXT (" to be used with ONE (and only one) Proactor\n")), -1); } @@ -287,8 +287,8 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation, // Activate <timer_handler>. if (this->timer_handler_->activate (THR_NEW_LWP | THR_DETACHED) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%N:%l:(%P | %t):%p\n"), - ACE_TEXT ("Task::activate:could not create thread\n"))); + ACE_LIB_TEXT ("%N:%l:(%P | %t):%p\n"), + ACE_LIB_TEXT ("Task::activate:could not create thread\n"))); } ACE_Proactor::~ACE_Proactor (void) @@ -550,8 +550,8 @@ ACE_Proactor::close (void) // Close the implementation. if (this->implementation ()->close () == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%N:%l:(%P | %t):%p\n"), - ACE_TEXT ("ACE_Proactor::close:implementation couldnt be closed")), + ACE_LIB_TEXT ("%N:%l:(%P | %t):%p\n"), + ACE_LIB_TEXT ("ACE_Proactor::close:implementation couldnt be closed")), -1); // Delete the implementation. diff --git a/ace/Process.cpp b/ace/Process.cpp index 78dd8c3aa4a..745f81602f4 100644 --- a/ace/Process.cpp +++ b/ace/Process.cpp @@ -122,8 +122,8 @@ ACE_Process::spawn (ACE_Process_Options &options) && ACE_OS::setpgid (0, options.getgroup ()) < 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p.\n"), - ACE_TEXT ("ACE_Process::spawn: setpgid failed."))); + ACE_LIB_TEXT ("%p.\n"), + ACE_LIB_TEXT ("ACE_Process::spawn: setpgid failed."))); #if !defined (ACE_LACKS_SETREUID) // Set user and group id's. @@ -132,8 +132,8 @@ ACE_Process::spawn (ACE_Process_Options &options) if (ACE_OS::setreuid (options.getruid (), options.geteuid ()) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p.\n"), - ACE_TEXT ("ACE_Process::spawn: setreuid failed."))); + ACE_LIB_TEXT ("%p.\n"), + ACE_LIB_TEXT ("ACE_Process::spawn: setreuid failed."))); #endif /* ACE_LACKS_SETREUID */ #if !defined (ACE_LACKS_SETREGID) @@ -142,8 +142,8 @@ ACE_Process::spawn (ACE_Process_Options &options) if (ACE_OS::setregid (options.getrgid (), options.getegid ()) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p.\n"), - ACE_TEXT ("ACE_Process::spawn: setregid failed."))); + ACE_LIB_TEXT ("%p.\n"), + ACE_LIB_TEXT ("ACE_Process::spawn: setregid failed."))); #endif /* ACE_LACKS_SETREGID */ this->child (ACE_OS::getppid ()); @@ -415,8 +415,8 @@ ACE_Process_Options::inherit_environment (void) if (this->setenv_i (existing_environment + slot, len) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p.\n"), - ACE_TEXT ("ACE_Process_Options::ACE_Process_Options"))); + ACE_LIB_TEXT ("%p.\n"), + ACE_LIB_TEXT ("ACE_Process_Options::ACE_Process_Options"))); break; } @@ -494,7 +494,7 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name, // Add in the variable name. ACE_OS::sprintf (newformat, - ACE_TEXT ("%s=%s"), + ACE_LIB_TEXT ("%s=%s"), variable_name, format); @@ -642,7 +642,7 @@ ACE_Process_Options::command_line (const ACE_TCHAR *const argv[]) while (argv[++i]) { ACE_OS::strcat (command_line_buf_, - ACE_TEXT (" ")); + ACE_LIB_TEXT (" ")); ACE_OS::strcat (command_line_buf_, argv[i]); } diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp index c1ad25e1849..afde854da19 100644 --- a/ace/Process_Manager.cpp +++ b/ace/Process_Manager.cpp @@ -68,7 +68,7 @@ ACE_Process_Descriptor::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nproc_id_ = %d"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nproc_id_ = %d"), this->process_->getpid( ))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -81,8 +81,8 @@ ACE_Process_Manager::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmax_process_table_size_ = %d"), this->max_process_table_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncurrent_count_ = %d"), this->current_count_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmax_process_table_size_ = %d"), this->max_process_table_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncurrent_count_ = %d"), this->current_count_)); for (size_t i = 0; i < this->current_count_; i++) this->process_table_[i].dump (); @@ -190,9 +190,9 @@ ACE_Process_Manager::open (size_t size, // for them. if (ACE_OS::setpgid (0, 0) == -1) ACE_ERROR ((LM_WARNING, - ACE_TEXT ("%p.\n"), - ACE_TEXT ("ACE_Process_Manager::open: can't create a ") - ACE_TEXT ("process group; some wait functions may fail"))); + ACE_LIB_TEXT ("%p.\n"), + ACE_LIB_TEXT ("ACE_Process_Manager::open: can't create a ") + ACE_LIB_TEXT ("process group; some wait functions may fail"))); #endif /* ACE_LACKS_SETPGID */ if (r) @@ -234,8 +234,8 @@ ACE_Process_Manager::ACE_Process_Manager (size_t size, if (this->open (size, r) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Process_Manager"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Process_Manager"))); } // Close up and release all resources. @@ -340,15 +340,15 @@ ACE_Process_Manager::handle_signal (int, } else ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Process still active") - ACE_TEXT (" -- shouldn't have been called yet!\n")), + ACE_LIB_TEXT ("Process still active") + ACE_LIB_TEXT (" -- shouldn't have been called yet!\n")), 0); // return 0 : stay registered } else { // <GetExitCodeProcess> failed. ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("GetExitCodeProcess failed")), + ACE_LIB_TEXT ("GetExitCodeProcess failed")), -1); // return -1: unregister } #else /* !ACE_WIN32 */ @@ -789,8 +789,8 @@ ACE_Process_Manager::wait (pid_t pid, // we're holding a lock! delete [] handles; ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Process removed") - ACE_TEXT (" -- somebody's ignoring the lock!\n")), + ACE_LIB_TEXT ("Process removed") + ACE_LIB_TEXT (" -- somebody's ignoring the lock!\n")), -1); } } @@ -851,7 +851,7 @@ ACE_Process_Manager::wait (pid_t pid, { // oops, reaped an unmanaged process! ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) oops, reaped unmanaged %d\n"), + ACE_LIB_TEXT ("(%P|%t) oops, reaped unmanaged %d\n"), pid)); return pid; } @@ -915,8 +915,8 @@ ACE_Process_Manager::notify_proc_handler (size_t i, else { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P:%t|%T) ACE_Process_Manager::notify_proc_handler:"), - ACE_TEXT (" unknown/unmanaged process reaped\n"))); + ACE_LIB_TEXT ("(%P:%t|%T) ACE_Process_Manager::notify_proc_handler:"), + ACE_LIB_TEXT (" unknown/unmanaged process reaped\n"))); return 0; } } diff --git a/ace/QoS_Manager.cpp b/ace/QoS_Manager.cpp index ba7c77e8c9c..8ca3f5a2947 100644 --- a/ace/QoS_Manager.cpp +++ b/ace/QoS_Manager.cpp @@ -22,8 +22,8 @@ ACE_QoS_Manager::join_qos_session (ACE_QoS_Session *qos_session) { if (this->qos_session_set ().insert (qos_session) != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Error in adding a new session to the ") - ACE_TEXT ("socket session set\n")), + ACE_LIB_TEXT ("Error in adding a new session to the ") + ACE_LIB_TEXT ("socket session set\n")), -1); return 0; } diff --git a/ace/QoS_Session_Factory.cpp b/ace/QoS_Session_Factory.cpp index 2016a65baf1..422f9a9a7be 100644 --- a/ace/QoS_Session_Factory.cpp +++ b/ace/QoS_Session_Factory.cpp @@ -42,7 +42,7 @@ ACE_QoS_Session_Factory::create_session (ACE_QoS_Session_Type qos_session_type) { delete qos_session; ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Error in adding session\n")), + ACE_LIB_TEXT ("Error in adding session\n")), 0); } @@ -56,7 +56,7 @@ ACE_QoS_Session_Factory::destroy_session (ACE_QoS_Session *qos_session) if ((qos_session != 0) && (this->remove_session (qos_session) == -1)) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Error in destroying session\n")), + ACE_LIB_TEXT ("Error in destroying session\n")), -1); return 0; @@ -69,8 +69,8 @@ ACE_QoS_Session_Factory::add_session (ACE_QoS_Session *qos_session) { if (this->qos_session_set_.insert (qos_session) != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Error in adding a new session") - ACE_TEXT ("to the session set\n")), + ACE_LIB_TEXT ("Error in adding a new session") + ACE_LIB_TEXT ("to the session set\n")), -1); return 0; @@ -83,8 +83,8 @@ ACE_QoS_Session_Factory::remove_session (ACE_QoS_Session *qos_session) { if (this->qos_session_set_.remove (qos_session) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Error in removing a session") - ACE_TEXT ("from the session set\n")), + ACE_LIB_TEXT ("Error in removing a session") + ACE_LIB_TEXT ("from the session set\n")), -1); return 0; diff --git a/ace/QoS_Session_Impl.cpp b/ace/QoS_Session_Impl.cpp index 08e900cacb1..51033117f5e 100644 --- a/ace/QoS_Session_Impl.cpp +++ b/ace/QoS_Session_Impl.cpp @@ -510,8 +510,8 @@ ACE_GQoS_Session::qos (ACE_SOCK *socket, if (qos_manager->qos_session_set ().find (this) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("This QoS session was not subscribed to") - ACE_TEXT (" by the socket\n")), + ACE_LIB_TEXT ("This QoS session was not subscribed to") + ACE_LIB_TEXT (" by the socket\n")), -1); // Set the QOS according to the supplied ACE_QoS. The I/O control @@ -525,12 +525,12 @@ ACE_GQoS_Session::qos (ACE_SOCK *socket, qos, &ret_bytes) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Error in Qos set ACE_OS::ioctl() %d\n"), + ACE_LIB_TEXT ("Error in Qos set ACE_OS::ioctl() %d\n"), ret_bytes), -1); else ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Setting QoS with ACE_OS::ioctl () succeeds \n"))); + ACE_LIB_TEXT ("Setting QoS with ACE_OS::ioctl () succeeds \n"))); return 0; } diff --git a/ace/RB_Tree.cpp b/ace/RB_Tree.cpp index 7a95a277662..778cfba549c 100644 --- a/ace/RB_Tree.cpp +++ b/ace/RB_Tree.cpp @@ -58,7 +58,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree (ACE_Allocator "ACE_RB_Tree (ACE_Allocator *alloc)"); if (this->open (alloc) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_RB_Tree::ACE_RB_Tree\n"))); + ACE_LIB_TEXT ("ACE_RB_Tree::ACE_RB_Tree\n"))); } // Copy constructor. @@ -138,14 +138,14 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_right (ACE_RB_Tre if (! x) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("\nerror: x is a null pointer in ") - ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("\nerror: x is a null pointer in ") + ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n"))); else if (! (x->left())) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("\nerror: x->left () is a null pointer in ") - ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("\nerror: x->left () is a null pointer in ") + ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n"))); else { ACE_RB_Tree_Node<EXT_ID, INT_ID> * y; @@ -177,14 +177,14 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_left (ACE_RB_Tree if (! x) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("\nerror: x is a null pointer in ") - ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("\nerror: x is a null pointer in ") + ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n"))); else if (! (x->right())) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("\nerror: x->right () is a null pointer ") - ACE_TEXT ("in ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("\nerror: x->right () is a null pointer ") + ACE_LIB_TEXT ("in ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n"))); else { ACE_RB_Tree_Node<EXT_ID, INT_ID> * y; @@ -383,9 +383,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rebalance (ACE_RB_Tree_N { // If we got here, something is drastically wrong! ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("\nerror: parent's parent is null in ") - ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rebalance\n"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("\nerror: parent's parent is null in ") + ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rebalance\n"))); return; } @@ -581,9 +581,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, if (current->right ()) // If there is already a right subtree, complain. ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("\nright subtree already present in ") - ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("\nright subtree already present in ") + ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0); else { @@ -613,9 +613,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, if (current->left ()) // If there is already a left subtree, complain. ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("\nleft subtree already present in ") - ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("\nleft subtree already present in ") + ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0); else { @@ -692,9 +692,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, { // If there is already a right subtree, complain. ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("\nright subtree already present in ") - ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("\nright subtree already present in ") + ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1); } else @@ -724,9 +724,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, if (current->left ()) // If there is already a left subtree, complain. ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("\nleft subtree already present in ") - ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("\nleft subtree already present in ") + ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1); else { diff --git a/ace/RB_Tree.i b/ace/RB_Tree.i index 23014a4ffc3..8eb8551e966 100644 --- a/ace/RB_Tree.i +++ b/ace/RB_Tree.i @@ -584,7 +584,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const { ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncurrent_size_ = %d"), this->current_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncurrent_size_ = %d"), this->current_size_)); this->allocator_->dump (); this->lock_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -827,7 +827,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i (void) ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("node_ = %x"), this->node_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("node_ = %x"), this->node_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Read_Buffer.cpp b/ace/Read_Buffer.cpp index 1c599c31404..f232eb9f6b2 100644 --- a/ace/Read_Buffer.cpp +++ b/ace/Read_Buffer.cpp @@ -14,10 +14,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, ACE_TEXT ("size_ = %d"), this->size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\noccurrences_ = %d"), this->occurrences_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nstream_ = %x"), this->stream_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nallocator_ = %x"), this->allocator_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("size_ = %d"), this->size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\noccurrences_ = %d"), this->occurrences_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nstream_ = %x"), this->stream_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nallocator_ = %x"), this->allocator_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -36,7 +36,7 @@ ACE_Read_Buffer::ACE_Read_Buffer (FILE *fp, ACE_Read_Buffer::ACE_Read_Buffer (ACE_HANDLE handle, int close_on_delete, ACE_Allocator *alloc) - : stream_ (ACE_OS::fdopen (handle, ACE_TEXT ("r"))), + : stream_ (ACE_OS::fdopen (handle, ACE_LIB_TEXT ("r"))), close_on_delete_ (close_on_delete), allocator_ (alloc) { diff --git a/ace/Registry.cpp b/ace/Registry.cpp index 6c0706dc7d9..aba7b6f8557 100644 --- a/ace/Registry.cpp +++ b/ace/Registry.cpp @@ -22,7 +22,7 @@ ACE_RCSID(ace, Registry, "$Id$") // Separator for components in a name /* static */ -const ACE_TCHAR *ACE_Registry::STRING_SEPARATOR = ACE_TEXT ("\\"); +const ACE_TCHAR *ACE_Registry::STRING_SEPARATOR = ACE_LIB_TEXT ("\\"); int ACE_Registry::Name_Component::operator== (const Name_Component &rhs) const @@ -1088,7 +1088,7 @@ ACE_Predefined_Naming_Contexts::connect (ACE_Registry::Naming_Context &naming_co { long result = -1; - if (machine_name != 0 && ACE_OS::strcmp (ACE_TEXT ("localhost"), machine_name) == 0) + if (machine_name != 0 && ACE_OS::strcmp (ACE_LIB_TEXT ("localhost"), machine_name) == 0) machine_name = 0; if (predefined == HKEY_LOCAL_MACHINE || predefined == HKEY_USERS) diff --git a/ace/Registry_Name_Space.cpp b/ace/Registry_Name_Space.cpp index a16c972691b..56a396bbc73 100644 --- a/ace/Registry_Name_Space.cpp +++ b/ace/Registry_Name_Space.cpp @@ -14,8 +14,8 @@ 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, ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Registry_Name_Space::open"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Registry_Name_Space::open"))); } @@ -34,8 +34,8 @@ ACE_Registry_Name_Space::open (ACE_Name_Options *name_options) HKEY_LOCAL_MACHINE, host); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Predefined_Naming_Context::connect")), + ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Predefined_Naming_Context::connect")), result); else { @@ -50,7 +50,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, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Registry::Naming_Context::bind_context")), result); + ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_Registry::Naming_Context::bind_context")), result); } return 0; } @@ -218,7 +218,7 @@ ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set, value, type); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Registry::Naming_Context::resolve")), result); + ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_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 e160a153a3e..a7e7e754b98 100644 --- a/ace/Remote_Name_Space.cpp +++ b/ace/Remote_Name_Space.cpp @@ -34,7 +34,7 @@ ACE_Remote_Name_Space::ACE_Remote_Name_Space (const ACE_TCHAR *hostname, { ACE_TRACE ("ACE_Remote_Name_Space::ACE_Remote_Name_Space"); if (this->open (hostname, port) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Remote_Name_Space::ACE_Remote_Name_Space"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_Remote_Name_Space::ACE_Remote_Name_Space"))); } int @@ -133,8 +133,8 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set, { if (this->ns_proxy_.recv_reply (reply) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Remote_Name_Space::list_names")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Remote_Name_Space::list_names")), -1); if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { @@ -165,8 +165,8 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set, { if (this->ns_proxy_.recv_reply (reply) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Remote_Name_Space::list_values")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Remote_Name_Space::list_values")), -1); if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { @@ -199,8 +199,8 @@ ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set, { if (this->ns_proxy_.recv_reply (reply) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Remote_Name_Space::list_values")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Remote_Name_Space::list_values")), -1); if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { @@ -232,8 +232,8 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set, { if (this->ns_proxy_.recv_reply (reply) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Remote_Name_Space::list_names")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Remote_Name_Space::list_names")), -1); if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { @@ -271,8 +271,8 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set, { if (this->ns_proxy_.recv_reply (reply) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Remote_Name_Space::list_values")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Remote_Name_Space::list_values")), -1); if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { @@ -310,8 +310,8 @@ ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set, { if (this->ns_proxy_.recv_reply (reply) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Remote_Name_Space::list_values")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Remote_Name_Space::list_values")), -1); if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { diff --git a/ace/Remote_Tokens.cpp b/ace/Remote_Tokens.cpp index 4d496b0f516..504b6319e65 100644 --- a/ace/Remote_Tokens.cpp +++ b/ace/Remote_Tokens.cpp @@ -67,7 +67,7 @@ ACE_TSS_Connection::make_TSS_TYPE (void) const return 0; } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TSS_Connection new connection\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_TSS_Connection new connection\n"))); return stream; } @@ -81,10 +81,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_TEXT ("ACE_TSS_Connection::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("server_address_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_TSS_Connection::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("server_address_\n"))); server_address_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); ACE_TSS<ACE_SOCK_Stream>::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -124,7 +124,7 @@ ACE_Remote_Token_Proxy::initiate_connection (void) { errno = ENOENT; ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("ACE_Remote_Token_Proxy not open.\n")), -1); + ACE_LIB_TEXT ("ACE_Remote_Token_Proxy not open.\n")), -1); } ACE_SOCK_Stream *peer = ACE_Token_Connections::instance ()->get_connection (); @@ -142,7 +142,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, ACE_TEXT ("%p\n"), ACE_TEXT ("encode failed")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("encode failed")), -1); ACE_SOCK_Stream *peer = ACE_Token_Connections::instance ()->get_connection (); @@ -152,7 +152,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, ACE_TEXT ("%p\n"), ACE_TEXT ("send_n failed")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("send_n failed")), -1); else { ACE_Token_Reply reply; @@ -160,10 +160,10 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request, // Receive reply via blocking read. if (peer->recv (&reply, sizeof reply) != sizeof reply) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("recv failed")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("recv failed")), -1); if (reply.decode () == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("decode failed")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("decode failed")), -1); errno = int (reply.errnum ()); if (errno != 0) @@ -191,14 +191,14 @@ ACE_Remote_Token_Proxy::acquire (int notify, case EWOULDBLOCK : // Whoah, we detected wouldblock via the shadow mutex! if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) shadow: acquire will block, owner is %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_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, ACE_TEXT ("(%t) shadow: deadlock detected\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) shadow: deadlock detected\n"))); if (ignore_shadow_deadlock_) break; @@ -210,8 +210,8 @@ ACE_Remote_Token_Proxy::acquire (int notify, default : ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%t) %p shadow acquire failed\n"), - ACE_TEXT ("ACE_Remote_Token_Proxy")), + ACE_LIB_TEXT ("(%t) %p shadow acquire failed\n"), + ACE_LIB_TEXT ("ACE_Remote_Token_Proxy")), -1); } } @@ -230,12 +230,12 @@ ACE_Remote_Token_Proxy::acquire (int notify, if (result == -1) { // Update the local shadow copy. - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("error on remote acquire, releasing shadow mutex.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("error on remote acquire, releasing shadow mutex.\n"))); ACE_Token_Proxy::release (); } else { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) acquired %s remotely.\n"), this->name ())); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_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 @@ -261,7 +261,7 @@ ACE_Remote_Token_Proxy::tryacquire (void (*sleep_hook)(void *)) // Save/restore errno. ACE_Errno_Guard error (errno); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("shadow try acquire failed\n"))); + ACE_LIB_TEXT ("shadow try acquire failed\n"))); } return -1; @@ -292,7 +292,7 @@ ACE_Remote_Token_Proxy::renew (int requeue_position, return -1; else if (debug_) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) shadow: renew would block. owner %s.\n"), + ACE_LIB_TEXT ("(%t) shadow: renew would block. owner %s.\n"), this->token_->owner_id ())); } @@ -315,13 +315,13 @@ ACE_Remote_Token_Proxy::renew (int requeue_position, ACE_Token_Proxy::release (); } ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p error on remote renew, releasing shadow mutex.\n"), - ACE_TEXT ("ACE_Remote_Token_Proxy")), -1); + ACE_LIB_TEXT ("%p error on remote renew, releasing shadow mutex.\n"), + ACE_LIB_TEXT ("ACE_Remote_Token_Proxy")), -1); } else { if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) renewed %s remotely.\n"), this->name ())); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) renewed %s remotely.\n"), this->name ())); // Make sure that the local shadow reflects our new ownership. token_->make_owner (waiter_); return result; @@ -342,13 +342,13 @@ ACE_Remote_Token_Proxy::release (ACE_Synch_Options &options) int result = this->request_reply (request, options); if (result == 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) released %s remotely.\n"), this->name ())); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_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, // this release will perform a remove. if (ACE_Token_Proxy::release () == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) shadow: release failed\n"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("(%t) shadow: release failed\n"))); return result; } @@ -364,7 +364,7 @@ void ACE_Remote_Token_Proxy::token_acquired (ACE_TPQ_Entry *) { ACE_TRACE ("ACE_Remote_Token_Proxy::token_acquired"); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) shadow token %s acquired\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) shadow token %s acquired\n"), this->client_id (), this->name ())); // ACE_Token_Proxy::token_acquired (vp); @@ -374,7 +374,7 @@ const ACE_TCHAR* ACE_Remote_Token_Proxy::owner_id (void) { ACE_TRACE ("ACE_Remote_Token_Proxy::owner_id"); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_id called\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("owner_id called\n"))); // @@ special operation return 0; } @@ -384,10 +384,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_TEXT ("ACE_Tokens::dump:\n") - ACE_TEXT (" ignore_shadow_deadlock_ = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Tokens::dump:\n") + ACE_LIB_TEXT (" ignore_shadow_deadlock_ = %d\n"), ignore_shadow_deadlock_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); ACE_Token_Proxy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -397,8 +397,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_TEXT ("ACE_Remote_Mutex::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Remote_Mutex::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); ACE_Remote_Token_Proxy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -408,8 +408,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_TEXT ("ACE_Remote_RLock::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Remote_RLock::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); ACE_Remote_Token_Proxy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -419,8 +419,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_TEXT ("ACE_Remote_WLock::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Remote_WLock::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); ACE_Remote_Token_Proxy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/SOCK.cpp b/ace/SOCK.cpp index 6ea4e602a50..cc970c0da67 100644 --- a/ace/SOCK.cpp +++ b/ace/SOCK.cpp @@ -120,8 +120,8 @@ ACE_SOCK::ACE_SOCK (int type, protocol, reuse_addr) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_SOCK::ACE_SOCK"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SOCK::ACE_SOCK"))); } int @@ -175,6 +175,6 @@ ACE_SOCK::ACE_SOCK (int type, flags, reuse_addr) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_SOCK::ACE_SOCK"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SOCK::ACE_SOCK"))); } diff --git a/ace/SOCK_Acceptor.cpp b/ace/SOCK_Acceptor.cpp index 1e21fd60901..2bdff4c00a4 100644 --- a/ace/SOCK_Acceptor.cpp +++ b/ace/SOCK_Acceptor.cpp @@ -298,8 +298,8 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap, backlog, protocol) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_SOCK_Acceptor"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SOCK_Acceptor"))); } // General purpose routine for performing server ACE_SOCK creation. @@ -339,6 +339,6 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap, backlog, protocol) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_SOCK_Acceptor"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SOCK_Acceptor"))); } diff --git a/ace/SOCK_CODgram.cpp b/ace/SOCK_CODgram.cpp index 980d369fd64..217257158fe 100644 --- a/ace/SOCK_CODgram.cpp +++ b/ace/SOCK_CODgram.cpp @@ -27,7 +27,7 @@ ACE_SOCK_CODgram::ACE_SOCK_CODgram (const ACE_Addr &remote, const ACE_Addr &loca ACE_TRACE ("ACE_SOCK_CODgram::ACE_SOCK_CODgram"); if (this->open (remote, local, protocol_family, protocol, reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_CODgram"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SOCK_CODgram"))); } /* This is the general-purpose open routine. Note that it performs diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp index cd049d21583..6006bef20c1 100644 --- a/ace/SOCK_Connector.cpp +++ b/ace/SOCK_Connector.cpp @@ -277,8 +277,8 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); } ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, @@ -311,6 +311,6 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); } diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp index 9f3bace3f13..15c37000484 100644 --- a/ace/SOCK_Dgram.cpp +++ b/ace/SOCK_Dgram.cpp @@ -176,8 +176,8 @@ ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, protocol, reuse_addr) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_SOCK_Dgram"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SOCK_Dgram"))); } ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, @@ -197,8 +197,8 @@ ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, flags, reuse_addr) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_SOCK_Dgram"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SOCK_Dgram"))); } #if defined (ACE_HAS_MSG) diff --git a/ace/SOCK_Dgram_Bcast.cpp b/ace/SOCK_Dgram_Bcast.cpp index ba2511953d4..5be4c25f0ae 100644 --- a/ace/SOCK_Dgram_Bcast.cpp +++ b/ace/SOCK_Dgram_Bcast.cpp @@ -70,8 +70,8 @@ ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast (const ACE_Addr &local, if (this->mk_broadcast (host_name) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_SOCK_Dgram_Bcast"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SOCK_Dgram_Bcast"))); } // Here's the general-purpose open routine. diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp index b0ab087cc30..a677a516411 100644 --- a/ace/SOCK_Dgram_Mcast.cpp +++ b/ace/SOCK_Dgram_Mcast.cpp @@ -125,7 +125,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr, { if (this->subscribe (mcast_addr, reuse_addr, - ACE_TEXT ("0.0.0.0"), + ACE_LIB_TEXT ("0.0.0.0"), protocol_family, protocol) == 0) ++nr_subscribed; @@ -260,7 +260,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, if (if_cnt < 2) { if (this->unsubscribe (mcast_addr, - ACE_TEXT ("0.0.0.0"), + ACE_LIB_TEXT ("0.0.0.0"), protocol_family, protocol) == 0) ++nr_unsubscribed; diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h index a9a824e84ea..1d11961d3ef 100644 --- a/ace/SOCK_Dgram_Mcast.h +++ b/ace/SOCK_Dgram_Mcast.h @@ -160,12 +160,12 @@ private: protected: int make_multicast_address (const ACE_INET_Addr &mcast_addr, - const ACE_TCHAR *net_if = ACE_TEXT ("le0")); + const ACE_TCHAR *net_if = ACE_LIB_TEXT ("le0")); // Initialize the <multicast_address_> IP address. int make_multicast_address_i (const ACE_INET_Addr &mcast_addr, ip_mreq& multicast_address, - const ACE_TCHAR *net_if = ACE_TEXT ("le0")); + const ACE_TCHAR *net_if = ACE_LIB_TEXT ("le0")); // Initialize a multicast address. This method factors out common // code called by <make_multicast_address> and <subscribe>. diff --git a/ace/SOCK_Dgram_Mcast_QoS.cpp b/ace/SOCK_Dgram_Mcast_QoS.cpp index b2dfa53f324..ba251964c1d 100644 --- a/ace/SOCK_Dgram_Mcast_QoS.cpp +++ b/ace/SOCK_Dgram_Mcast_QoS.cpp @@ -132,7 +132,7 @@ ACE_SOCK_Dgram_Mcast_QoS::subscribe_ifs (const ACE_INET_Addr &mcast_addr, if (this->subscribe (mcast_addr, qos_params, reuse_addr, - ACE_TEXT ("0.0.0.0"), + ACE_LIB_TEXT ("0.0.0.0"), protocol_family, protocol, protocolinfo) == 0) @@ -236,19 +236,19 @@ ACE_SOCK_Dgram_Mcast_QoS::subscribe (const ACE_INET_Addr &mcast_addr, // Subscribe to the QoS session. if (this->qos_manager_.join_qos_session (qos_session) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT("Unable to join QoS Session\n")), + ACE_LIB_TEXT ("Unable to join QoS Session\n")), -1); } else { if (this->close () != 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT("Unable to close socket\n"))); + ACE_LIB_TEXT ("Unable to close socket\n"))); ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Dest Addr in the QoS Session does") - ACE_TEXT (" not match the address passed into") - ACE_TEXT (" subscribe\n")), + ACE_LIB_TEXT ("Dest Addr in the QoS Session does") + ACE_LIB_TEXT (" not match the address passed into") + ACE_LIB_TEXT (" subscribe\n")), -1); } diff --git a/ace/SPIPE_Acceptor.cpp b/ace/SPIPE_Acceptor.cpp index 841b4122116..9cabd37f727 100644 --- a/ace/SPIPE_Acceptor.cpp +++ b/ace/SPIPE_Acceptor.cpp @@ -165,8 +165,8 @@ ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (const ACE_SPIPE_Addr &local_sap, if (this->open (local_sap, reuse_addr, perms) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_SPIPE_Acceptor"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SPIPE_Acceptor"))); } // General purpose routine for accepting new connections. diff --git a/ace/SPIPE_Addr.cpp b/ace/SPIPE_Addr.cpp index 566597a7d9e..22b6c8473a3 100644 --- a/ace/SPIPE_Addr.cpp +++ b/ace/SPIPE_Addr.cpp @@ -84,20 +84,20 @@ ACE_SPIPE_Addr::set (const ACE_TCHAR *addr, if (colonp == 0) // Assume it's a local name. { - ACE_OS::strcpy (temp, ACE_TEXT ( "\\\\.\\pipe\\")); + ACE_OS::strcpy (temp, ACE_LIB_TEXT ( "\\\\.\\pipe\\")); ACE_OS::strcat (temp, addr); } else { if (ACE_OS::strncmp (addr, - ACE_TEXT ("localhost"), + ACE_LIB_TEXT ("localhost"), ACE_OS::strlen ("localhost")) == 0) // change "localhost" to "." - ACE_OS::strcpy (temp, ACE_TEXT ("\\\\.")); + ACE_OS::strcpy (temp, ACE_LIB_TEXT ("\\\\.")); else { - ACE_OS::strcpy (temp, ACE_TEXT ("\\\\")); + ACE_OS::strcpy (temp, ACE_LIB_TEXT ("\\\\")); ACE_TCHAR *t; @@ -105,13 +105,13 @@ ACE_SPIPE_Addr::set (const ACE_TCHAR *addr, // NUL character into it. ACE_ALLOCATOR_RETURN (t, ACE_OS::strdup (addr), -1); - t[colonp - addr] = ACE_TEXT ('\0'); + t[colonp - addr] = ACE_LIB_TEXT ('\0'); ACE_OS::strcpy (temp, t); ACE_OS::free (t); } - ACE_OS::strcat (temp, ACE_TEXT ("\\pipe\\")); + ACE_OS::strcat (temp, ACE_LIB_TEXT ("\\pipe\\")); ACE_OS::strcat (temp, colonp + 1); } this->ACE_Addr::base_set (AF_SPIPE, diff --git a/ace/SPIPE_Connector.cpp b/ace/SPIPE_Connector.cpp index 21ddd3329a6..7f897cb9cba 100644 --- a/ace/SPIPE_Connector.cpp +++ b/ace/SPIPE_Connector.cpp @@ -26,8 +26,8 @@ ACE_SPIPE_Connector::ACE_SPIPE_Connector (ACE_SPIPE_Stream &new_io, if (this->connect (new_io, remote_sap, timeout, local_sap, reuse_addr, flags, perms) == -1 && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("address %s, %p\n"), - remote_sap.get_path_name (), ACE_TEXT ("ACE_SPIPE_Connector"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("address %s, %p\n"), + remote_sap.get_path_name (), ACE_LIB_TEXT ("ACE_SPIPE_Connector"))); } void diff --git a/ace/SV_Message_Queue.cpp b/ace/SV_Message_Queue.cpp index c1376010b9d..d9f924e82eb 100644 --- a/ace/SV_Message_Queue.cpp +++ b/ace/SV_Message_Queue.cpp @@ -34,6 +34,6 @@ ACE_SV_Message_Queue::ACE_SV_Message_Queue (key_t external_id, { ACE_TRACE ("ACE_SV_Message_Queue::ACE_SV_Message_Queue"); if (this->open (external_id, create, perms) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_SV_Message_Queue::ACE_SV_Message_Queue"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SV_Message_Queue::ACE_SV_Message_Queue"))); } diff --git a/ace/SV_Semaphore_Complex.cpp b/ace/SV_Semaphore_Complex.cpp index e3b32de59ee..4c751da24cb 100644 --- a/ace/SV_Semaphore_Complex.cpp +++ b/ace/SV_Semaphore_Complex.cpp @@ -216,7 +216,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, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SV_Semaphore_Complex"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SV_Semaphore_Complex"))); } ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (const char *name, @@ -235,7 +235,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, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SV_Semaphore_Complex"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_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 9abaf4ac459..ebb93233fc1 100644 --- a/ace/SV_Semaphore_Simple.cpp +++ b/ace/SV_Semaphore_Simple.cpp @@ -108,7 +108,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, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SV_Semaphore::ACE_SV_Semaphore"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SV_Semaphore::ACE_SV_Semaphore"))); } // Convert name to key. This function is used internally to create keys @@ -170,8 +170,8 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const char *name, n, perms) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"))); } ACE_SV_Semaphore_Simple::~ACE_SV_Semaphore_Simple (void) diff --git a/ace/SV_Shared_Memory.cpp b/ace/SV_Shared_Memory.cpp index 9167d7a0209..dfa73d99c67 100644 --- a/ace/SV_Shared_Memory.cpp +++ b/ace/SV_Shared_Memory.cpp @@ -50,8 +50,8 @@ ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (key_t external_id, ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"); if (this->open_and_attach (external_id, sz, create, perms, virtual_addr, flags) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"))); } // The "do nothing" constructor. @@ -78,6 +78,6 @@ ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (ACE_HANDLE int_id, { ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"); if (this->attach (0, flags) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"))); } diff --git a/ace/Select_Reactor_Base.cpp b/ace/Select_Reactor_Base.cpp index ec43079e19e..a6f441d4bed 100644 --- a/ace/Select_Reactor_Base.cpp +++ b/ace/Select_Reactor_Base.cpp @@ -421,8 +421,8 @@ ACE_Select_Reactor_Handler_Repository_Iterator::dump (void) const ACE_TRACE ("ACE_Select_Reactor_Handler_Repository_Iterator::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("rep_ = %u"), this->rep_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("current_ = %d"), this->current_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("rep_ = %u"), this->rep_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("current_ = %d"), this->current_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -433,19 +433,19 @@ ACE_Select_Reactor_Handler_Repository::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) max_handlep1_ = %d, max_size_ = %d\n"), + ACE_LIB_TEXT ("(%t) max_handlep1_ = %d, max_size_ = %d\n"), this->max_handlep1_, this->max_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("["))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("["))); ACE_Event_Handler *eh = 0; for (ACE_Select_Reactor_Handler_Repository_Iterator iter (this); iter.next (eh) != 0; iter.advance ()) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (eh = %x, eh->handle_ = %d)"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" (eh = %x, eh->handle_ = %d)"), eh, eh->get_handle ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" ]"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" ]"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -478,7 +478,7 @@ ACE_Select_Reactor_Notify::dump (void) const ACE_TRACE ("ACE_Select_Reactor_Notify::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("select_reactor_ = %x"), this->select_reactor_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("select_reactor_ = %x"), this->select_reactor_)); this->notification_pipe_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -717,14 +717,14 @@ ACE_Select_Reactor_Notify::handle_input (ACE_HANDLE handle) break; else if (notify_queue_.dequeue_head (temp) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("dequeue_head")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("dequeue_head")), -1); buffer = *temp; if (free_queue_.enqueue_head (temp) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("enqueue_head")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("enqueue_head")), -1); } @@ -751,7 +751,7 @@ ACE_Select_Reactor_Notify::handle_input (ACE_HANDLE handle) break; default: // Should we bail out if we get an invalid mask? - ACE_ERROR ((LM_ERROR, ACE_TEXT ("invalid mask = %d\n"), buffer.mask_)); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("invalid mask = %d\n"), buffer.mask_)); } if (result == -1) buffer.eh_->handle_close (ACE_INVALID_HANDLE, @@ -789,7 +789,7 @@ ACE_Select_Reactor_Notify::handle_input (ACE_HANDLE handle) default: // Should we bail out if we get an invalid mask? ACE_ERROR ((LM_ERROR, - ACE_TEXT ("invalid mask = %d\n"), + ACE_LIB_TEXT ("invalid mask = %d\n"), buffer.mask_)); } if (result == -1) diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp index 8edf8c6fe97..8f12abd2edd 100644 --- a/ace/Select_Reactor_T.cpp +++ b/ace/Select_Reactor_T.cpp @@ -190,7 +190,7 @@ ACE_Select_Reactor_Token_T<ACE_SELECT_REACTOR_MUTEX>::dump (void) const ACE_TRACE ("ACE_Select_Reactor_Token::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -236,8 +236,8 @@ ACE_Select_Reactor_Token_T<ACE_SELECT_REACTOR_MUTEX>::sleep_hook (void) ACE_TRACE ("ACE_Select_Reactor_Token::sleep_hook"); if (this->select_reactor_->notify () == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("sleep_hook failed"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("sleep_hook failed"))); } template <class ACE_SELECT_REACTOR_TOKEN> int @@ -549,10 +549,10 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T disable_notify_pipe, notify) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Select_Reactor_T::open ") - ACE_TEXT ("failed inside ") - ACE_TEXT ("ACE_Select_Reactor_T::CTOR"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Select_Reactor_T::open ") + ACE_LIB_TEXT ("failed inside ") + ACE_LIB_TEXT ("ACE_Select_Reactor_T::CTOR"))); } } @@ -581,9 +581,9 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T disable_notify_pipe, notify) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Select_Reactor_T::open ") - ACE_TEXT ("failed inside ACE_Select_Reactor_T::CTOR"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Select_Reactor_T::open ") + ACE_LIB_TEXT ("failed inside ACE_Select_Reactor_T::CTOR"))); } // Close down the ACE_Select_Reactor_T instance, detaching any @@ -1078,7 +1078,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch_io_set && number_of_handlers_dispatched < number_of_active_handles && this->state_changed_ == 0) { - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Select_Reactor_T::dispatching\n"))); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Select_Reactor_T::dispatching\n"))); number_of_handlers_dispatched++; this->notify_handle (handle, mask, @@ -1103,7 +1103,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch_io_handlers // obscure case of piggy-backed data coming along with the final // handshake message of a nonblocking connection). - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Select_Reactor_T::dispatch - WRITE\n"))); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Select_Reactor_T::dispatch - WRITE\n"))); if (this->dispatch_io_set (number_of_active_handles, number_of_handlers_dispatched, ACE_Event_Handler::WRITE_MASK, @@ -1115,7 +1115,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch_io_handlers return -1; } - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Select_Reactor_T::dispatch - EXCEPT\n"))); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Select_Reactor_T::dispatch - EXCEPT\n"))); if (this->dispatch_io_set (number_of_active_handles, number_of_handlers_dispatched, ACE_Event_Handler::EXCEPT_MASK, @@ -1127,7 +1127,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch_io_handlers return -1; } - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Select_Reactor_T::dispatch - READ\n"))); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Select_Reactor_T::dispatch - READ\n"))); if (this->dispatch_io_set (number_of_active_handles, number_of_handlers_dispatched, ACE_Event_Handler::READ_MASK, @@ -1371,7 +1371,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dump (void) const this->handler_rep_.dump (); this->signal_handler_->dump (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("delete_signal_handler_ = %d\n"), + ACE_LIB_TEXT ("delete_signal_handler_ = %d\n"), this->delete_signal_handler_)); ACE_HANDLE h; @@ -1379,37 +1379,37 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dump (void) const for (ACE_Handle_Set_Iterator handle_iter_wr (this->wait_set_.wr_mask_); (h = handle_iter_wr ()) != ACE_INVALID_HANDLE; ++handle_iter_wr) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_handle = %d\n"), h)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("write_handle = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_rd (this->wait_set_.rd_mask_); (h = handle_iter_rd ()) != ACE_INVALID_HANDLE; ++handle_iter_rd) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("read_handle = %d\n"), h)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("read_handle = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_ex (this->wait_set_.ex_mask_); (h = handle_iter_ex ()) != ACE_INVALID_HANDLE; ++handle_iter_ex) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("except_handle = %d\n"), h)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("except_handle = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_wr_ready (this->ready_set_.wr_mask_); (h = handle_iter_wr_ready ()) != ACE_INVALID_HANDLE; ++handle_iter_wr_ready) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_handle_ready = %d\n"), h)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("write_handle_ready = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_rd_ready (this->ready_set_.rd_mask_); (h = handle_iter_rd_ready ()) != ACE_INVALID_HANDLE; ++handle_iter_rd_ready) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("read_handle_ready = %d\n"), h)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("read_handle_ready = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_ex_ready (this->ready_set_.ex_mask_); (h = handle_iter_ex_ready ()) != ACE_INVALID_HANDLE; ++handle_iter_ex_ready) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("except_handle_ready = %d\n"), h)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("except_handle_ready = %d\n"), h)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("restart_ = %d\n"), this->restart_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nrequeue_position_ = %d\n"), this->requeue_position_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ninitialized_ = %d\n"), this->initialized_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nowner_ = %d\n"), this->owner_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("restart_ = %d\n"), this->restart_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nrequeue_position_ = %d\n"), this->requeue_position_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ninitialized_ = %d\n"), this->initialized_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nowner_ = %d\n"), this->owner_)); #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) this->notify_handler_->dump (); diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp index 81da0628e92..393977bd704 100644 --- a/ace/Service_Config.cpp +++ b/ace/Service_Config.cpp @@ -213,7 +213,7 @@ ACE_Service_Config::parse_args (int argc, ACE_TCHAR *argv[]) ACE_TRACE ("ACE_Service_Config::parse_args"); ACE_Get_Opt getopt (argc, argv, - ACE_TEXT ("bdf:k:nys:S:"), + ACE_LIB_TEXT ("bdf:k:nys:S:"), 1); // Start at argv[1]. if (ACE_Service_Config::init_svc_conf_file_queue () == -1) @@ -232,7 +232,7 @@ ACE_Service_Config::parse_args (int argc, ACE_TCHAR *argv[]) if (ACE_Service_Config::svc_conf_file_queue_->enqueue_tail (ACE_TString (getopt.optarg)) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), + ACE_LIB_TEXT ("%p\n"), "enqueue_tail"), -1); break; @@ -257,7 +257,7 @@ ACE_Service_Config::parse_args (int argc, ACE_TCHAR *argv[]) (ACE_Service_Config::signum_, ACE_Service_Config::signal_handler_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("cannot obtain signal handler\n")), + ACE_LIB_TEXT ("cannot obtain signal handler\n")), -1); #endif /* ACE_LACKS_UNIX_SIGNALS */ break; @@ -270,14 +270,14 @@ ACE_Service_Config::parse_args (int argc, ACE_TCHAR *argv[]) if (ACE_Service_Config::svc_queue_->enqueue_tail (ACE_TString (getopt.optarg)) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), + ACE_LIB_TEXT ("%p\n"), "enqueue_tail"), -1); break; default: if (ACE::debug () > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%c is not a ACE_Service_Config option\n"), + ACE_LIB_TEXT ("%c is not a ACE_Service_Config option\n"), c)); } @@ -296,14 +296,14 @@ ACE_Service_Config::initialize (const ACE_TCHAR svc_name[], if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("opening static service %s\n"), + ACE_LIB_TEXT ("opening static service %s\n"), svc_name)); if (ACE_Service_Repository::instance ()->find (svc_name, (const ACE_Service_Type **) &srp) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%s not found\n"), + ACE_LIB_TEXT ("%s not found\n"), svc_name), -1); else if (srp->type ()->init (args.argc (), @@ -311,7 +311,7 @@ ACE_Service_Config::initialize (const ACE_TCHAR svc_name[], { // Remove this entry. ACE_ERROR ((LM_ERROR, - ACE_TEXT ("static initialization failed, %p\n"), + ACE_LIB_TEXT ("static initialization failed, %p\n"), svc_name)); ACE_Service_Repository::instance ()->remove (svc_name); return -1; @@ -335,19 +335,19 @@ ACE_Service_Config::initialize (const ACE_Service_Type *sr, if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("opening dynamic service %s\n"), + ACE_LIB_TEXT ("opening dynamic service %s\n"), sr->name ())); if (ACE_Service_Repository::instance ()->insert (sr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("insertion failed, %p\n"), + ACE_LIB_TEXT ("insertion failed, %p\n"), sr->name ()), -1); else if (sr->type ()->init (args.argc (), args.argv ()) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("dynamic initialization failed for %s\n"), + ACE_LIB_TEXT ("dynamic initialization failed for %s\n"), sr->name ())); ACE_Service_Repository::instance ()->remove (sr->name ()); return -1; @@ -431,14 +431,14 @@ ACE_Service_Config::process_directives (void) iter.advance ()) { FILE *fp = ACE_OS::fopen (sptr->fast_rep (), - ACE_TEXT ("r")); + ACE_LIB_TEXT ("r")); if (fp == 0) { // Invalid svc.conf file. We'll report it here and // break out of the method. if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%p\n"), + ACE_LIB_TEXT ("%p\n"), sptr->fast_rep ())); errno = ENOENT; result = -1; @@ -476,8 +476,8 @@ ACE_Service_Config::process_commandline_directives (void) (sptr->fast_rep ()) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("process_directive"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("process_directive"))); result = -1; } } @@ -563,7 +563,7 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[], && ACE_Service_Config::svc_conf_file_queue_->enqueue_tail (ACE_TString (ACE_DEFAULT_SVC_CONF)) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), + ACE_LIB_TEXT ("%p\n"), "enqueue_tail"), -1); @@ -604,7 +604,7 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[], { if (ACE::debug ()) ACE_DEBUG ((LM_STARTUP, - ACE_TEXT ("starting up daemon %n\n"))); + ACE_LIB_TEXT ("starting up daemon %n\n"))); // Initialize the Service Repository (this will still work if // user forgets to define an object of type ACE_Service_Config). @@ -622,7 +622,7 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[], (ACE_Service_Config::signum_, ACE_Service_Config::signal_handler_) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("can't register signal handler\n"))); + ACE_LIB_TEXT ("can't register signal handler\n"))); #endif /* ACE_LACKS_UNIX_SIGNALS */ // See if we need to load the static services. @@ -670,7 +670,7 @@ ACE_Service_Config::ACE_Service_Config (const ACE_TCHAR program_name[], // Only print out an error if it wasn't the svc.conf file that was // missing. ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), + ACE_LIB_TEXT ("%p\n"), program_name)); } @@ -706,13 +706,13 @@ ACE_Service_Config::reconfigure (void) #endif /* ! ACE_NLOGGING */ if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("beginning reconfiguration at %s"), + ACE_LIB_TEXT ("beginning reconfiguration at %s"), ACE_OS::ctime (&t))); } if (ACE_Service_Config::process_directives () == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("process_directives"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("process_directives"))); } // Run the event loop until the <ACE_Reactor::handle_events> diff --git a/ace/Service_Manager.cpp b/ace/Service_Manager.cpp index b9b93680a61..e496ca0a7e9 100644 --- a/ace/Service_Manager.cpp +++ b/ace/Service_Manager.cpp @@ -68,10 +68,10 @@ ACE_Service_Manager::info (ACE_TCHAR **strp, size_t length) const return -1; ACE_OS::sprintf (buf, - ACE_TEXT ("%d/%s %s"), + ACE_LIB_TEXT ("%d/%s %s"), sa.get_port_number (), - ACE_TEXT ("tcp"), - ACE_TEXT ("# lists all services in the daemon\n")); + ACE_LIB_TEXT ("tcp"), + ACE_LIB_TEXT ("# lists all services in the daemon\n")); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) return -1; else @@ -84,7 +84,7 @@ ACE_Service_Manager::init (int argc, ACE_TCHAR *argv[]) { ACE_TRACE ("ACE_Service_Manager::init"); ACE_INET_Addr local_addr (ACE_Service_Manager::DEFAULT_PORT_); - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("dp:s:"), 0); // Start at argv[0] + ACE_Get_Opt getopt (argc, argv, ACE_LIB_TEXT ("dp:s:"), 0); // Start at argv[0] for (int c; (c = getopt ()) != -1; ) switch (c) @@ -105,13 +105,13 @@ ACE_Service_Manager::init (int argc, ACE_TCHAR *argv[]) if (this->get_handle () == ACE_INVALID_HANDLE && this->open (local_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("open")), -1); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("open")), -1); else if (ACE_Reactor::instance ()->register_handler (this, ACE_Event_Handler::ACCEPT_MASK) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("registering service with ACE_Reactor\n")), + ACE_LIB_TEXT ("registering service with ACE_Reactor\n")), -1); return 0; } @@ -180,10 +180,10 @@ ACE_Service_Manager::list_services (void) if (this->debug_) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("len = %d, info = %s%s"), + ACE_LIB_TEXT ("len = %d, info = %s%s"), len, buf, - buf[len - 1] == '\n' ? ACE_TEXT ("") : ACE_TEXT ("\n"))); + buf[len - 1] == '\n' ? ACE_LIB_TEXT ("") : ACE_LIB_TEXT ("\n"))); if (len > 0) { @@ -192,8 +192,8 @@ ACE_Service_Manager::list_services (void) if (n != len || (n == -1 && errno != EPIPE)) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("send_n"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("send_n"))); } } @@ -250,14 +250,14 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) if (this->debug_) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("client_stream fd = %d\n"), + ACE_LIB_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, - ACE_TEXT ("accepted from host %s at port %d\n"), + ACE_LIB_TEXT ("accepted from host %s at port %d\n"), sa.get_host_name (), sa.get_port_number ())); } @@ -280,8 +280,8 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) case -1: if (this->debug_) ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("recv"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("recv"))); break; case 0: return 0; @@ -318,7 +318,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) if (this->client_stream_.close () == -1 && this->debug_) ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("close"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("close"))); return 0; } diff --git a/ace/Service_Repository.cpp b/ace/Service_Repository.cpp index 41339bbcf0b..a73c576236d 100644 --- a/ace/Service_Repository.cpp +++ b/ace/Service_Repository.cpp @@ -114,8 +114,8 @@ ACE_Service_Repository::ACE_Service_Repository (int size) if (this->open (size) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Service_Repository"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Service_Repository"))); } // Finalize (call <fini> and possibly delete) all the services. @@ -139,7 +139,7 @@ ACE_Service_Repository::fini (void) { if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("finalizing %s\n"), + ACE_LIB_TEXT ("finalizing %s\n"), this->service_vector_[i]->name ())); ACE_Service_Type *s = ACE_const_cast (ACE_Service_Type *, diff --git a/ace/Service_Types.cpp b/ace/Service_Types.cpp index d5f7fdfe36d..5d7ecb6cf90 100644 --- a/ace/Service_Types.cpp +++ b/ace/Service_Types.cpp @@ -50,7 +50,7 @@ ACE_Service_Type_Impl::fini (void) const ACE_TRACE ("ACE_Service_Type_Impl::fini"); if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("destroying %s, flags = %d\n"), + ACE_LIB_TEXT ("destroying %s, flags = %d\n"), this->name_, this->flags_)); @@ -192,9 +192,9 @@ ACE_Module_Type::info (ACE_TCHAR **str, size_t len) const ACE_TCHAR buf[BUFSIZ]; ACE_OS::sprintf (buf, - ACE_TEXT ("%s\t %s"), + ACE_LIB_TEXT ("%s\t %s"), this->name (), - ACE_TEXT ("# ACE_Module\n")); + ACE_LIB_TEXT ("# ACE_Module\n")); if (*str == 0 && (*str = ACE_OS::strdup (buf)) == 0) return -1; @@ -274,9 +274,9 @@ ACE_Stream_Type::info (ACE_TCHAR **str, size_t len) const ACE_TCHAR buf[BUFSIZ]; ACE_OS::sprintf (buf, - ACE_TEXT ("%s\t %s"), + ACE_LIB_TEXT ("%s\t %s"), this->name (), - ACE_TEXT ("# STREAM\n")); + ACE_LIB_TEXT ("# STREAM\n")); if (*str == 0 && (*str = ACE_OS::strdup (buf)) == 0) return -1; diff --git a/ace/Singleton.cpp b/ace/Singleton.cpp index 2ab27cc31e7..5c201c96998 100644 --- a/ace/Singleton.cpp +++ b/ace/Singleton.cpp @@ -25,7 +25,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, ACE_TEXT ("instance_ = %x"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("instance_ = %x"), ACE_Singleton<TYPE, ACE_LOCK>::instance_i ())); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ @@ -119,7 +119,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump (void) ACE_TRACE ("ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump"); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("instance_ = %x"), ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i ())); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ @@ -206,7 +206,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, ACE_TEXT ("instance_ = %x"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_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 */ @@ -291,7 +291,7 @@ ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump (void) ACE_TRACE ("ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump"); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("instance_ = %x"), ACE_Unmanaged_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/Stats.cpp b/ace/Stats.cpp index 8cd4e6b46ca..fc61cc013b1 100644 --- a/ace/Stats.cpp +++ b/ace/Stats.cpp @@ -221,9 +221,9 @@ ACE_Stats::print_summary (const u_int precision, // Build a format string, in case the C library doesn't support %*u. ACE_TCHAR format[32]; if (tmp_precision == 0) - ACE_OS::sprintf (format, ACE_TEXT ("%%%d"), tmp_precision); + ACE_OS::sprintf (format, ACE_LIB_TEXT ("%%%d"), tmp_precision); else - ACE_OS::sprintf (format, ACE_TEXT ("%%d.%%0%du"), tmp_precision); + ACE_OS::sprintf (format, ACE_LIB_TEXT ("%%d.%%0%du"), tmp_precision); ACE_Stats_Value u (tmp_precision); ((ACE_Stats *) this)->mean (u, scale_factor); @@ -260,8 +260,8 @@ ACE_Stats::print_summary (const u_int precision, if (success == 1) { - ACE_OS::fprintf (file, ACE_TEXT ("samples: %u (%s - %s); mean: ") - ACE_TEXT ("%s; std dev: %s\n"), + ACE_OS::fprintf (file, ACE_LIB_TEXT ("samples: %u (%s - %s); mean: ") + ACE_LIB_TEXT ("%s; std dev: %s\n"), samples (), min_string, max_string, mean_string, std_dev_string); return 0; @@ -270,12 +270,12 @@ ACE_Stats::print_summary (const u_int precision, { #if !defined (ACE_HAS_WINCE) ACE_OS::fprintf (file, - ACE_TEXT ("ACE_Stats::print_summary: OVERFLOW: %s\n"), + ACE_LIB_TEXT ("ACE_Stats::print_summary: OVERFLOW: %s\n"), strerror (overflow_)); #else // WinCE doesn't have strerror ;( ACE_OS::fprintf (file, - ACE_TEXT ("ACE_Stats::print_summary: OVERFLOW\n")); + ACE_LIB_TEXT ("ACE_Stats::print_summary: OVERFLOW\n")); #endif /* ACE_HAS_WINCE */ return -1; } @@ -557,7 +557,7 @@ ACE_Throughput_Stats::dump_results (const ACE_TCHAR* msg, if (this->samples_count_ == 0u) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s : no data collected\n"), msg)); + ACE_LIB_TEXT ("%s : no data collected\n"), msg)); return; } @@ -582,7 +582,7 @@ ACE_Throughput_Stats::dump_results (const ACE_TCHAR* msg, double l_dev = ACE_CU64_TO_CU32 (latency_dev) / (sf * sf); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s latency : %.2f[%d]/%.2f/%.2f[%d]/%.2f (min/avg/max/var^2)\n"), + ACE_LIB_TEXT ("%s latency : %.2f[%d]/%.2f/%.2f[%d]/%.2f (min/avg/max/var^2)\n"), msg, l_min, this->latency_min_at_, l_avg, @@ -600,7 +600,7 @@ ACE_Throughput_Stats::dump_results (const ACE_TCHAR* msg, double t_avg = ACE_CU64_TO_CU32 (this->samples_count_) / seconds; ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s throughput: %.2f (events/second)\n"), + ACE_LIB_TEXT ("%s throughput: %.2f (events/second)\n"), msg, t_avg)); #if 0 diff --git a/ace/Stats.i b/ace/Stats.i index bbac9fd33f3..c97c0d29ca6 100644 --- a/ace/Stats.i +++ b/ace/Stats.i @@ -56,7 +56,7 @@ void ACE_Stats_Value::dump (void) const { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("precision: %u digits; whole: %u, fractional: %u\n"), + ACE_LIB_TEXT ("precision: %u digits; whole: %u, fractional: %u\n"), precision_, whole_, fractional_)); } diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp index 033de722d0d..85ea285489a 100644 --- a/ace/Strategies_T.cpp +++ b/ace/Strategies_T.cpp @@ -219,7 +219,7 @@ ACE_Thread_Strategy<SVC_HANDLER>::open (ACE_Thread_Manager *thr_mgr, // Must have a thread manager! if (this->thr_mgr_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("error: must have a non-NULL thread manager\n")), + ACE_LIB_TEXT ("error: must have a non-NULL thread manager\n")), -1); else return 0; @@ -252,8 +252,8 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy if (this->open (local_addr, restart) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("open"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("open"))); } template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int @@ -352,12 +352,12 @@ ACE_Process_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *svc_handle ACE_TRACE ("ACE_Process_Strategy<SVC_HANDLER>::activate_svc_handler"); // If <flags_> is non-0 then we won't create zombies. - switch (ACE::fork (ACE_TEXT ("child"), this->flags_)) + switch (ACE::fork (ACE_LIB_TEXT ("child"), this->flags_)) { case -1: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("fork")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("fork")), -1); /* NOTREACHED */ case 0: // In child process. @@ -414,8 +414,8 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::ACE_Cache con_s, rec_s) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Cached_Connect_Strategy::ACE_Cached_Connect_Strategy"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Cached_Connect_Strategy::ACE_Cached_Connect_Strategy"))); } template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> diff --git a/ace/Strategies_T.i b/ace/Strategies_T.i index 4816e2565bc..98620bab345 100644 --- a/ace/Strategies_T.i +++ b/ace/Strategies_T.i @@ -30,8 +30,8 @@ ACE_Singleton_Strategy<SVC_HANDLER>::ACE_Singleton_Strategy (SVC_HANDLER *sh, ACE_TRACE ("ACE_Singleton_Strategy<SVC_HANDLER>::ACE_Singleton_Strategy"); if (this->open (sh, tm) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Singleton_Strategy"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Singleton_Strategy"))); } template <class SVC_HANDLER> ASYS_INLINE @@ -68,8 +68,8 @@ ACE_Creation_Strategy<SVC_HANDLER>::ACE_Creation_Strategy (ACE_Thread_Manager *t ACE_TRACE ("ACE_Creation_Strategy<SVC_HANDLER>::ACE_Creation_Strategy"); if (this->open (thr_mgr) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Creation_Strategy"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Creation_Strategy"))); } // Default behavior is to make a new SVC_HANDLER, passing in the @@ -105,8 +105,8 @@ ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy (const char dll_name[], svc_rep, thr_mgr) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("open"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("open"))); } template <class SVC_HANDLER> ASYS_INLINE @@ -139,8 +139,8 @@ ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy (ACE_Reactor *reactor, mask, flags) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy"))); } template <class SVC_HANDLER> ASYS_INLINE @@ -171,8 +171,8 @@ ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy (ACE_Thread_Manager *thr_m n_threads, flags) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy"))); } template <class SVC_HANDLER> ASYS_INLINE @@ -225,7 +225,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, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("close"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("(%P|%t) %p\n"), ACE_LIB_TEXT ("close"))); } template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ASYS_INLINE ACE_PEER_CONNECTOR & @@ -259,8 +259,8 @@ ACE_Process_Strategy<SVC_HANDLER>::ACE_Process_Strategy (size_t n_processes, reactor, avoid_zombies) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Process_Strategy"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Process_Strategy"))); } template <class SVC_HANDLER> ASYS_INLINE diff --git a/ace/Stream.cpp b/ace/Stream.cpp index cd2c456d76c..58582200059 100644 --- a/ace/Stream.cpp +++ b/ace/Stream.cpp @@ -27,18 +27,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, ACE_TEXT ("-------- module links --------\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("-------- module links --------\n"))); for (ACE_Module<ACE_SYNCH_USE> *mp = this->stream_head_; ; mp = mp->next ()) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("module name = %s\n"), mp->name ())); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("module name = %s\n"), mp->name ())); if (mp == this->stream_tail_) break; } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("-------- writer links --------\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("-------- writer links --------\n"))); ACE_Task<ACE_SYNCH_USE> *tp; @@ -46,21 +46,21 @@ ACE_Stream<ACE_SYNCH_USE>::dump (void) const ; tp = tp->next ()) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("writer queue name = %s\n"), tp->name ())); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("writer queue name = %s\n"), tp->name ())); tp->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("-------\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("-------\n"))); if (tp == this->stream_tail_->writer () || (this->linked_us_ && tp == this->linked_us_->stream_head_->reader ())) break; } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("-------- reader links --------\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("-------- reader links --------\n"))); for (tp = this->stream_tail_->reader (); ; tp = tp->next ()) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("reader queue name = %s\n"), tp->name ())); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("reader queue name = %s\n"), tp->name ())); tp->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("-------\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("-------\n"))); if (tp == this->stream_head_->reader () || (this->linked_us_ && tp == this->linked_us_->stream_head_->writer ())) @@ -329,7 +329,7 @@ ACE_Stream<ACE_SYNCH_USE>::open (void *a, { h1 = new ACE_Stream_Head<ACE_SYNCH_USE>; h2 = new ACE_Stream_Head<ACE_SYNCH_USE>; - head = new ACE_Module<ACE_SYNCH_USE> (ACE_TEXT ("ACE_Stream_Head"), + head = new ACE_Module<ACE_SYNCH_USE> (ACE_LIB_TEXT ("ACE_Stream_Head"), h1, h2, a, M_DELETE); @@ -339,7 +339,7 @@ ACE_Stream<ACE_SYNCH_USE>::open (void *a, { t1 = new ACE_Stream_Tail<ACE_SYNCH_USE>; t2 = new ACE_Stream_Tail<ACE_SYNCH_USE>; - tail = new ACE_Module<ACE_SYNCH_USE> (ACE_TEXT ("ACE_Stream_Tail"), + tail = new ACE_Module<ACE_SYNCH_USE> (ACE_LIB_TEXT ("ACE_Stream_Tail"), t1, t2, a, M_DELETE); @@ -573,7 +573,7 @@ ACE_Stream<ACE_SYNCH_USE>::ACE_Stream (void * a, ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE>::ACE_Stream"); if (this->open (a, head, tail) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_Stream<ACE_SYNCH_USE>::open (%s, %s)\n"), + ACE_LIB_TEXT ("ACE_Stream<ACE_SYNCH_USE>::open (%s, %s)\n"), head->name (), tail->name ())); } diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h index d6b58298231..729a91769ac 100644 --- a/ace/Svc_Conf.h +++ b/ace/Svc_Conf.h @@ -69,7 +69,7 @@ extern FILE *ace_yyin; } \ else if ( ((result = fread( buf, 1, max_size, ace_yyin )) == 0) \ && ferror( ace_yyin ) ) \ - ACE_YY_FATAL_ERROR( ACE_TEXT ("input in flex scanner failed") ); + ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("input in flex scanner failed") ); void ace_yyerror (const ACE_TCHAR *); // Error handling routine required by YACC or BISON diff --git a/ace/Svc_Conf.l b/ace/Svc_Conf.l index 135db466159..89605cdb3a2 100644 --- a/ace/Svc_Conf.l +++ b/ace/Svc_Conf.l @@ -82,11 +82,11 @@ inactive { return token (ACE_INACTIVE); } {white_space}+ ; /* EMPTY */ {newline} { yylineno++; } {other} { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("unknown character = (%d"), + ACE_LIB_TEXT ("unknown character = (%d"), *yytext)); if (ACE_OS::ace_isprint (*yytext)) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("|%c"), *yytext)); - ACE_ERROR ((LM_ERROR, ACE_TEXT (")\n"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("|%c"), *yytext)); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT (")\n"))); } <<EOF>> { YY_NEW_FILE; yyterminate(); } %% diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y index 76c1689b2e6..fe45f8c4c1e 100644 --- a/ace/Svc_Conf.y +++ b/ace/Svc_Conf.y @@ -168,7 +168,7 @@ module || st->push (mt) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("dynamic initialization failed for Module %s\n"), + ACE_LIB_TEXT ("dynamic initialization failed for Module %s\n"), svc_type->name ())); yyerrno++; } @@ -181,7 +181,7 @@ module if (((ACE_Stream_Type *) ($<static_node_>-1)->record ()->type ())->push (mt) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Problem with static\n"))); + ACE_LIB_TEXT ("Problem with static\n"))); yyerrno++; } } @@ -213,7 +213,7 @@ module if (mt != 0 && st->remove (mt) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("cannot remove Module_Type %s from STREAM_Type %s\n"), + ACE_LIB_TEXT ("cannot remove Module_Type %s from STREAM_Type %s\n"), module->name (), stream->name ())); yyerrno++; @@ -246,7 +246,7 @@ svc_location else { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to find service: %s\n"), + ACE_LIB_TEXT ("Unable to find service: %s\n"), $1)); ++yyerrno; $$ = 0; @@ -322,7 +322,7 @@ yyerror (const ACE_TCHAR *s) #endif /* ACE_NLOGGING */ ACE_ERROR ((LM_ERROR, - ACE_TEXT ("[error %d] on line %d: %s\n"), + ACE_LIB_TEXT ("[error %d] on line %d: %s\n"), ++yyerrno, yylineno, s)); @@ -347,7 +347,7 @@ ace_get_module (ACE_Static_Node *str_rec, if (sr == 0 || st == 0 || mt == 0) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("cannot locate Module_Type %s in STREAM_Type %s\n"), + ACE_LIB_TEXT ("cannot locate Module_Type %s in STREAM_Type %s\n"), svc_name, str_rec->name ())); yyerrno++; @@ -371,7 +371,7 @@ ace_get_module (ACE_Static_Node *str_rec, if (sr == 0 || st == 0 || mt == 0) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("cannot locate Module_Type %s or STREAM_Type %s\n"), + ACE_LIB_TEXT ("cannot locate Module_Type %s or STREAM_Type %s\n"), module_type_name, str_rec->name ())); yyerrno++; @@ -384,7 +384,7 @@ ace_get_module (ACE_Static_Node *str_rec, if (ACE_OS::strcmp (mp->name (), module_type_name) != 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("warning: assigning Module_Type name %s to Module %s since names differ\n"), + ACE_LIB_TEXT ("warning: assigning Module_Type name %s to Module %s since names differ\n"), module_type_name, mp->name ())); mp->name (module_type_name); @@ -427,7 +427,7 @@ ace_create_service_type (const ACE_TCHAR *name, break; default: ACE_ERROR ((LM_ERROR, - ACE_TEXT ("unknown case\n"))); + ACE_LIB_TEXT ("unknown case\n"))); yyerrno++; break; } diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp index 30dfda25396..6350fbb3545 100644 --- a/ace/Svc_Conf_l.cpp +++ b/ace/Svc_Conf_l.cpp @@ -911,10 +911,10 @@ ACE_YY_RULE_SETUP case 24: ACE_YY_RULE_SETUP #line 84 "Svc_Conf.l" -{ ACE_ERROR ((LM_ERROR, ACE_TEXT ("unknown character = (%d"), *ace_yytext)); +{ ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("unknown character = (%d"), *ace_yytext)); if (ACE_OS::ace_isprint (*ace_yytext)) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("|%c"), *ace_yytext)); - ACE_ERROR ((LM_ERROR, ACE_TEXT (")\n"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("|%c"), *ace_yytext)); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT (")\n"))); } ACE_YY_BREAK case ACE_YY_STATE_EOF(INITIAL): @@ -1053,7 +1053,7 @@ ACE_SVC_CONF_ECHO; default: ACE_YY_FATAL_ERROR( - ACE_TEXT ("fatal flex scanner internal error--no action found" )); + ACE_LIB_TEXT ("fatal flex scanner internal error--no action found" )); } /* end of action switch */ } /* end of scanning one token */ } /* end of ace_yylex */ @@ -1076,7 +1076,7 @@ static int ace_yy_get_next_buffer() if ( ace_yy_c_buf_p > &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars + 1] ) ACE_YY_FATAL_ERROR( - ACE_TEXT ("fatal flex scanner internal error--end of buffer missed" )); + ACE_LIB_TEXT ("fatal flex scanner internal error--end of buffer missed" )); if ( ace_yy_current_buffer->ace_yy_fill_buffer == 0 ) { /* Don't try to fill the buffer, so this is an EOF. */ @@ -1149,7 +1149,7 @@ static int ace_yy_get_next_buffer() if ( ! b->ace_yy_ch_buf ) ACE_YY_FATAL_ERROR( - ACE_TEXT ("fatal error - scanner input buffer overflow") ); + ACE_LIB_TEXT ("fatal error - scanner input buffer overflow") ); ace_yy_c_buf_p = &b->ace_yy_ch_buf[ace_yy_c_buf_p_offset]; @@ -1452,7 +1452,7 @@ int size; b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) ); if ( ! b ) - ACE_YY_FATAL_ERROR( ACE_TEXT ("out of dynamic memory in ace_yy_create_buffer()") ); + ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("out of dynamic memory in ace_yy_create_buffer()") ); b->ace_yy_buf_size = size; @@ -1461,7 +1461,7 @@ int size; */ b->ace_yy_ch_buf = (ACE_TCHAR *) ace_yy_flex_alloc( b->ace_yy_buf_size + 2 ); if ( ! b->ace_yy_ch_buf ) - ACE_YY_FATAL_ERROR( ACE_TEXT ("out of dynamic memory in ace_yy_create_buffer()") ); + ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("out of dynamic memory in ace_yy_create_buffer()") ); b->ace_yy_is_our_buffer = 1; @@ -1573,7 +1573,7 @@ ace_yy_size_t size; b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) ); if ( ! b ) - ACE_YY_FATAL_ERROR( ACE_TEXT ("out of dynamic memory in ace_yy_scan_buffer()") ); + ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("out of dynamic memory in ace_yy_scan_buffer()") ); b->ace_yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ b->ace_yy_buf_pos = b->ace_yy_ch_buf = base; @@ -1627,7 +1627,7 @@ int len; n = len + 2; buf = (ACE_TCHAR *) ace_yy_flex_alloc( n ); if ( ! buf ) - ACE_YY_FATAL_ERROR( ACE_TEXT ("out of dynamic memory in ace_yy_scan_bytes()") ); + ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("out of dynamic memory in ace_yy_scan_bytes()") ); for ( i = 0; i < len; ++i ) buf[i] = bytes[i]; @@ -1636,7 +1636,7 @@ int len; b = ace_yy_scan_buffer( buf, n ); if ( ! b ) - ACE_YY_FATAL_ERROR( ACE_TEXT ("bad buffer in ace_yy_scan_bytes()") ); + ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("bad buffer in ace_yy_scan_bytes()") ); /* It's okay to grow etc. this buffer, and we should throw it * away when we're done. @@ -1672,7 +1672,7 @@ int new_state; if ( ! ace_yy_start_stack ) ACE_YY_FATAL_ERROR( - ACE_TEXT ("out of memory expanding start-condition stack") ); + ACE_LIB_TEXT ("out of memory expanding start-condition stack") ); } ace_yy_start_stack[ace_yy_start_stack_ptr++] = ACE_YY_START; @@ -1686,7 +1686,7 @@ int new_state; static void ace_yy_pop_state() { if ( --ace_yy_start_stack_ptr < 0 ) - ACE_YY_FATAL_ERROR( ACE_TEXT ("start-condition stack underflow") ); + ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("start-condition stack underflow") ); BEGIN(ace_yy_start_stack[ace_yy_start_stack_ptr]); } diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp index 59b4426e0fa..1f6b8909933 100644 --- a/ace/Svc_Conf_y.cpp +++ b/ace/Svc_Conf_y.cpp @@ -17,7 +17,7 @@ static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec, static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec, const ACE_TCHAR *svc_name); -#define ACE_YYDEBUG_LEXER_TEXT (ace_yytext[ace_yyleng] = ACE_TEXT ('\0'), ace_yytext) +#define ACE_YYDEBUG_LEXER_TEXT (ace_yytext[ace_yyleng] = ACE_LIB_TEXT ('\0'), ace_yytext) /* Force the pretty debugging code to compile.*/ /* #define ACE_YYDEBUG 1*/ @@ -261,7 +261,7 @@ ace_yyerror (const ACE_TCHAR *s) #endif /* ACE_NLOGGING */ ACE_ERROR ((LM_ERROR, - ACE_TEXT ("[error %d] on line %d: %s\n"), + ACE_LIB_TEXT ("[error %d] on line %d: %s\n"), ++ace_yyerrno, ace_yylineno, s)); @@ -286,7 +286,7 @@ ace_get_module (ACE_Static_Node *str_rec, if (sr == 0 || st == 0 || mt == 0) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("cannot locate Module_Type %s in STREAM_Type %s\n"), + ACE_LIB_TEXT ("cannot locate Module_Type %s in STREAM_Type %s\n"), svc_name, str_rec->name ())); ace_yyerrno++; @@ -310,7 +310,7 @@ ace_get_module (ACE_Static_Node *str_rec, if (sr == 0 || st == 0 || mt == 0) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("cannot locate Module_Type %s or STREAM_Type %s\n"), + ACE_LIB_TEXT ("cannot locate Module_Type %s or STREAM_Type %s\n"), module_type_name, str_rec->name ())); ace_yyerrno++; @@ -323,7 +323,7 @@ ace_get_module (ACE_Static_Node *str_rec, if (ACE_OS::strcmp (mp->name (), module_type_name) != 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("warning: assigning Module_Type name %s to Module %s since names differ\n"), + ACE_LIB_TEXT ("warning: assigning Module_Type name %s to Module %s since names differ\n"), module_type_name, mp->name ())); mp->name (module_type_name); @@ -366,7 +366,7 @@ ace_create_service_type (const ACE_TCHAR *name, break; default: ACE_ERROR ((LM_ERROR, - ACE_TEXT ("unknown case\n"))); + ACE_LIB_TEXT ("unknown case\n"))); ace_yyerrno++; break; } @@ -480,7 +480,7 @@ int ace_yyindent; ACE_YYDEBUG_INDENT(ace_yyindent); printf(" .... look ahead at %s `%s'\n", ace_yytoken_string, - (0 == ace_yytoken_num) ? ACE_TEXT ("\0") : ACE_YYDEBUG_LEXER_TEXT); + (0 == ace_yytoken_num) ? ACE_LIB_TEXT ("\0") : ACE_YYDEBUG_LEXER_TEXT); } #endif /* ACE_YYDEBUG_LOOK_AHEAD */ #ifndef ACE_YYDEBUG_DISCARD_STATE @@ -621,7 +621,7 @@ ace_yyloop: goto ace_yynewerror; #endif - ace_yyerror(ACE_TEXT ("syntax error")); + ace_yyerror(ACE_LIB_TEXT ("syntax error")); #ifdef lint goto ace_yyerrlab; #endif @@ -828,7 +828,7 @@ case 25: || st->push (mt) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("dynamic initialization failed for Module %s\n"), + ACE_LIB_TEXT ("dynamic initialization failed for Module %s\n"), svc_type->name ())); ace_yyerrno++; } @@ -843,7 +843,7 @@ case 26: if (((ACE_Stream_Type *) (ace_yyvsp[-2].static_node_)->record ()->type ())->push (mt) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Problem with static\n"))); + ACE_LIB_TEXT ("Problem with static\n"))); ace_yyerrno++; } } @@ -881,7 +881,7 @@ case 29: if (mt != 0 && st->remove (mt) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("cannot remove Module_Type %s from STREAM_Type %s\n"), + ACE_LIB_TEXT ("cannot remove Module_Type %s from STREAM_Type %s\n"), module->name (), stream->name ())); ace_yyerrno++; @@ -913,7 +913,7 @@ case 30: else { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to find service: %s\n"), + ACE_LIB_TEXT ("Unable to find service: %s\n"), ace_yyvsp[-3].ident_)); ++ace_yyerrno; ace_yyval.svc_record_ = 0; @@ -1033,7 +1033,7 @@ to state %d\n", *ace_yyssp, ace_yystate); *++ace_yyvsp = ace_yyval; goto ace_yyloop; ace_yyoverflow: - ace_yyerror(ACE_TEXT ("yacc stack overflow")); + ace_yyerror(ACE_LIB_TEXT ("yacc stack overflow")); ace_yyabort: return (1); ace_yyaccept: diff --git a/ace/Svc_Handler.cpp b/ace/Svc_Handler.cpp index 8fdced1ef9e..89f8e6a8d29 100644 --- a/ace/Svc_Handler.cpp +++ b/ace/Svc_Handler.cpp @@ -131,16 +131,16 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::open (void *) if (this->peer_.get_remote_addr (client_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("get_remote_addr")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("get_remote_addr")), -1); else if (client_addr.addr_to_string (buf, sizeof buf) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("can't obtain peer's address")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("can't obtain peer's address")), -1); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("connected to %s on fd %d\n"), + ACE_LIB_TEXT ("connected to %s on fd %d\n"), buf, this->peer_.get_handle ())); #endif /* ACE_DEBUGGING */ @@ -149,8 +149,8 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::open (void *) (this, ACE_Event_Handler::READ_MASK) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("unable to register client handler")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("unable to register client handler")), -1); return 0; } diff --git a/ace/Synch.cpp b/ace/Synch.cpp index 1389d523d6b..a8cc5775964 100644 --- a/ace/Synch.cpp +++ b/ace/Synch.cpp @@ -130,7 +130,7 @@ ACE_Semaphore::dump (void) const // ACE_TRACE ("ACE_Semaphore::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -145,8 +145,8 @@ ACE_Semaphore::ACE_Semaphore (u_int count, if (ACE_OS::sema_init (&this->semaphore_, count, type, name, arg, max) != 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT("%p\n"), - ACE_TEXT("ACE_Semaphore::ACE_Semaphore"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Semaphore::ACE_Semaphore"))); } ACE_Semaphore::~ACE_Semaphore (void) @@ -165,10 +165,10 @@ ACE_Mutex::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); #if defined (CHORUS) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("lockname_ = %s\n"), this->lockname_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("process_lock_ = %x\n"), this->process_lock_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("lockname_ = %s\n"), this->lockname_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("process_lock_ = %x\n"), this->process_lock_)); #endif /* CHORUS */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -241,8 +241,8 @@ ACE_Mutex::ACE_Mutex (int type, const ACE_TCHAR *name, ACE_mutexattr_t *arg) name, arg) != 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Mutex::ACE_Mutex"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Mutex::ACE_Mutex"))); } ACE_Mutex::~ACE_Mutex (void) @@ -265,8 +265,8 @@ ACE_Event::ACE_Event (int manual_reset, name, arg) != 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT("%p\n"), - ACE_TEXT("ACE_Event::ACE_Event"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Event::ACE_Event"))); } ACE_Event::~ACE_Event (void) @@ -338,15 +338,29 @@ ACE_Event::dump (void) const ACE_Manual_Event::ACE_Manual_Event (int initial_state, int type, - const ACE_TCHAR *name, + const char *name, void *arg) : ACE_Event (1, initial_state, type, - name, + ACE_TEXT_CHAR_TO_TCHAR (name), + arg) +{ +} + +#if defined (ACE_HAS_WCHAR) +ACE_Manual_Event::ACE_Manual_Event (int initial_state, + int type, + const wchar_t *name, + void *arg) + : ACE_Event (1, + initial_state, + type, + ACE_TEXT_WCHAR_TO_TCHAR (name), arg) { } +#endif /* ACE_HAS_WCHAR */ void ACE_Manual_Event::dump (void) const @@ -414,7 +428,7 @@ ACE_Thread_Mutex_Guard::dump (void) const // ACE_TRACE ("ACE_Thread_Mutex_Guard::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } #endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */ @@ -433,8 +447,8 @@ ACE_Recursive_Thread_Mutex::ACE_Recursive_Thread_Mutex (const ACE_TCHAR *name, name, arg) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("recursive_mutex_init"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("recursive_mutex_init"))); } ACE_ALLOC_HOOK_DEFINE(ACE_Recursive_Thread_Mutex) @@ -537,10 +551,10 @@ ACE_Condition_Thread_Mutex::dump (void) const // ACE_TRACE ("ACE_Condition_Thread_Mutex::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); #if defined (ACE_WIN32) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("waiters = %d\n"), + ACE_LIB_TEXT ("waiters = %d\n"), this->cond_.waiters ())); #endif /* ACE_WIN32 */ ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -565,8 +579,8 @@ ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex (const ACE_Thread_Mutex & name, arg) != 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex"))); } ACE_Condition_Thread_Mutex:: @@ -587,8 +601,8 @@ ACE_Condition_Thread_Mutex (const ACE_Thread_Mutex &m, // ACE_TRACE ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex"); if (ACE_OS::cond_init (&this->cond_, attributes.attributes_, name, arg) != 0) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex"))); } ACE_Condition_Thread_Mutex::~ACE_Condition_Thread_Mutex (void) @@ -648,8 +662,8 @@ ACE_Sub_Barrier::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->barrier_finished_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("running_threads_ = %d"), this->running_threads_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("running_threads_ = %d"), this->running_threads_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -674,8 +688,8 @@ ACE_Barrier::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("current_generation_ = %d"), this->current_generation_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\ncount_ = %d"), this->count_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("current_generation_ = %d"), this->current_generation_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncount_ = %d"), this->count_)); this->sub_barrier_1_.dump (); this->sub_barrier_2_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -784,7 +798,7 @@ ACE_Thread_Mutex::dump (void) const // ACE_TRACE ("ACE_Thread_Mutex::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -804,8 +818,8 @@ ACE_Thread_Mutex::ACE_Thread_Mutex (const ACE_TCHAR *name, ACE_mutexattr_t *arg) name, arg) != 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Thread_Mutex::ACE_Thread_Mutex"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Thread_Mutex::ACE_Thread_Mutex"))); } void @@ -814,7 +828,7 @@ ACE_RW_Mutex::dump (void) const // ACE_TRACE ("ACE_RW_Mutex::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -824,8 +838,8 @@ ACE_RW_Mutex::ACE_RW_Mutex (int type, const ACE_TCHAR *name, void *arg) // ACE_TRACE ("ACE_RW_Mutex::ACE_RW_Mutex"); if (ACE_OS::rwlock_init (&this->lock_, type, name, arg) != 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT("%p\n"), - ACE_TEXT("ACE_RW_Mutex::ACE_RW_Mutex"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_RW_Mutex::ACE_RW_Mutex"))); } ACE_RW_Mutex::~ACE_RW_Mutex (void) diff --git a/ace/Synch.h b/ace/Synch.h index 015b5cf9c5e..d86dc5aa68d 100644 --- a/ace/Synch.h +++ b/ace/Synch.h @@ -721,10 +721,18 @@ class ACE_Export ACE_Manual_Event : public ACE_Event public: ACE_Manual_Event (int initial_state = 0, int type = USYNC_THREAD, - const ACE_TCHAR *name = 0, + const char *name = 0, void *arg = 0); // constructor which will create manual event +#if defined (ACE_HAS_WCHAR) + ACE_Manual_Event (int initial_state, + int type, + const wchar_t *name, + void *arg = 0); + // constructor which will create manual event (wchar_t version) +#endif /* ACE_HAS_WCHAR */ + ~ACE_Manual_Event (void); // Default dtor. diff --git a/ace/Synch_T.cpp b/ace/Synch_T.cpp index c7c6695c444..2179fdf0472 100644 --- a/ace/Synch_T.cpp +++ b/ace/Synch_T.cpp @@ -114,8 +114,8 @@ ACE_Guard<ACE_LOCK>::dump (void) const // ACE_TRACE ("ACE_Guard<ACE_LOCK>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("mutex_ = %x\n"), this->lock_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_ = %d\n"), this->owner_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("mutex_ = %x\n"), this->lock_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("owner_ = %d\n"), this->owner_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -148,10 +148,10 @@ ACE_Condition<MUTEX>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); #if defined (CHORUS) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("condname_ = %s\n"), this->condname_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("process_cond_ = %x\n"), this->process_cond_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("condname_ = %s\n"), this->condname_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("process_cond_ = %x\n"), this->process_cond_)); #endif /* CHORUS */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -247,8 +247,8 @@ ACE_Condition<MUTEX>::ACE_Condition (MUTEX &m, name, arg) != 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Condition::ACE_Condition"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Condition::ACE_Condition"))); } template <class MUTEX> @@ -258,8 +258,8 @@ ACE_Condition<MUTEX>::~ACE_Condition (void) if (this->remove () == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Condition::~ACE_Condition"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Condition::~ACE_Condition"))); } template <class MUTEX> int @@ -344,9 +344,9 @@ ACE_TSS<TYPE>::dump (void) const #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->keylock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %d\n"), this->key_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nonce_ = %d"), this->once_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("key_ = %d\n"), this->key_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nonce_ = %d"), this->once_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */ } @@ -437,15 +437,15 @@ ACE_TSS<TYPE>::ACE_TSS (TYPE *ts_obj) { delete tss_adapter; ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Thread::setspecific() failed!"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Thread::setspecific() failed!"))); } #else if (ACE_Thread::setspecific (this->key_, (void *) ts_obj) != 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Thread::setspecific() failed!"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_Thread::setspecific() failed!"))); #endif /* ACE_HAS_THR_C_DEST */ } } @@ -616,8 +616,8 @@ ACE_TSS_Guard<ACE_LOCK>::dump (void) const // ACE_TRACE ("ACE_TSS_Guard<ACE_LOCK>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %d"), this->key_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("key_ = %d"), this->key_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/System_Time.cpp b/ace/System_Time.cpp index 192fe6cdcfb..2feabc3cadb 100644 --- a/ace/System_Time.cpp +++ b/ace/System_Time.cpp @@ -23,13 +23,13 @@ ACE_System_Time::ACE_System_Time (const ACE_TCHAR *poolname) MAXPATHLEN - 17) == -1) // -17 for ace-malloc-XXXXXX { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Temporary path too long, ") - ACE_TEXT ("defaulting to current directory\n"))); + ACE_LIB_TEXT ("Temporary path too long, ") + ACE_LIB_TEXT ("defaulting to current directory\n"))); this->poolname_[0] = 0; } // Add the filename to the end - ACE_OS::strcat (this->poolname_, ACE_TEXT ("ace-malloc-XXXXXX")); + ACE_OS::strcat (this->poolname_, ACE_LIB_TEXT ("ace-malloc-XXXXXX")); #endif /* ACE_DEFAULT_BACKING_STORE */ } diff --git a/ace/TLI.cpp b/ace/TLI.cpp index a58798f1202..c57e9f5f2cb 100644 --- a/ace/TLI.cpp +++ b/ace/TLI.cpp @@ -75,7 +75,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, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_TLI::ACE_TLI"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_TLI::ACE_TLI"))); } int diff --git a/ace/TLI_Acceptor.cpp b/ace/TLI_Acceptor.cpp index a413941baa2..3002c54bdc4 100644 --- a/ace/TLI_Acceptor.cpp +++ b/ace/TLI_Acceptor.cpp @@ -385,8 +385,8 @@ ACE_TLI_Acceptor::ACE_TLI_Acceptor (const ACE_Addr &remote_sap, back, dev) == ACE_INVALID_HANDLE) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_TLI_Acceptor::ACE_TLI_Acceptor"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_TLI_Acceptor::ACE_TLI_Acceptor"))); } int diff --git a/ace/TLI_Connector.i b/ace/TLI_Connector.i index 42f52a0b74e..50e86fc1ce0 100644 --- a/ace/TLI_Connector.i +++ b/ace/TLI_Connector.i @@ -31,7 +31,7 @@ ACE_TLI_Connector::ACE_TLI_Connector (ACE_TLI_Stream &new_stream, udata, opt) == ACE_INVALID_HANDLE && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream"))); } ACE_INLINE diff --git a/ace/TP_Reactor.i b/ace/TP_Reactor.i index 969a7fdaf02..64b5ad0c0ea 100644 --- a/ace/TP_Reactor.i +++ b/ace/TP_Reactor.i @@ -35,5 +35,5 @@ ACE_TP_Reactor::notify_handle (ACE_HANDLE, ACE_EH_PTMF) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_TP_Reactor::notify_handle: Wrong version of notify_handle() gets called"))); + ACE_LIB_TEXT ("ACE_TP_Reactor::notify_handle: Wrong version of notify_handle() gets called"))); } diff --git a/ace/Task_T.cpp b/ace/Task_T.cpp index 0d2be69edbd..2ca33724956 100644 --- a/ace/Task_T.cpp +++ b/ace/Task_T.cpp @@ -24,14 +24,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, ACE_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_)); this->msg_queue_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_msg_queue_ = %d\n"), this->delete_msg_queue_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags = %x"), this->flags_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmod_ = %x"), this->mod_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %x"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_count_ = %d"), this->thr_count_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("delete_msg_queue_ = %d\n"), this->delete_msg_queue_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nflags = %x"), this->flags_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmod_ = %x"), this->mod_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_ = %x"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_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/Thread_Manager.cpp b/ace/Thread_Manager.cpp index 4e97b5967ea..0d230fa57ea 100644 --- a/ace/Thread_Manager.cpp +++ b/ace/Thread_Manager.cpp @@ -36,8 +36,8 @@ ACE_Thread_Manager::dump (void) ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncurrent_count_ = %d"), this->thr_list_.size ())); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncurrent_count_ = %d"), this->thr_list_.size ())); for (ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter (this->thr_list_); !iter.done (); @@ -222,12 +222,12 @@ ACE_Thread_Descriptor::dump (void) const ACE_TRACE ("ACE_Thread_Descriptor::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_id_ = %d"), this->thr_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_handle_ = %d"), this->thr_handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_state_ = %d"), this->thr_state_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncleanup_info_.cleanup_hook_ = %x"), this->cleanup_info_.cleanup_hook_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags_ = %x\n"), this->flags_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthr_id_ = %d"), this->thr_id_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthr_handle_ = %d"), this->thr_handle_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthr_state_ = %d"), this->thr_state_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncleanup_info_.cleanup_hook_ = %x"), this->cleanup_info_.cleanup_hook_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nflags_ = %x\n"), this->flags_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Time_Request_Reply.cpp b/ace/Time_Request_Reply.cpp index 26405d37840..79a17254de2 100644 --- a/ace/Time_Request_Reply.cpp +++ b/ace/Time_Request_Reply.cpp @@ -158,31 +158,31 @@ void ACE_Time_Request::dump (void) const { ACE_TRACE ("ACE_Time_Request::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("*******\nlength = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("*******\nlength = %d\n"), this->size ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("message-type = "))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("message-type = "))); switch (this->msg_type ()) { case ACE_Time_Request::TIME_UPDATE: - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TIME_UPDATE\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("TIME_UPDATE\n"))); break; default: - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<unknown type> = %d\n"), this->msg_type ())); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("<unknown type> = %d\n"), this->msg_type ())); break; } if (this->block_forever ()) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("blocking forever\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("blocking forever\n"))); else { #if !defined (ACE_NLOGGING) ACE_Time_Value tv = this->timeout (); #endif /* ! ACE_NLOGGING */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("waiting for %d secs and %d usecs\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("waiting for %d secs and %d usecs\n"), tv.sec (), tv.usec ())); } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("*******\ntime = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("*******\ntime = %d\n"), this->time ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("+++++++\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("+++++++\n"))); } diff --git a/ace/Timeprobe_T.cpp b/ace/Timeprobe_T.cpp index 395ebbceb3f..988565ccee1 100644 --- a/ace/Timeprobe_T.cpp +++ b/ace/Timeprobe_T.cpp @@ -42,7 +42,7 @@ ACE_Timeprobe<ACE_LOCK>::ACE_Timeprobe (const ACE_Timeprobe<ACE_LOCK> &) // ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_NOTSUP: %s, line %d\n"), __FILE__, __LINE__)); + ACE_LIB_TEXT ("ACE_NOTSUP: %s, line %d\n"), __FILE__, __LINE__)); errno = ENOTSUP; } diff --git a/ace/Timer_Hash_T.cpp b/ace/Timer_Hash_T.cpp index 85134f9f779..312ca80d364 100644 --- a/ace/Timer_Hash_T.cpp +++ b/ace/Timer_Hash_T.cpp @@ -298,14 +298,14 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::dump (void) const { ACE_TRACE ("ACE_Timer_Hash_T::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntable_size_ = %d"), this->table_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nearliest_position_ = %d"), this->earliest_position_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntable_size_ = %d"), this->table_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nearliest_position_ = %d"), this->earliest_position_)); for (size_t i = 0; i < this->table_size_; i++) if (!this->table_[i]->is_empty ()) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nBucket %d contains nodes"), i)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nBucket %d contains nodes"), i)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp index 7f2ddf725fc..fac86848441 100644 --- a/ace/Timer_Heap_T.cpp +++ b/ace/Timer_Heap_T.cpp @@ -258,23 +258,23 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const ACE_TRACE ("ACE_Timer_Heap::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmax_size_ = %d"), this->max_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nheap_ = \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmax_size_ = %d"), this->max_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_size_ = %d"), this->cur_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nheap_ = \n"))); for (size_t i = 0; i < this->cur_size_; i++) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%d\n"), + ACE_LIB_TEXT ("%d\n"), i)); this->heap_[i]->dump (); } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_ids_ = \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntimer_ids_ = \n"))); for (size_t j = 0; j < this->cur_size_; j++) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%d\t%d\n"), + ACE_LIB_TEXT ("%d\t%d\n"), j, this->timer_ids_[j])); diff --git a/ace/Timer_List_T.cpp b/ace/Timer_List_T.cpp index 9785ddc1e29..4e9dcead8cb 100644 --- a/ace/Timer_List_T.cpp +++ b/ace/Timer_List_T.cpp @@ -150,8 +150,8 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const curr = curr->get_next ()) count++; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize_ = %d"), count)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_id_ = %d"), this->timer_id_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsize_ = %d"), count)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntimer_id_ = %d"), this->timer_id_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Timer_Queue_Adapters.cpp b/ace/Timer_Queue_Adapters.cpp index c98b0b6c70b..07fed0f4d18 100644 --- a/ace/Timer_Queue_Adapters.cpp +++ b/ace/Timer_Queue_Adapters.cpp @@ -78,8 +78,8 @@ ACE_Async_Timer_Queue_Adapter<TQ>::schedule (ACE_Event_Handler *eh, if (tid == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("schedule_timer")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("schedule_timer")), -1); if (this->schedule_ualarm () == -1) @@ -104,8 +104,8 @@ ACE_Async_Timer_Queue_Adapter<TQ>::ACE_Async_Timer_Queue_Adapter (ACE_Sig_Set *m if (this->sig_handler_.register_handler (SIGALRM, this, &sa) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("register_handler"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("register_handler"))); } // This is the signal handler function for the asynchronous timer @@ -236,7 +236,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, ACE_TEXT ("waiting until %u.%3.3u secs\n"), + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("waiting until %u.%3.3u secs\n"), // tv.sec(), tv.msec())); this->condition_.wait (&tv); } @@ -250,7 +250,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::svc (void) ACE_PTHREAD_CLEANUP_POP (0); # endif /* ACE_LACKS_PTHREAD_CANCEL */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("terminating dispatching thread\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("terminating dispatching thread\n"))); return 0; } diff --git a/ace/Timer_Queue_T.cpp b/ace/Timer_Queue_T.cpp index 9c0051ab844..52f70c01fd7 100644 --- a/ace/Timer_Queue_T.cpp +++ b/ace/Timer_Queue_T.cpp @@ -24,12 +24,12 @@ ACE_Timer_Node_T<TYPE>::dump (void) const { ACE_TRACE ("ACE_Timer_Node_T::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nact_ = %x"), this->act_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nact_ = %x"), this->act_)); this->timer_value_.dump (); this->interval_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nprev_ = %x"), this->prev_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %x"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_id_ = %d\n"), this->timer_id_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nprev_ = %x"), this->prev_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_ = %x"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntimer_id_ = %d\n"), this->timer_id_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Timer_Wheel_T.cpp b/ace/Timer_Wheel_T.cpp index 77acdbd7b42..32443610a84 100644 --- a/ace/Timer_Wheel_T.cpp +++ b/ace/Timer_Wheel_T.cpp @@ -446,13 +446,13 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const ACE_TRACE ("ACE_Timer_Wheel_T::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nwheel_size_ = %d"), this->wheel_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nresolution_ = %d"), this->resolution_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nwheel_ = \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nwheel_size_ = %d"), this->wheel_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nresolution_ = %d"), this->resolution_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nwheel_ = \n"))); for (size_t i = 0; i < this->wheel_size_; i++) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%d\n"), i)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("%d\n"), i)); ACE_Timer_Node_T<TYPE> *temp = this->wheel_[i]->get_next (); while (temp != this->wheel_[i]) { diff --git a/ace/Token.cpp b/ace/Token.cpp index 3a0f97fa5a3..c51629f549b 100644 --- a/ace/Token.cpp +++ b/ace/Token.cpp @@ -27,13 +27,13 @@ ACE_Token::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthread = %d"), ACE_Thread::self ())); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthread = %d"), ACE_Thread::self ())); // @@ Is there a portable way to do this? // ACE_DEBUG ((LM_DEBUG, "\nowner_ = %l", (long) this->owner_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nowner_ addr = %x"), &this->owner_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nwaiters_ = %d"), this->waiters_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nin_use_ = %d"), this->in_use_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnesting level = %d"), this->nesting_level_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nowner_ addr = %x"), &this->owner_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nwaiters_ = %d"), this->waiters_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nin_use_ = %d"), this->in_use_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnesting level = %d"), this->nesting_level_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/Token_Collection.cpp b/ace/Token_Collection.cpp index 56eab4f134d..e94426b0144 100644 --- a/ace/Token_Collection.cpp +++ b/ace/Token_Collection.cpp @@ -16,7 +16,7 @@ ACE_Token_Collection::ACE_Token_Collection (int debug, ACE_TRACE ("ACE_Token_Collection::ACE_Token_Collection"); if (name == 0) - name = ACE_TEXT ("no name"); + name = ACE_LIB_TEXT ("no name"); int n = ACE_OS::strlen (name) + 1; @@ -43,7 +43,7 @@ ACE_Token_Collection::insert (ACE_Token_Proxy &new_token) ACE_Token_Proxy *temp = new_token.clone (); if (collection_.bind (name, temp) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("bind failed\n")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("bind failed\n")), -1); return 0; } @@ -88,7 +88,7 @@ ACE_Token_Collection::acquire (int notify, { if (debug_) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("collection acquiring %s\n"), + ACE_LIB_TEXT ("collection acquiring %s\n"), temp->int_id_->name ())); if (temp->int_id_->acquire (notify, sleep_hook, @@ -152,7 +152,7 @@ ACE_Token_Collection::tryacquire (void (*sleep_hook)(void *)) iterator.advance ()) { if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("collection acquiring %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_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) @@ -175,7 +175,7 @@ ACE_Token_Collection::renew (int requeue_position, iterator.advance ()) { if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("collection renewing %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("collection renewing %s\n"), temp->int_id_->name ())); if (temp->int_id_->renew (requeue_position, options) == -1) return -1; @@ -198,8 +198,8 @@ ACE_Token_Collection::renew (const ACE_TCHAR *token_name, // Did we find it? if (result == -1) - ACE_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("%p %s\n"), - ACE_TEXT ("not in collection "), + ACE_ERROR_RETURN ((LM_DEBUG, ACE_LIB_TEXT ("%p %s\n"), + ACE_LIB_TEXT ("not in collection "), token_name), -1); // perform the operation return temp->renew (requeue_position, options); @@ -217,7 +217,7 @@ ACE_Token_Collection::release (ACE_Synch_Options &) iterator.advance ()) { if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("collection releasing %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("collection releasing %s\n"), temp->int_id_->name ())); temp->int_id_->release (); } @@ -278,11 +278,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_TEXT ("ACE_Token_Collection::dump:\n") - ACE_TEXT (" debug_ = %d\n"), debug_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("collection_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Collection::dump:\n") + ACE_LIB_TEXT (" debug_ = %d\n"), debug_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("collection_\n"))); collection_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_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 547d64e287e..7ad59665b0e 100644 --- a/ace/Token_Invariants.cpp +++ b/ace/Token_Invariants.cpp @@ -137,9 +137,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, ACE_TEXT ("mutex_collection_:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("mutex_collection_:\n"))); mutex_collection_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("rwlock_collection_:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_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, ACE_TEXT ("owners_ = %d\n"), owners_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_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, ACE_TEXT ("writers_ = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_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 019dcb2e921..8ce44b15042 100644 --- a/ace/Token_Manager.cpp +++ b/ace/Token_Manager.cpp @@ -150,8 +150,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, ACE_TEXT ("(%t) Deadlock detected.\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s owns %s and is waiting for %s.\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) Deadlock detected.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("%s owns %s and is waiting for %s.\n"), proxy->client_id (), token->name (), proxy->token_->name ())); @@ -173,7 +173,7 @@ ACE_Token_Manager::check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy) if (debug_) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s owns %s and is waiting for %s.\n"), + ACE_LIB_TEXT ("%s owns %s and is waiting for %s.\n"), e->client_id (), token->name (), twf->name ())); @@ -228,7 +228,7 @@ ACE_Token_Manager::release_token (ACE_Tokens *&token) // we did not find one in the collection { errno = ENOENT; - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Token Manager could not release %s:%d\n"), + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("Token Manager could not release %s:%d\n"), token->name (), token->type ())); // @@ bad } @@ -254,10 +254,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_TEXT ("ACE_Token_Manager::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("lock_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Manager::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("lock_\n"))); lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("collection_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_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 3333f88bf28..dca95183e83 100644 --- a/ace/Token_Request_Reply.cpp +++ b/ace/Token_Request_Reply.cpp @@ -91,42 +91,42 @@ void ACE_Token_Request::dump (void) const { ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("*******\nlength = %d\ntoken name = %s\nclient id = %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("*******\nlength = %d\ntoken name = %s\nclient id = %s\n"), this->length (), this->token_name (), this->client_id ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("type = "))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("type = "))); if (this->token_type () == ACE_Tokens::MUTEX) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("MUTEX\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("MUTEX\n"))); else // == ACE_Tokens::RWLOCK { if (this->proxy_type () == ACE_RW_Token::READER) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RLOCK\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("RLOCK\n"))); else // == WRITER - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("WLOCK\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("WLOCK\n"))); } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("operation = "))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("operation = "))); switch (this->operation_type ()) { case ACE_Token_Request::ACQUIRE: - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACQUIRE\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACQUIRE\n"))); break; case ACE_Token_Request::RELEASE: - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RELEASE\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("RELEASE\n"))); break; case ACE_Token_Request::RENEW: - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RENEW\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("RENEW\n"))); break; default: - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<unknown operation type> = %d\n"), this->operation_type ())); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("<unknown operation type> = %d\n"), this->operation_type ())); break; } if (this->options ()[ACE_Synch_Options::USE_TIMEOUT] == 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("blocking forever\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("blocking forever\n"))); else { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("waiting for %d secs and %d usecs\n"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("waiting for %d secs and %d usecs\n"), this->options ().timeout ().sec (), this->options ().timeout ().usec ())); } ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -169,7 +169,7 @@ ACE_Token_Reply::decode (void) void ACE_Token_Reply::dump (void) const { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("*******\nlength = %d\nerrnum = %d"), + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("*******\nlength = %d\nerrnum = %d"), this->length (), this->errnum ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("arg = %d"), this->arg ())); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("arg = %d"), this->arg ())); } diff --git a/ace/Token_Request_Reply.i b/ace/Token_Request_Reply.i index 506068a3106..999677a664f 100644 --- a/ace/Token_Request_Reply.i +++ b/ace/Token_Request_Reply.i @@ -125,7 +125,7 @@ ACE_Token_Request::token_name (const ACE_TCHAR *token_name, // Set up pointers and copy token_name and client_id into request. token_name_ = this->transfer_.data_; client_id_ = &this->token_name_[token_name_length + 1]; // Add 1 for ':'; - client_id_[-1] = ACE_TEXT (':'); // Insert the ':' before this->clientId_. + client_id_[-1] = ACE_LIB_TEXT (':'); // Insert the ':' before this->clientId_. (void) ACE_OS::memcpy (this->token_name_, token_name, diff --git a/ace/Trace.cpp b/ace/Trace.cpp index 197901d2c5c..892677b8605 100644 --- a/ace/Trace.cpp +++ b/ace/Trace.cpp @@ -84,9 +84,9 @@ ACE_Trace::ACE_Trace (const ACE_TCHAR *n, { lm->trace_active (1); ACE_DEBUG ((LM_TRACE, - ACE_TEXT ("%*s(%t) calling %s in file `%s' on line %d\n"), + ACE_LIB_TEXT ("%*s(%t) calling %s in file `%s' on line %d\n"), ACE_Trace::nesting_indent_ * lm->inc (), - ACE_TEXT (""), + ACE_LIB_TEXT (""), this->name_, file, line)); @@ -108,9 +108,9 @@ ACE_Trace::~ACE_Trace (void) { lm->trace_active (1); ACE_DEBUG ((LM_TRACE, - ACE_TEXT ("%*s(%t) leaving %s\n"), + ACE_LIB_TEXT ("%*s(%t) leaving %s\n"), ACE_Trace::nesting_indent_ * lm->dec (), - ACE_TEXT (""), + ACE_LIB_TEXT (""), this->name_)); lm->trace_active (0); } diff --git a/ace/Trace.h b/ace/Trace.h index 8cfc8abb627..b75fed44148 100644 --- a/ace/Trace.h +++ b/ace/Trace.h @@ -36,7 +36,7 @@ public: ACE_Trace (const ACE_TCHAR *n, int line = 0, - const ACE_TCHAR *file = ACE_TEXT ("")); + const ACE_TCHAR *file = ACE_LIB_TEXT ("")); // Perform the first part of the trace, which prints out the string // N, the LINE, and the ACE_FILE as the function is entered. diff --git a/ace/UPIPE_Acceptor.cpp b/ace/UPIPE_Acceptor.cpp index 63a217d56c0..379155616f3 100644 --- a/ace/UPIPE_Acceptor.cpp +++ b/ace/UPIPE_Acceptor.cpp @@ -59,8 +59,8 @@ ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_addr, if (this->open (local_addr, reuse_addr) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_UPIPE_Acceptor"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_UPIPE_Acceptor"))); } int @@ -99,17 +99,17 @@ ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream, (char *) &remote_stream, sizeof remote_stream) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_UPIPE_Acceptor: %p\n"), - ACE_TEXT ("read stream address failed"))); + ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"), + ACE_LIB_TEXT ("read stream address failed"))); else if (new_stream.stream_.link (remote_stream->stream_) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_UPIPE_Acceptor: %p\n"), - ACE_TEXT ("link streams failed"))); + ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"), + ACE_LIB_TEXT ("link streams failed"))); // Send a message over the new streampipe to confirm acceptance. else if (new_stream.send (&mb_, 0) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_UPIPE_Acceptor: %p\n"), - ACE_TEXT ("linked stream.put failed"))); + ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"), + ACE_LIB_TEXT ("linked stream.put failed"))); // Close down the new_stream at this point in order to conserve // handles. Note that we don't need the SPIPE connection diff --git a/ace/UPIPE_Connector.cpp b/ace/UPIPE_Connector.cpp index 51db226f879..55fec5068eb 100644 --- a/ace/UPIPE_Connector.cpp +++ b/ace/UPIPE_Connector.cpp @@ -64,8 +64,8 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream, sizeof ustream); if (result == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_UPIPE_Connector %p\n"), - ACE_TEXT ("write to pipe failed"))); + ACE_LIB_TEXT ("ACE_UPIPE_Connector %p\n"), + ACE_LIB_TEXT ("write to pipe failed"))); // Wait for confirmation of stream linking. ACE_Message_Block *mb_p = 0; @@ -77,8 +77,8 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream, // They perform different checks and cannot be merged. if (result == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_UPIPE_Connector %p\n"), - ACE_TEXT ("no confirmation from server"))); + ACE_LIB_TEXT ("ACE_UPIPE_Connector %p\n"), + ACE_LIB_TEXT ("no confirmation from server"))); else // Close down the new_stream at this point in order to // conserve handles. Note that we don't need the SPIPE diff --git a/ace/UPIPE_Connector.i b/ace/UPIPE_Connector.i index cc7c580b8f8..a8a68342e77 100644 --- a/ace/UPIPE_Connector.i +++ b/ace/UPIPE_Connector.i @@ -19,9 +19,9 @@ ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream, reuse_addr, flags, perms) == -1 && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("address %s, %p\n"), + ACE_LIB_TEXT ("address %s, %p\n"), addr.get_path_name (), - ACE_TEXT ("ACE_UPIPE_Connector"))); + ACE_LIB_TEXT ("ACE_UPIPE_Connector"))); } ASYS_INLINE int diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp index de4b4923a09..6c818e12239 100644 --- a/ace/WFMO_Reactor.cpp +++ b/ace/WFMO_Reactor.cpp @@ -26,7 +26,7 @@ ACE_WFMO_Reactor_Handler_Repository::open (size_t size) { if (size > MAXIMUM_WAIT_OBJECTS) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%d exceeds MAXIMUM_WAIT_OBJECTS (%d)\n"), + ACE_LIB_TEXT ("%d exceeds MAXIMUM_WAIT_OBJECTS (%d)\n"), size, MAXIMUM_WAIT_OBJECTS), -1); @@ -925,53 +925,53 @@ ACE_WFMO_Reactor_Handler_Repository::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Max size = %d\n"), + ACE_LIB_TEXT ("Max size = %d\n"), this->max_size_)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Current info table\n\n"))); + ACE_LIB_TEXT ("Current info table\n\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\tSize = %d\n"), + ACE_LIB_TEXT ("\tSize = %d\n"), this->max_handlep1_)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\tHandles to be suspended = %d\n"), + ACE_LIB_TEXT ("\tHandles to be suspended = %d\n"), this->handles_to_be_suspended_)); for (i = 0; i < this->max_handlep1_; i++) this->current_info_[i].dump (this->current_handles_[i]); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n"))); + ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("To-be-added info table\n\n"))); + ACE_LIB_TEXT ("To-be-added info table\n\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\tSize = %d\n"), + ACE_LIB_TEXT ("\tSize = %d\n"), this->handles_to_be_added_)); for (i = 0; i < this->handles_to_be_added_; i++) this->to_be_added_info_[i].dump (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n"))); + ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Suspended info table\n\n"))); + ACE_LIB_TEXT ("Suspended info table\n\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\tSize = %d\n"), + ACE_LIB_TEXT ("\tSize = %d\n"), this->suspended_handles_)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\tHandles to be resumed = %d\n"), + ACE_LIB_TEXT ("\tHandles to be resumed = %d\n"), this->handles_to_be_resumed_)); for (i = 0; i < this->suspended_handles_; i++) this->current_suspended_info_[i].dump (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n"))); + ACE_LIB_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Total handles to be deleted = %d\n"), + ACE_LIB_TEXT ("Total handles to be deleted = %d\n"), this->handles_to_be_deleted_)); ACE_DEBUG ((LM_DEBUG, @@ -1010,7 +1010,7 @@ ACE_WFMO_Reactor::ACE_WFMO_Reactor (ACE_Sig_Handler *sh, deactivated_ (0) { if (this->open (ACE_WFMO_Reactor::DEFAULT_SIZE, 0, sh, tq) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("WFMO_Reactor"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("WFMO_Reactor"))); } ACE_WFMO_Reactor::ACE_WFMO_Reactor (size_t size, @@ -1041,7 +1041,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, ACE_TEXT ("%p\n"), ACE_TEXT ("WFMO_Reactor"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("WFMO_Reactor"))); } int @@ -1112,8 +1112,8 @@ ACE_WFMO_Reactor::open (size_t size, // Open the handle repository. Two additional handles for internal // purposes if (this->handler_rep_.open (size + 2) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), - ACE_TEXT ("opening handler repository")), + ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("opening handler repository")), -1); else this->delete_handler_rep_ = 1; @@ -1138,16 +1138,16 @@ ACE_WFMO_Reactor::open (size_t size, // Open the notification handler if (this->notify_handler_->open (this, this->timer_queue_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("opening notify handler ")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("opening notify handler ")), -1); // Register for <wakeup_all_threads> event if (this->register_handler (&this->wakeup_all_threads_handler_, this->wakeup_all_threads_.handle ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("registering thread wakeup handler")), + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("registering thread wakeup handler")), -1); // Since we have added two handles into the handler repository, @@ -2100,11 +2100,11 @@ ACE_WFMO_Reactor::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Count of currently active threads = %d\n"), + ACE_LIB_TEXT ("Count of currently active threads = %d\n"), this->active_threads_)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("ID of owner thread = %d\n"), + ACE_LIB_TEXT ("ID of owner thread = %d\n"), this->owner_)); this->handler_rep_.dump (); @@ -2164,7 +2164,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, - // ACE_TEXT ("(%t) waking up to handle internal notifications\n"))); + // ACE_LIB_TEXT ("(%t) waking up to handle internal notifications\n"))); for (int i = 1; ; i++) { @@ -2213,7 +2213,7 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum, break; default: ACE_ERROR ((LM_ERROR, - ACE_TEXT ("invalid mask = %d\n"), + ACE_LIB_TEXT ("invalid mask = %d\n"), buffer->mask_)); break; } @@ -2306,7 +2306,7 @@ ACE_WFMO_Reactor_Notify::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->timer_queue_->dump (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Max. iteration: %d\n"), + ACE_LIB_TEXT ("Max. iteration: %d\n"), this->max_notify_iterations_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ace/WFMO_Reactor.i b/ace/WFMO_Reactor.i index a1f025844f7..5e851527c3e 100644 --- a/ace/WFMO_Reactor.i +++ b/ace/WFMO_Reactor.i @@ -15,7 +15,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, ACE_TEXT ("(%t) waking up to get updated handle set info\n"))); + // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) waking up to get updated handle set info\n"))); return 0; } @@ -79,31 +79,31 @@ ACE_WFMO_Reactor_Handler_Repository::Common_Info::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("I/O Entry = %d\n"), + ACE_LIB_TEXT ("I/O Entry = %d\n"), this->io_entry_)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Event Handler = %d\n"), + ACE_LIB_TEXT ("Event Handler = %d\n"), this->event_handler_)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("I/O Handle = %d\n"), + ACE_LIB_TEXT ("I/O Handle = %d\n"), this->io_handle_)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Network Events = %d\n"), + ACE_LIB_TEXT ("Network Events = %d\n"), this->network_events_)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Delete Event = %d\n"), + ACE_LIB_TEXT ("Delete Event = %d\n"), this->delete_event_)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Delete Entry = %d\n"), + ACE_LIB_TEXT ("Delete Entry = %d\n"), this->delete_entry_)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Close Masks = %d\n"), + ACE_LIB_TEXT ("Close Masks = %d\n"), this->close_masks_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -162,11 +162,11 @@ ACE_WFMO_Reactor_Handler_Repository::Current_Info::dump (ACE_HANDLE event_handle Common_Info::dump (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Event Handle = %d\n"), + ACE_LIB_TEXT ("Event Handle = %d\n"), event_handle)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Suspend Entry = %d\n"), + ACE_LIB_TEXT ("Suspend Entry = %d\n"), this->suspend_entry_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -231,11 +231,11 @@ ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::dump (void) const Common_Info::dump (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Event Handle = %d\n"), + ACE_LIB_TEXT ("Event Handle = %d\n"), this->event_handle_)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Suspend Entry = %d\n"), + ACE_LIB_TEXT ("Suspend Entry = %d\n"), this->suspend_entry_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -300,11 +300,11 @@ ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::dump (void) const Common_Info::dump (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Event Handle = %d\n"), + ACE_LIB_TEXT ("Event Handle = %d\n"), this->event_handle_)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Resume Entry = %d\n"), + ACE_LIB_TEXT ("Resume Entry = %d\n"), this->resume_entry_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); diff --git a/ace/WIN32_Asynch_IO.cpp b/ace/WIN32_Asynch_IO.cpp index be177137a20..b43205109a2 100644 --- a/ace/WIN32_Asynch_IO.cpp +++ b/ace/WIN32_Asynch_IO.cpp @@ -81,7 +81,7 @@ ACE_WIN32_Asynch_Result::post_completion (ACE_Proactor_Impl *proactor) if (win32_proactor == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Dynamic cast to WIN32 Proactor failed\n")), + ACE_LIB_TEXT ("Dynamic cast to WIN32 Proactor failed\n")), -1); // Post myself. @@ -390,8 +390,8 @@ ACE_WIN32_Asynch_Read_Stream::shared_read (ACE_WIN32_Asynch_Read_Stream_Result * if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ReadFile"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ReadFile"))); } return -1; @@ -627,8 +627,8 @@ ACE_WIN32_Asynch_Write_Stream::shared_write (ACE_WIN32_Asynch_Write_Stream_Resul if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("WriteFile"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("WriteFile"))); } return -1; } @@ -1289,7 +1289,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, size_t available_space = total_size - space_in_use; size_t space_needed = bytes_to_read + 2 * address_size; if (available_space < space_needed) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Buffer too small\n")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("Buffer too small\n")), -1); // WIN Specific. @@ -1305,8 +1305,8 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_OS::socket"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_OS::socket"))); } return -1; } @@ -1367,8 +1367,8 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ReadFile"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ReadFile"))); } return -1; } @@ -1650,8 +1650,8 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("TransmitFile"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("TransmitFile"))); } return -1; } diff --git a/ace/WIN32_Proactor.cpp b/ace/WIN32_Proactor.cpp index 846bf1571ac..08c21906e54 100644 --- a/ace/WIN32_Proactor.cpp +++ b/ace/WIN32_Proactor.cpp @@ -50,8 +50,8 @@ ACE_WIN32_Proactor::ACE_WIN32_Proactor (size_t number_of_threads, this->number_of_threads_); if (this->completion_port_ == 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("CreateIoCompletionPort"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("CreateIoCompletionPort"))); } ACE_WIN32_Proactor::~ACE_WIN32_Proactor (void) @@ -92,8 +92,8 @@ ACE_WIN32_Proactor::register_handle (ACE_HANDLE handle, if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("CreateIoCompletionPort"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("CreateIoCompletionPort"))); } return -1; } @@ -428,8 +428,8 @@ ACE_WIN32_Proactor::handle_events (unsigned long milli_seconds) if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("GetQueuedCompletionStatus"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("GetQueuedCompletionStatus"))); } return -1; } @@ -499,8 +499,8 @@ ACE_WIN32_Proactor::post_completion (ACE_WIN32_Asynch_Result *result) if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("PostQueuedCompletionStatus failed"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("PostQueuedCompletionStatus failed"))); } return -1; } diff --git a/ace/XTI_ATM_Mcast.i b/ace/XTI_ATM_Mcast.i index 93c22ac15c9..2baab539fc8 100644 --- a/ace/XTI_ATM_Mcast.i +++ b/ace/XTI_ATM_Mcast.i @@ -23,7 +23,7 @@ ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast (ACE_TLI_Stream &new_stream, info, rwf, udata, opt) == ACE_INVALID_HANDLE && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream"))); } // Connect the <new_stream> to the <remote_sap>, waiting up to diff --git a/ace/ace_wchar.h b/ace/ace_wchar.h index cbb5798be59..61e32ae46c1 100644 --- a/ace/ace_wchar.h +++ b/ace/ace_wchar.h @@ -41,7 +41,6 @@ # define ASYS_MULTIBYTE_STRING ACE_TEXT_CHAR_TO_TCHAR # define ASYS_WIDE_STRING ACE_TEXT_CHAR_TO_TCHAR # define ACE_WIDE_STRING ACE_TEXT_CHAR_TO_TCHAR -# define ACE_DIRECTORY_SEPARATOR_CHAR_A ACE_DIRECTORY_SEPARATOR_CHAR # if defined (ACE_USES_WCHAR) # define ASYS_ONLY_WIDE_STRING(STRING) STRING @@ -100,23 +99,30 @@ using std::size_t; // Define the unicode/wchar related macros correctly # if !defined (ACE_TEXT_WIDE) -# define ACE_TEXT_WIDE(STRING) L##STRING +# define ACE_TEXT_WIDE_I(STRING) L##STRING +# define ACE_TEXT_WIDE(STRING) ACE_TEXT_WIDE_I (STRING) # endif /* ACE_TEXT_WIDE */ #if defined (ACE_USES_WCHAR) typedef wchar_t ACE_TCHAR; -# define ACE_TEXT(STRING) ACE_TEXT_WIDE (STRING) +# define ACE_LIB_TEXT(STRING) ACE_TEXT_WIDE (STRING) # define ACE_TEXT_ALWAYS_CHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep () # define ACE_TEXT_CHAR_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () # define ACE_TEXT_WCHAR_TO_TCHAR(STRING) STRING #else /* ACE_USES_WCHAR */ typedef char ACE_TCHAR; -# define ACE_TEXT(STRING) STRING +# define ACE_LIB_TEXT(STRING) STRING # define ACE_TEXT_ALWAYS_CHAR(STRING) STRING # define ACE_TEXT_CHAR_TO_TCHAR(STRING) STRING # define ACE_TEXT_WCHAR_TO_TCHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep () #endif /* ACE_USES_WCHAR */ +#if defined (ACE_LEGACY_MODE) +# define ACE_TEXT TEXT +#else /* ACE_LEGACY_MODE */ +# define ACE_TEXT ACE_LIB_TEXT +#endif /* ACE_LEGACY_MODE */ + #if defined ACE_HAS_WCHAR class ACE_Wide_To_Ascii { diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h index 22adbb0a658..a6ea2ae078d 100644 --- a/ace/config-WinCE.h +++ b/ace/config-WinCE.h @@ -17,7 +17,7 @@ // Need to define LD search path explicitly on CE because // CE doesn't have environment variables and we can't get // the information using getenv. -#define ACE_DEFAULT_LD_SEARCH_PATH ACE_TEXT (".\\;\\windows") +#define ACE_DEFAULT_LD_SEARCH_PATH ACE_LIB_TEXT (".\\;\\windows") // CE is not NT. #if defined (ACE_HAS_WINNT4) diff --git a/ace/config-all.h b/ace/config-all.h index 41162ab4d95..aadf4e19110 100644 --- a/ace/config-all.h +++ b/ace/config-all.h @@ -607,8 +607,8 @@ typedef void *(*ACE_THR_C_FUNC)(void *); # else # include /**/ <stdio.h> # endif -# define ACE_NOTSUP_RETURN(FAILVALUE) do { errno = ENOTSUP; fprintf (stderr, ACE_TEXT ("ACE_NOTSUP: %s, line %d\n"), __FILE__, __LINE__); return FAILVALUE; } while (0) -# define ACE_NOTSUP do { errno = ENOTSUP; fprintf (stderr, ACE_TEXT ("ACE_NOTSUP: %s, line %d\n"), __FILE__, __LINE__); return; } while (0) +# define ACE_NOTSUP_RETURN(FAILVALUE) do { errno = ENOTSUP; fprintf (stderr, ACE_LIB_TEXT ("ACE_NOTSUP: %s, line %d\n"), __FILE__, __LINE__); return FAILVALUE; } while (0) +# define ACE_NOTSUP do { errno = ENOTSUP; fprintf (stderr, ACE_LIB_TEXT ("ACE_NOTSUP: %s, line %d\n"), __FILE__, __LINE__); return; } while (0) #else /* ! ACE_HAS_VERBOSE_NOTSUP */ # define ACE_NOTSUP_RETURN(FAILVALUE) do { errno = ENOTSUP ; return FAILVALUE; } while (0) # define ACE_NOTSUP do { errno = ENOTSUP; return; } while (0) diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h index 14d616a3721..a42868756c2 100644 --- a/ace/config-win32-borland.h +++ b/ace/config-win32-borland.h @@ -21,7 +21,7 @@ # include "ace/config-win32-common.h" -# define ACE_CC_NAME ACE_TEXT ("Borland C++ Builder") +# define ACE_CC_NAME ACE_LIB_TEXT ("Borland C++ Builder") # define ACE_CC_MAJOR_VERSION (__BORLANDC__ / 0x100) # define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100) # define ACE_CC_BETA_VERSION (0) @@ -65,8 +65,8 @@ # define ACE_NEW_THROWS_EXCEPTIONS 1 # define ACE_SIZEOF_LONG_DOUBLE 10 # define ACE_TEMPLATES_REQUIRE_SOURCE 1 -# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%Lu") -# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%Ld") +# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Lu") +# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Ld") # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_USES_STD_NAMESPACE_FOR_STDC_LIB 1 # define ACE_WSTRING_HAS_USHORT_SUPPORT 1 diff --git a/ace/config-win32-msvc.h b/ace/config-win32-msvc.h index f49a484cda2..5efbaf628fe 100644 --- a/ace/config-win32-msvc.h +++ b/ace/config-win32-msvc.h @@ -12,7 +12,7 @@ # include "ace/config-win32-common.h" -# define ACE_CC_NAME ACE_TEXT ("Visual C++") +# define ACE_CC_NAME ACE_LIB_TEXT ("Visual C++") # define ACE_CC_PREPROCESSOR "CL.EXE" # define ACE_CC_PREPROCESSOR_ARGS "-nologo -E" @@ -201,8 +201,8 @@ inline void *operator new (unsigned int, void *p) { return p; } # pragma warning(default: 4201) /* winnt.h uses nameless structs */ // At least for Win32 - MSVC compiler (ver. 5) -# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%I64d") -# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%I64u") +# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") +# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") #endif /* _MSC_VER */ diff --git a/ace/config-win32-visualage.h b/ace/config-win32-visualage.h index 136206fe5de..9bc2baa8da5 100644 --- a/ace/config-win32-visualage.h +++ b/ace/config-win32-visualage.h @@ -11,7 +11,7 @@ #if defined (__IBMCPP__) && (__IBMCPP__ >= 400) -#define ACE_CC_NAME ACE_TEXT ("IBM VisualAge C++") +#define ACE_CC_NAME ACE_LIB_TEXT ("IBM VisualAge C++") #define ACE_CC_MAJOR_VERSION (__IBMCPP__ / 0x100) #define ACE_CC_MINOR_VERSION (__IBMCPP__ % 0x100) #define ACE_CC_BETA_VERSION (0) @@ -61,7 +61,7 @@ #define ACE_NEW_THROWS_EXCEPTIONS 1 #define ACE_SIZEOF_LONG_DOUBLE 10 #define ACE_TEMPLATES_REQUIRE_SOURCE 1 -#define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%I64u") +#define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 #undef WIFEXITED |