*** empty log message ***

5 files changed, 552 insertions, 462 deletions

diff --git a/ACE-categories b/ACE-categories
index c12e3241243..0ee7074906d 100644
--- a/ACE-categories
+++ b/ACE-categories
@@ -1,461 +1,538 @@
--*- mode: outline; outline-regexp: "	*\\[" -*-
+-*- mode: outline; outline-regexp: "    *\\[" -*-
 
 This file groups each file in $ACE_ROOT/ace into its appropriate
 class category.
 
 [ACE]
-	[ASX]
-		IO_Cntl_Msg.cpp
-		IO_Cntl_Msg.h
-		Map_Manager.cpp
-		Map_Manager.h
-		Map_Manager.i
-		Message_Block.cpp
-		Message_Block.h
-		Message_Block.i
-		Message_Queue.cpp
-		Message_Queue.h
-		Message_Queue.i
-		Module.cpp
-		Module.h
-		Module.i
-		Multiplexor.cpp
-		Multiplexor.h
-		Multiplexor.i
-		Stream.cpp
-		Stream.h
-		Stream.i
-		Stream_Modules.cpp
-		Stream_Modules.h
-		Stream_Modules.i
-		Task.cpp
-		Task.h
-		Task.i
-	[CORBA]
-		CORBA_Handler.cpp
-		CORBA_Handler.h
-		CORBA_Handler.i
-		CORBA_Ref.cpp
-		CORBA_Ref.h
-		CORBA_Ref.i
-	[Collections]
-		Container.cpp
-		Container.i
-		Container.h
-		Free_List.cpp
-		Free_List.i
-		Free_List.h
-		Object_Manager.cpp
-		Object_Manager.i
-		Object_Manager.h
-		SString.cpp
-		SString.h
-		SString.i
-	[Concurrency]
-		Activation_Queue.h
-		Activation_Queue.cpp
-		Future.h
-		Future.cpp
-		Method_Object.h
-		Method_Object.cpp
-		Process_Manager.h
-		Synch.cpp
-		Synch.h
-		Synch.i
-		Synch_Options.cpp
-		Synch_Options.h
-		Synch_Options.i
-		Synch_T.cpp
-		Synch_T.h
-		Synch_T.i
-		Thread.cpp
-		Thread.h
-		Thread.i
-		Thread_Manager.cpp
-		Thread_Manager.h
-		Thread_Manager.i
-		Token.cpp
-		Token.h
-		Token.i
-	[Config]
-		config.h
-	[Connection]
-		Acceptor.cpp
-		Acceptor.h
-		Acceptor.i
-		Connector.cpp
-		Connector.h
-		Connector.i
-		Dynamic_Service.cpp
-		Dynamic_Service.h
-		Strategies.cpp
-		Strategies.h
-		Strategies.i
-		Strategies_T.cpp
-		Strategies_T.h
-		Strategies_T.i
-		Svc_Handler.cpp
-		Svc_Handler.h
-		Svc_Handler.i
-	[Debugging]
-		Assert.h
-		Dump.cpp
-		Dump.h
-		Trace.cpp
-		Trace.h
-		Trace.i
-	[IPC]
-		[IO_SAP]
-			IO_SAP.cpp
-			IO_SAP.h
-			IO_SAP.i
-			[DEV_SAP]
-				DEV.cpp
-				DEV.h
-				DEV.i
-				DEV_Connector.cpp
-				DEV_Connector.h
-				DEV_Connector.i
-				DEV_IO.cpp
-				DEV_IO.h
-				DEV_IO.i
-			[FILE_SAP]
-				FILE.cpp
-				FILE.h
-				FILE.i
-				FILE_Connector.cpp
-				FILE_Connector.h
-				FILE_Connector.i
-				FILE_IO.cpp
-				FILE_IO.h
-				FILE_IO.i
-		[IPC_SAP]
-			IPC_SAP.cpp
-			IPC_SAP.h
-			IPC_SAP.i
-			[Addr]
-				Addr.cpp
-				Addr.h
-				Addr.i
-				DEV_Addr.cpp
-				DEV_Addr.h
-				DEV_Addr.i
-				FILE_Addr.cpp
-				FILE_Addr.h
-				FILE_Addr.i
-				INET_Addr.cpp
-				INET_Addr.h
-				INET_Addr.i
-				SPIPE_Addr.cpp
-				SPIPE_Addr.h
-				SPIPE_Addr.i
-				UNIX_Addr.cpp
-				UNIX_Addr.h
-				UNIX_Addr.i
-				UPIPE_Addr.h
-			[FIFO_SAP]
-				FIFO.cpp
-				FIFO.h
-				FIFO.i
-				FIFO_Recv.cpp
-				FIFO_Recv.h
-				FIFO_Recv.i
-				FIFO_Recv_Msg.cpp
-				FIFO_Recv_Msg.h
-				FIFO_Recv_Msg.i
-				FIFO_Send.cpp
-				FIFO_Send.h
-				FIFO_Send.i
-				FIFO_Send_Msg.cpp
-				FIFO_Send_Msg.h
-				FIFO_Send_Msg.i
-			[SOCK_SAP]
-				LSOCK.cpp
-				LSOCK.h
-				LSOCK.i
-				LSOCK_Acceptor.cpp
-				LSOCK_Acceptor.h
-				LSOCK_Acceptor.i
-				LSOCK_CODgram.cpp
-				LSOCK_CODgram.h
-				LSOCK_CODgram.i
-				LSOCK_Connector.cpp
-				LSOCK_Connector.h
-				LSOCK_Connector.i
-				LSOCK_Dgram.cpp
-				LSOCK_Dgram.h
-				LSOCK_Dgram.i
-				LSOCK_Stream.cpp
-				LSOCK_Stream.h
-				LSOCK_Stream.i
-				SOCK.cpp
-				SOCK.h
-				SOCK.i
-				SOCK_Acceptor.cpp
-				SOCK_Acceptor.h
-				SOCK_Acceptor.i
-				SOCK_CODgram.cpp
-				SOCK_CODgram.h
-				SOCK_CODgram.i
-				SOCK_Connector.cpp
-				SOCK_Connector.h
-				SOCK_Connector.i
-				SOCK_Dgram.cpp
-				SOCK_Dgram.h
-				SOCK_Dgram.i
-				SOCK_Dgram_Bcast.cpp
-				SOCK_Dgram_Bcast.h
-				SOCK_Dgram_Bcast.i
-				SOCK_Dgram_Mcast.cpp
-				SOCK_Dgram_Mcast.h
-				SOCK_Dgram_Mcast.i
-				SOCK_IO.cpp
-				SOCK_IO.h
-				SOCK_IO.i
-				SOCK_Stream.cpp
-				SOCK_Stream.h
-				SOCK_Stream.i
-			[SPIPE_SAP]
-				SPIPE.cpp
-				SPIPE.h
-				SPIPE.i
-				SPIPE_Acceptor.cpp
-				SPIPE_Acceptor.h
-				SPIPE_Acceptor.i
-				SPIPE_Connector.cpp
-				SPIPE_Connector.h
-				SPIPE_Connector.i
-				SPIPE_Stream.cpp
-				SPIPE_Stream.h
-				SPIPE_Stream.i
-			[TLI_SAP]
-				TLI.cpp
-				TLI.h
-				TLI.i
-				TLI_Acceptor.cpp
-				TLI_Acceptor.h
-				TLI_Acceptor.i
-				TLI_Connector.cpp
-				TLI_Connector.h
-				TLI_Connector.i
-				TLI_Stream.cpp
-				TLI_Stream.h
-				TLI_Stream.i
-		[UPIPE_SAP]
-			UPIPE_Acceptor.cpp
-			UPIPE_Acceptor.h
-			UPIPE_Acceptor.i
-			UPIPE_Connector.cpp
-			UPIPE_Connector.h
-			UPIPE_Connector.i
-			UPIPE_Stream.cpp
-			UPIPE_Stream.h
-			UPIPE_Stream.i
-	[Log_Msg]
-		Log_Msg.cpp
-		Log_Msg.h
-		Log_Msg.i
-		Log_Priority.h
-		Log_Record.cpp
-		Log_Record.h
-		Log_Record.i
-	[Memory]
-		[Mem_Map]
-			Mem_Map.cpp
-			Mem_Map.h
-			Mem_Map.i
-		[Shared_Malloc]
-			Malloc.cpp
-			Malloc.h
-			Malloc.i
-			Malloc_T.cpp
-			Malloc_T.h
-			Malloc_T.i
-			Memory_Pool.cpp
-			Memory_Pool.h
-			Memory_Pool.i
-		[Shared_Memory]
-			Shared_Memory.h
-			Shared_Memory_MM.cpp
-			Shared_Memory_MM.h
-			Shared_Memory_MM.i
-			Shared_Memory_SV.cpp
-			Shared_Memory_SV.h
-			Shared_Memory_SV.i
-	[Misc]
-		ARGV.cpp
-		ARGV.h
-		ARGV.i
-		Auto_Ptr.cpp
-		Auto_Ptr.h
-		Auto_Ptr.i
-		Date_Time.cpp
-		Date_Time.h
-		Date_Time.i
-		Dynamic.cpp
-		Dynamic.h
-		Dynamic.i
-		Get_Opt.cpp
-		Get_Opt.h
-		Get_Opt.i
-		Obstack.cpp
-		Obstack.h
-		Read_Buffer.cpp
-		Read_Buffer.h
-		Singleton.cpp
-		Singleton.h
-		Singleton.i
-	[Name_Service]
-		Local_Name_Space.cpp
-		Local_Name_Space.h
-		Name_Options.cpp
-		Name_Options.h
-		Name_Proxy.cpp
-		Name_Proxy.h
-		Name_Request_Reply.cpp
-		Name_Request_Reply.h
-		Name_Space.h
-		Naming_Context.cpp
-		Naming_Context.h
-		Remote_Name_Space.cpp
-		Remote_Name_Space.h
-	[OS]
-		ACE.cpp
-		ACE.h
-		ACE.i
-		OS.cpp
-		OS.h
-		OS.i
-	[Reactor]
-		Event_Handler.cpp
-		Event_Handler.h
-		Event_Handler.i
-		Event_Handler_T.cpp
-		Event_Handler_T.h
-		Event_Handler_T.i
-		Handle_Set.cpp
-		Handle_Set.h
-		Handle_Set.i
-		Priority_Reactor.cpp
-		Priority_Reactor.i
-		Priority_Reactor.h
-		Proactor.h
-		Proactor.i
-		Proactor.cpp
-		Reactor.cpp
-		Reactor.h
-		Reactor.i
-		ReactorEx.cpp
-		ReactorEx.h
-		ReactorEx.i
-		Signal.cpp
-		Signal.h
-		Signal.i
-	[Service_Configurator]
-		Parse_Node.cpp
-		Parse_Node.h
-		Parse_Node.i
-		Service_Config.cpp
-		Service_Config.h
-		Service_Config.i
-		Service_Main.cpp
-		Service_Manager.cpp
-		Service_Manager.h
-		Service_Manager.i
-		Service_Object.cpp
-		Service_Object.h
-		Service_Object.i
-		Service_Record.cpp
-		Service_Record.h
-		Service_Record.i
-		Service_Repository.cpp
-		Service_Repository.h
-		Service_Repository.i
-		Service_Types.cpp
-		Service_Types.i
-		Service_Types.h
-		Shared_Object.cpp
-		Shared_Object.h
-		Shared_Object.i
-		Svc_Conf.h
-		Svc_Conf_l.cpp
-		Svc_Conf_y.cpp
-		Svc_Conf_Tokens.h
-	[System_V_IPC]
-		[System_V_Message_Queues]
-			SV_Message.cpp
-			SV_Message.h
-			SV_Message.i
-			SV_Message_Queue.cpp
-			SV_Message_Queue.h
-			SV_Message_Queue.i
-			Typed_SV_Message.cpp
-			Typed_SV_Message.h
-			Typed_SV_Message.i
-			Typed_SV_Message_Queue.cpp
-			Typed_SV_Message_Queue.h
-			Typed_SV_Message_Queue.i
-		[System_V_Semaphores]
-			SV_Semaphore_Complex.cpp
-			SV_Semaphore_Complex.h
-			SV_Semaphore_Complex.i
-			SV_Semaphore_Simple.cpp
-			SV_Semaphore_Simple.h
-			SV_Semaphore_Simple.i
-		[System_V_Shared_Memory]
-			SV_Shared_Memory.cpp
-			SV_Shared_Memory.h
-			SV_Shared_Memory.i
-	[Timers]
-		High_Res_Timer.cpp
-		High_Res_Timer.h
-		High_Res_Timer.i
-		Profile_Timer.cpp
-		Profile_Timer.h
-		Profile_Timer.i
-		Time_Value.cpp
-		Time_Value.h
-		Time_Value.i
-		Timer_Heap.cpp
-		Timer_Heap.h
-		Timer_Heap.i
-		Timer_Heap_T.cpp
-		Timer_Heap_T.h
-		Timer_Heap_T.i
-		Timer_List.cpp
-		Timer_List.h
-		Timer_List.i
-		Timer_List_T.cpp
-		Timer_List_T.h
-		Timer_List_T.i
-		Timer_Queue.cpp
-		Timer_Queue.h
-		Timer_Queue.i
-		Timer_Queue_T.cpp
-		Timer_Queue_T.h
-		Timer_Queue_T.i
-		Timer_Wheel.cpp
-		Timer_Wheel.h
-		Timer_Wheel.i
-		Timer_Wheel_T.cpp
-		Timer_Wheel_T.h
-		Timer_Wheel_T.i
-	[Token_Service]
-		Local_Tokens.cpp
-		Local_Tokens.h
-		Local_Tokens.i
-		Remote_Tokens.cpp
-		Remote_Tokens.h
-		Remote_Tokens.i
-		Token_Collection.cpp
-		Token_Collection.h
-		Token_Collection.i
-		Token_Manager.cpp
-		Token_Manager.h
-		Token_Manager.i
-		Token_Request_Reply.cpp
-		Token_Request_Reply.h
-		Token_Request_Reply.i
-		Token_Invariants.h
-		Token_Invariants.i
-		Token_Invariants.cpp
+        [CORBA]
+                CORBA_Handler.cpp
+                CORBA_Handler.h
+                CORBA_Handler.i
+                CORBA_Ref.cpp
+                CORBA_Ref.h
+                CORBA_Ref.i
+        [Collections]
+                Array.cpp
+                Array.h
+                Array.i
+                Containers.cpp
+                Containers.i
+                Containers.h
+                Hash_Map_Manager.cpp
+                Hash_Map_Manager.h
+                Filecache.cpp
+                Filecache.h
+                Free_List.cpp
+                Free_List.i
+                Free_List.h
+                Managed_Object.cpp
+                Managed_Object.h
+                Managed_Object.i
+                Map_Manager.cpp
+                Map_Manager.h
+                Map_Manager.i
+                Object_Manager.cpp
+                Object_Manager.i
+                Object_Manager.h
+                SString.cpp
+                SString.h
+                SString.i
+        [Concurrency]
+                Activation_Queue.h
+                Activation_Queue.cpp
+                Atomic_Op.i
+                Future.h
+                Future.cpp
+                Method_Object.h
+                Method_Object.cpp
+                Process.cpp
+                Process.h
+                Process.i
+                Process_Manager.cpp
+                Process_Manager.h
+                Process_Manager.i
+                Sched_Params.cpp
+                Sched_Params.h
+                Sched_Params.i
+                Synch.cpp
+                Synch.h
+                Synch.i
+                Synch_Options.cpp
+                Synch_Options.h
+                Synch_Options.i
+                Synch_T.cpp
+                Synch_T.h
+                Synch_T.i
+                Thread.cpp
+                Thread.h
+                Thread.i
+                Thread_Manager.cpp
+                Thread_Manager.h
+                Thread_Manager.i
+                Token.cpp
+                Token.h
+                Token.i
+        [Config]
+                config.h
+                Basic_Types.cpp
+                Basic_Types.h
+                Basic_Types.i
+                Version.h
+        [Connection]
+                Acceptor.cpp
+                Acceptor.h
+                Acceptor.i
+                Asynch_Acceptor.cpp
+                Asynch_Acceptor.h
+                Asynch_Acceptor.i
+                Asynch_IO.cpp
+                Asynch_IO.h
+                Asynch_IO.i
+                Connector.cpp
+                Connector.h
+                Connector.i
+                Dynamic_Service.cpp
+                Dynamic_Service.h
+                Dynamic_Service.i
+                Strategies.cpp
+                Strategies.h
+                Strategies.i
+                Strategies_T.cpp
+                Strategies_T.h
+                Strategies_T.i
+                Svc_Handler.cpp
+                Svc_Handler.h
+                Svc_Handler.i
+        [IPC]
+                [IO_SAP]
+                        IO_SAP.cpp
+                        IO_SAP.h
+                        IO_SAP.i
+                        [DEV_SAP]
+                                DEV.cpp
+                                DEV.h
+                                DEV.i
+                                DEV_Connector.cpp
+                                DEV_Connector.h
+                                DEV_Connector.i
+                                DEV_IO.cpp
+                                DEV_IO.h
+                                DEV_IO.i
+                                TTY_IO.cpp
+                                TTY_IO.h
+                        [FILE_SAP]
+                                FILE.cpp
+                                FILE.h
+                                FILE.i
+                                FILE_Connector.cpp
+                                FILE_Connector.h
+                                FILE_Connector.i
+                                FILE_IO.cpp
+                                FILE_IO.h
+                                FILE_IO.i
+                [IPC_SAP]
+                        IPC_SAP.cpp
+                        IPC_SAP.h
+                        IPC_SAP.i
+                        [Addr]
+                                Addr.cpp
+                                Addr.h
+                                Addr.i
+                                DEV_Addr.cpp
+                                DEV_Addr.h
+                                DEV_Addr.i
+                                FILE_Addr.cpp
+                                FILE_Addr.h
+                                FILE_Addr.i
+                                INET_Addr.cpp
+                                INET_Addr.h
+                                INET_Addr.i
+                                SPIPE_Addr.cpp
+                                SPIPE_Addr.h
+                                SPIPE_Addr.i
+                                UNIX_Addr.cpp
+                                UNIX_Addr.h
+                                UNIX_Addr.i
+                                UPIPE_Addr.h
+                        [FIFO_SAP]
+                                FIFO.cpp
+                                FIFO.h
+                                FIFO.i
+                                FIFO_Recv.cpp
+                                FIFO_Recv.h
+                                FIFO_Recv.i
+                                FIFO_Recv_Msg.cpp
+                                FIFO_Recv_Msg.h
+                                FIFO_Recv_Msg.i
+                                FIFO_Send.cpp
+                                FIFO_Send.h
+                                FIFO_Send.i
+                                FIFO_Send_Msg.cpp
+                                FIFO_Send_Msg.h
+                                FIFO_Send_Msg.i
+                        [SOCK_SAP]
+                                LOCK_SOCK_Acceptor.cpp
+                                LOCK_SOCK_Acceptor.h
+                                LSOCK.cpp
+                                LSOCK.h
+                                LSOCK.i
+                                LSOCK_Acceptor.cpp
+                                LSOCK_Acceptor.h
+                                LSOCK_Acceptor.i
+                                LSOCK_CODgram.cpp
+                                LSOCK_CODgram.h
+                                LSOCK_CODgram.i
+                                LSOCK_Connector.cpp
+                                LSOCK_Connector.h
+                                LSOCK_Connector.i
+                                LSOCK_Dgram.cpp
+                                LSOCK_Dgram.h
+                                LSOCK_Dgram.i
+                                LSOCK_Stream.cpp
+                                LSOCK_Stream.h
+                                LSOCK_Stream.i
+                                SOCK.cpp
+                                SOCK.h
+                                SOCK.i
+                                SOCK_Acceptor.cpp
+                                SOCK_Acceptor.h
+                                SOCK_Acceptor.i
+                                SOCK_CODgram.cpp
+                                SOCK_CODgram.h
+                                SOCK_CODgram.i
+                                SOCK_Connector.cpp
+                                SOCK_Connector.h
+                                SOCK_Connector.i
+                                SOCK_Dgram.cpp
+                                SOCK_Dgram.h
+                                SOCK_Dgram.i
+                                SOCK_Dgram_Bcast.cpp
+                                SOCK_Dgram_Bcast.h
+                                SOCK_Dgram_Bcast.i
+                                SOCK_Dgram_Mcast.cpp
+                                SOCK_Dgram_Mcast.h
+                                SOCK_Dgram_Mcast.i
+                                SOCK_IO.cpp
+                                SOCK_IO.h
+                                SOCK_IO.i
+                                SOCK_Stream.cpp
+                                SOCK_Stream.h
+                                SOCK_Stream.i
+                        [SPIPE_SAP]
+                                SPIPE.cpp
+                                SPIPE.h
+                                SPIPE.i
+                                SPIPE_Acceptor.cpp
+                                SPIPE_Acceptor.h
+                                SPIPE_Acceptor.i
+                                SPIPE_Connector.cpp
+                                SPIPE_Connector.h
+                                SPIPE_Connector.i
+                                SPIPE_Stream.cpp
+                                SPIPE_Stream.h
+                                SPIPE_Stream.i
+                        [TLI_SAP]
+                                TLI.cpp
+                                TLI.h
+                                TLI.i
+                                TLI_Acceptor.cpp
+                                TLI_Acceptor.h
+                                TLI_Acceptor.i
+                                TLI_Connector.cpp
+                                TLI_Connector.h
+                                TLI_Connector.i
+                                TLI_Stream.cpp
+                                TLI_Stream.h
+                                TLI_Stream.i
+                [UPIPE_SAP]
+                        UPIPE_Acceptor.cpp
+                        UPIPE_Acceptor.h
+                        UPIPE_Acceptor.i
+                        UPIPE_Connector.cpp
+                        UPIPE_Connector.h
+                        UPIPE_Connector.i
+                        UPIPE_Stream.cpp
+                        UPIPE_Stream.h
+                        UPIPE_Stream.i
+                [Utils]
+                        IOStream.cpp
+                        IOStream.h
+                        IOStream_T.cpp
+                        IOStream_T.h
+                        IOStream_T.i
+                        Pipe.cpp
+                        Pipe.h
+                        Pipe.i
+                        Signal.cpp
+                        Signal.h
+                        Signal.i
+        [Logging and Tracing]
+                Dump.cpp
+                Dump.h
+                Dump_T.cpp
+                Dump_T.h
+                Log_Msg.cpp
+                Log_Msg.h
+                Log_Msg.i
+                Log_Priority.h
+                Log_Record.cpp
+                Log_Record.h
+                Log_Record.i
+                Trace.cpp
+                Trace.h
+                Trace.i
+        [Memory]
+                [Mem_Map]
+                        Mem_Map.cpp
+                        Mem_Map.h
+                        Mem_Map.i
+                [Shared_Malloc]
+                        Malloc.cpp
+                        Malloc.h
+                        Malloc.i
+                        Malloc_T.cpp
+                        Malloc_T.h
+                        Malloc_T.i
+                        Memory_Pool.cpp
+                        Memory_Pool.h
+                        Memory_Pool.i
+                [Shared_Memory]
+                        Shared_Memory.h
+                        Shared_Memory_MM.cpp
+                        Shared_Memory_MM.h
+                        Shared_Memory_MM.i
+                        Shared_Memory_SV.cpp
+                        Shared_Memory_SV.h
+                        Shared_Memory_SV.i
+                [Utils]
+                        Obstack.cpp
+                        Obstack.h
+                        Read_Buffer.cpp
+                        Read_Buffer.h
+                        Read_Buffer.i
+        [Misc]
+                ARGV.cpp
+                ARGV.h
+                ARGV.i
+                Auto_Ptr.cpp
+                Auto_Ptr.h
+                Auto_Ptr.i
+                Date_Time.cpp
+                Date_Time.h
+                Date_Time.i
+                Dynamic.cpp
+                Dynamic.h
+                Dynamic.i
+                Get_Opt.cpp
+                Get_Opt.h
+                Get_Opt.i
+                Registry.cpp
+                Registry.h
+                Singleton.cpp
+                Singleton.h
+                Singleton.i
+                System_Time.cpp
+                System_Time.h
+        [Name_Service]
+                Local_Name_Space.cpp
+                Local_Name_Space.h
+                Local_Name_Space_T.cpp
+                Local_Name_Space_T.h
+                Name_Options.cpp
+                Name_Options.h
+                Name_Proxy.cpp
+                Name_Proxy.h
+                Name_Request_Reply.cpp
+                Name_Request_Reply.h
+                Name_Space.cpp
+                Name_Space.h
+                Naming_Context.cpp
+                Naming_Context.h
+                Registry_Name_Space.cpp
+                Registry_Name_Space.h
+                Remote_Name_Space.cpp
+                Remote_Name_Space.h
+        [OS Adapters]
+                ACE.cpp
+                ACE.h
+                ACE.i
+                OS.cpp
+                OS.h
+                OS.i
+        [Reactor]
+                Event_Handler.cpp
+                Event_Handler.h
+                Event_Handler.i
+                Event_Handler_T.cpp
+                Event_Handler_T.h
+                Event_Handler_T.i
+                Handle_Set.cpp
+                Handle_Set.h
+                Handle_Set.i
+                Priority_Reactor.cpp
+                Priority_Reactor.i
+                Priority_Reactor.h
+                Proactor.h
+                Proactor.i
+                Proactor.cpp
+                Reactor.cpp
+                Reactor.h
+                Reactor.i
+                ReactorEx.cpp
+                ReactorEx.h
+                ReactorEx.i
+                Reactor_Impl.h
+                Select_Reactor.cpp
+                Select_Reactor.h
+                Select_Reactor.i
+                WFMO_Reactor.cpp
+                WFMO_Reactor.h
+                WFMO_Reactor.i
+                XtReactor.cpp
+                XtReactor.h
+        [Service_Configurator]
+                Parse_Node.cpp
+                Parse_Node.h
+                Parse_Node.i
+                Service_Config.cpp
+                Service_Config.h
+                Service_Config.i
+                Service_Main.cpp
+                Service_Manager.cpp
+                Service_Manager.h
+                Service_Manager.i
+                Service_Object.cpp
+                Service_Object.h
+                Service_Object.i
+                Service_Record.cpp
+                Service_Record.h
+                Service_Record.i
+                Service_Repository.cpp
+                Service_Repository.h
+                Service_Repository.i
+                Service_Types.cpp
+                Service_Types.i
+                Service_Types.h
+                Shared_Object.cpp
+                Shared_Object.h
+                Shared_Object.i
+                Svc_Conf.h
+                Svc_Conf_l.cpp
+                Svc_Conf_y.cpp
+                Svc_Conf_Tokens.h
+        [Streams]
+                IO_Cntl_Msg.cpp
+                IO_Cntl_Msg.h
+                IO_Cntl_Msg.i
+                Message_Block.cpp
+                Message_Block.h
+                Message_Block.i
+                Message_Queue.cpp
+                Message_Queue.h
+                Message_Queue.i
+                Module.cpp
+                Module.h
+                Module.i
+                Multiplexor.cpp
+                Multiplexor.h
+                Multiplexor.i
+                Stream.cpp
+                Stream.h
+                Stream.i
+                Stream_Modules.cpp
+                Stream_Modules.h
+                Stream_Modules.i
+                Task.cpp
+                Task.h
+                Task.i
+                Task_T.cpp
+                Task_T.h
+                Task_T.i
+        [System_V_IPC]
+                [System_V_Message_Queues]
+                        SV_Message.cpp
+                        SV_Message.h
+                        SV_Message.i
+                        SV_Message_Queue.cpp
+                        SV_Message_Queue.h
+                        SV_Message_Queue.i
+                        Typed_SV_Message.cpp
+                        Typed_SV_Message.h
+                        Typed_SV_Message.i
+                        Typed_SV_Message_Queue.cpp
+                        Typed_SV_Message_Queue.h
+                        Typed_SV_Message_Queue.i
+                [System_V_Semaphores]
+                        SV_Semaphore_Complex.cpp
+                        SV_Semaphore_Complex.h
+                        SV_Semaphore_Complex.i
+                        SV_Semaphore_Simple.cpp
+                        SV_Semaphore_Simple.h
+                        SV_Semaphore_Simple.i
+                [System_V_Shared_Memory]
+                        SV_Shared_Memory.cpp
+                        SV_Shared_Memory.h
+                        SV_Shared_Memory.i
+        [Timers]
+
+                High_Res_Timer.cpp
+                High_Res_Timer.h
+                High_Res_Timer.i
+                Profile_Timer.cpp
+                Profile_Timer.h
+                Profile_Timer.i
+                Time_Request_Reply.cpp
+                Time_Request_Reply.h
+                Time_Value.cpp
+                Time_Value.h
+                Time_Value.i
+                Timer_Hash.cpp
+                Timer_Hash.h
+                Timer_Hash_T.cpp
+                Timer_Hash_T.h
+                Timer_Heap.cpp
+                Timer_Heap.h
+                Timer_Heap.i
+                Timer_Heap_T.cpp
+                Timer_Heap_T.h
+                Timer_Heap_T.i
+                Timer_List.cpp
+                Timer_List.h
+                Timer_List.i
+                Timer_List_T.cpp
+                Timer_List_T.h
+                Timer_List_T.i
+                Timer_Queue.cpp
+                Timer_Queue.h
+                Timer_Queue.i
+                Timer_Queue_Adapters.cpp
+                Timer_Queue_Adapters.h
+                Timer_Queue_Adapters.i
+                Timer_Queue_T.cpp
+                Timer_Queue_T.h
+                Timer_Queue_T.i
+                Timer_Wheel.cpp
+                Timer_Wheel.h
+                Timer_Wheel.i
+                Timer_Wheel_T.cpp
+                Timer_Wheel_T.h
+                Timer_Wheel_T.i
+        [Token_Service]
+                Local_Tokens.cpp
+                Local_Tokens.h
+                Local_Tokens.i
+                Remote_Tokens.cpp
+                Remote_Tokens.h
+                Remote_Tokens.i
+                Token_Collection.cpp
+                Token_Collection.h
+                Token_Collection.i
+                Token_Manager.cpp
+                Token_Manager.h
+                Token_Manager.i
+                Token_Request_Reply.cpp
+                Token_Request_Reply.h
+                Token_Request_Reply.i
+                Token_Invariants.h
+                Token_Invariants.i
+                Token_Invariants.cpp
diff --git a/ChangeLog-98a b/ChangeLog-98a
index 3414b8630f8..5e5c9f346aa 100644
--- a/ChangeLog-98a
+++ b/ChangeLog-98a
@@ -1,3 +1,11 @@
+Fri Jan  9 11:35:53 1998  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
+
+	* ACE-categories: Added all the ACE files into the ACE-categories
+ 	  listing.  Thanks to Andres Kruse for motivating this.
+
+	* include/makeinclude/platform_sunos5_egcs.GNU (CXX): Removed
+ 	  -pipe from CC and CXX.  It was already in CCFLAGS.
+
 Fri Jan 09 07:04:47 1998  David L. Levine  <levine@cs.wustl.edu>
 
         * include/makeinclude/platform_sunos5_g++.GNU: removed
diff --git a/TAO/docs/components.html b/TAO/docs/components.html
index 93be79e6f10..9e782b2709a 100644
--- a/TAO/docs/components.html
+++ b/TAO/docs/components.html
@@ -22,7 +22,7 @@ bgcolor="#ffffff">
 
       <li><a href="configurations.html">Configuration</a> &shy;
       describes how to mix and match component <a
-      href="options.html">options</a> to customize 
+      href="Options.html">options</a> to customize 
       how TAO processes requests.  For example, this  
       document explains how to configure TAO to process
       all request in one thread, each request in a separate thread, or each connection
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index f6da555cf15..c08ef720d8e 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -873,6 +873,7 @@ ACE_Log_Msg::log (const char *format_str,
 
   ACE_OS::free (ACE_MALLOC_T (save_p));
 
+  // Write the <log_record> to the appropriate location.
   ssize_t result = this->log (log_record, abort_prog == 0);
  
   if (abort_prog)
@@ -911,12 +912,15 @@ ACE_Log_Msg::log (ACE_Log_Record &log_record,
       // Make sure that the lock is held during all this.
       ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *ACE_Log_Msg_Manager::get_lock (), -1));
 
-      if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::STDERR)
+      if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_,
+                           ACE_Log_Msg::STDERR)
           && !suppress_stderr) // This is taken care of by our caller.
         log_record.print (ACE_Log_Msg::local_host_,
                           ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::VERBOSE),
                           stderr);
-      if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::LOGGER))
+
+      if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_,
+                           ACE_Log_Msg::LOGGER))
         {
 #if defined (ACE_HAS_STREAM_PIPES)
           ACE_Str_Buf log_msg ((void *) &log_record,
@@ -940,7 +944,8 @@ ACE_Log_Msg::log (ACE_Log_Record &log_record,
       // This must come last, after the other two print operations
       // (see the ACE_Log_Record::print method for details).
 
-      if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::OSTREAM)
+      if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_,
+                           ACE_Log_Msg::OSTREAM)
           && this->msg_ostream () != 0)
         log_record.print (ACE_Log_Msg::local_host_,
                           ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::VERBOSE),
diff --git a/include/makeinclude/platform_sunos5_egcs.GNU b/include/makeinclude/platform_sunos5_egcs.GNU
index f468ddc8ce7..f51f3260a03 100644
--- a/include/makeinclude/platform_sunos5_egcs.GNU
+++ b/include/makeinclude/platform_sunos5_egcs.GNU
@@ -5,8 +5,8 @@
 debug = 1
 optimize = 1
 
-CC              = gcc -pipe
-CXX             = c++ -pipe
+CC              = gcc
+CXX             = c++
 CFLAGS          += -Wall -Wpointer-arith -pipe #### -Winline
 CCFLAGS         += $(CFLAGS)
 DCFLAGS         += -g