diff options
Diffstat (limited to 'examples')
134 files changed, 1189 insertions, 2258 deletions
diff --git a/examples/ASX/CCM_App/Makefile b/examples/ASX/CCM_App/Makefile index 3902aef1235..889ef826459 100644 --- a/examples/ASX/CCM_App/Makefile +++ b/examples/ASX/CCM_App/Makefile @@ -50,12 +50,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -65,17 +66,11 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -105,12 +100,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ @@ -121,56 +117,18 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ - $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Proactor.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.i \ - $(WRAPPER_ROOT)/ace/ReactorEx.h \ - $(WRAPPER_ROOT)/ace/Token.h \ - $(WRAPPER_ROOT)/ace/Reactor.h \ - $(WRAPPER_ROOT)/ace/Handle_Set.h \ - $(WRAPPER_ROOT)/ace/Pipe.h \ - $(WRAPPER_ROOT)/ace/Pipe.i \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.i \ - $(WRAPPER_ROOT)/ace/SOCK.i \ - $(WRAPPER_ROOT)/ace/SOCK_IO.i \ - $(WRAPPER_ROOT)/ace/INET_Addr.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp b/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp index bad9d96a085..41b5dcb6ea6 100644 --- a/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp +++ b/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "Consumer_Router.h" diff --git a/examples/ASX/Event_Server/Event_Server/Makefile b/examples/ASX/Event_Server/Event_Server/Makefile index 947f50c5d7a..c94314b19fd 100644 --- a/examples/ASX/Event_Server/Event_Server/Makefile +++ b/examples/ASX/Event_Server/Event_Server/Makefile @@ -55,22 +55,21 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - Options.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Thread.h Options.h \ $(WRAPPER_ROOT)/ace/Profile_Timer.h \ Options.i .obj/Supplier_Router.o .shobj/Supplier_Router.so: Supplier_Router.cpp Supplier_Router.h \ @@ -79,12 +78,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ @@ -96,33 +96,32 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SOCK_IO.i \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ - $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ + $(WRAPPER_ROOT)/ace/Svc_Handler.h \ + $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ - $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ + $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Service_Object.h \ - $(WRAPPER_ROOT)/ace/Shared_Object.h \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Proactor.h \ - $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ @@ -133,33 +132,10 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Pipe.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Map_Manager.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.h \ - $(WRAPPER_ROOT)/ace/Synch_Options.h \ - $(WRAPPER_ROOT)/ace/Task.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ Peer_Router.h \ $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ $(WRAPPER_ROOT)/ace/Acceptor.i \ - $(WRAPPER_ROOT)/ace/Acceptor.cpp \ - Peer_Router.cpp \ - $(WRAPPER_ROOT)/ace/Get_Opt.h \ Options.h \ $(WRAPPER_ROOT)/ace/Profile_Timer.h \ Options.i @@ -169,12 +145,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ @@ -185,79 +162,40 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ - $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Proactor.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.i \ - $(WRAPPER_ROOT)/ace/ReactorEx.h \ - $(WRAPPER_ROOT)/ace/Token.h \ - $(WRAPPER_ROOT)/ace/Reactor.h \ - $(WRAPPER_ROOT)/ace/Handle_Set.h \ - $(WRAPPER_ROOT)/ace/Pipe.h \ - $(WRAPPER_ROOT)/ace/Pipe.i \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.i \ - $(WRAPPER_ROOT)/ace/SOCK.i \ - $(WRAPPER_ROOT)/ace/SOCK_IO.i \ - $(WRAPPER_ROOT)/ace/INET_Addr.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i -.obj/Consumer_Router.o .shobj/Consumer_Router.so: Consumer_Router.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h +.obj/Consumer_Router.o .shobj/Consumer_Router.so: Consumer_Router.cpp Consumer_Router.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - Consumer_Router.h \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ $(WRAPPER_ROOT)/ace/SOCK_IO.h \ @@ -276,23 +214,26 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ - $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ + $(WRAPPER_ROOT)/ace/SPIPE.h \ + $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ + $(WRAPPER_ROOT)/ace/SPIPE.i \ + $(WRAPPER_ROOT)/ace/UPIPE_Addr.h \ + $(WRAPPER_ROOT)/ace/SPIPE_Acceptor.h \ + $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ + $(WRAPPER_ROOT)/ace/SPIPE_Stream.i \ + $(WRAPPER_ROOT)/ace/UPIPE_Acceptor.i \ + $(WRAPPER_ROOT)/ace/Svc_Handler.h \ + $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Service_Config.h \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ @@ -305,38 +246,11 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Pipe.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i \ - $(WRAPPER_ROOT)/ace/SPIPE.h \ - $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ - $(WRAPPER_ROOT)/ace/SPIPE.i \ - $(WRAPPER_ROOT)/ace/UPIPE_Addr.h \ - $(WRAPPER_ROOT)/ace/SPIPE_Acceptor.h \ - $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ - $(WRAPPER_ROOT)/ace/SPIPE_Stream.i \ - $(WRAPPER_ROOT)/ace/UPIPE_Acceptor.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.h \ - $(WRAPPER_ROOT)/ace/Synch_Options.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ Peer_Router.h \ $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ $(WRAPPER_ROOT)/ace/Acceptor.i \ - $(WRAPPER_ROOT)/ace/Acceptor.cpp \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ - $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ - $(WRAPPER_ROOT)/ace/Map_Manager.i \ - Peer_Router.cpp \ - $(WRAPPER_ROOT)/ace/Get_Opt.h \ Options.h \ $(WRAPPER_ROOT)/ace/Profile_Timer.h \ Options.i @@ -348,12 +262,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -363,17 +278,11 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -397,37 +306,19 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Get_Opt.h \ - Options.h \ + $(WRAPPER_ROOT)/ace/Get_Opt.h Options.h \ $(WRAPPER_ROOT)/ace/Profile_Timer.h \ Options.i Peer_Router.h \ $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ $(WRAPPER_ROOT)/ace/Acceptor.i \ - $(WRAPPER_ROOT)/ace/Acceptor.cpp \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ - $(WRAPPER_ROOT)/ace/Map_Manager.h \ - $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ - $(WRAPPER_ROOT)/ace/Map_Manager.i \ - Peer_Router.cpp + $(WRAPPER_ROOT)/ace/Map_Manager.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/ASX/Event_Server/Event_Server/Options.cpp b/examples/ASX/Event_Server/Event_Server/Options.cpp index 58fe1c59529..78a4e0cf5e1 100644 --- a/examples/ASX/Event_Server/Event_Server/Options.cpp +++ b/examples/ASX/Event_Server/Event_Server/Options.cpp @@ -3,7 +3,7 @@ #include "ace/Get_Opt.h" #include "ace/Synch.h" #include "ace/Thread.h" -#include "ace/Log_Msg.h" + #include "Options.h" #if defined (ACE_HAS_THREADS) diff --git a/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp b/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp index a7c3e093abf..eb7e6b3cd61 100644 --- a/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp +++ b/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp @@ -5,7 +5,7 @@ #include "ace/Service_Config.h" #include "ace/Get_Opt.h" -#include "ace/Log_Msg.h" + #include "Options.h" #include "Peer_Router.h" diff --git a/examples/ASX/Event_Server/Event_Server/event_server.cpp b/examples/ASX/Event_Server/Event_Server/event_server.cpp index ef88ac22853..1e111a69fb9 100644 --- a/examples/ASX/Event_Server/Event_Server/event_server.cpp +++ b/examples/ASX/Event_Server/Event_Server/event_server.cpp @@ -2,7 +2,7 @@ // Test the event server. -#include "ace/Log_Msg.h" + #include "ace/Stream.h" #include "ace/Service_Config.h" #include "Options.h" diff --git a/examples/ASX/Event_Server/Transceiver/Makefile b/examples/ASX/Event_Server/Transceiver/Makefile index 6494612d254..ab99fe70e36 100644 --- a/examples/ASX/Event_Server/Transceiver/Makefile +++ b/examples/ASX/Event_Server/Transceiver/Makefile @@ -38,91 +38,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/transceiver.o .shobj/transceiver.so: transceiver.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ - $(WRAPPER_ROOT)/ace/ACE.h \ - $(WRAPPER_ROOT)/ace/OS.h \ - $(WRAPPER_ROOT)/ace/Time_Value.h \ - $(WRAPPER_ROOT)/ace/config.h \ - $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ - $(WRAPPER_ROOT)/ace/Log_Priority.h \ - $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Service_Object.h \ - $(WRAPPER_ROOT)/ace/Shared_Object.h \ - $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch.h \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ - $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ - $(WRAPPER_ROOT)/ace/Proactor.h \ - $(WRAPPER_ROOT)/ace/Message_Block.h \ - $(WRAPPER_ROOT)/ace/Malloc.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ - $(WRAPPER_ROOT)/ace/Memory_Pool.h \ - $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Mem_Map.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.i \ - $(WRAPPER_ROOT)/ace/ReactorEx.h \ - $(WRAPPER_ROOT)/ace/Token.h \ - $(WRAPPER_ROOT)/ace/Reactor.h \ - $(WRAPPER_ROOT)/ace/Handle_Set.h \ - $(WRAPPER_ROOT)/ace/Pipe.h \ - $(WRAPPER_ROOT)/ace/Pipe.i \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.i \ - $(WRAPPER_ROOT)/ace/SOCK.i \ - $(WRAPPER_ROOT)/ace/SOCK_IO.i \ - $(WRAPPER_ROOT)/ace/INET_Addr.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Connector.h \ - $(WRAPPER_ROOT)/ace/Map_Manager.h \ - $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ - $(WRAPPER_ROOT)/ace/Map_Manager.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.h \ - $(WRAPPER_ROOT)/ace/Synch_Options.h \ - $(WRAPPER_ROOT)/ace/Task.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ - $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ - $(WRAPPER_ROOT)/ace/Connector.i \ - $(WRAPPER_ROOT)/ace/Connector.cpp \ - $(WRAPPER_ROOT)/ace/SOCK_Connector.h \ - $(WRAPPER_ROOT)/ace/SOCK_Connector.i \ - $(WRAPPER_ROOT)/ace/Get_Opt.h + # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/examples/ASX/Event_Server/Transceiver/transceiver.cpp index dc8419ff642..37335b8209f 100644 --- a/examples/ASX/Event_Server/Transceiver/transceiver.cpp +++ b/examples/ASX/Event_Server/Transceiver/transceiver.cpp @@ -4,7 +4,7 @@ // role of either Consumer or Supplier. You can terminate this // program by typing ^C.... -#include "ace/Log_Msg.h" + #include "ace/Service_Config.h" #include "ace/Connector.h" #include "ace/SOCK_Connector.h" diff --git a/examples/ASX/Message_Queue/Makefile b/examples/ASX/Message_Queue/Makefile index 3c61312705f..f76ef41a74a 100644 --- a/examples/ASX/Message_Queue/Makefile +++ b/examples/ASX/Message_Queue/Makefile @@ -38,178 +38,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/buffer_stream.o .shobj/buffer_stream.so: buffer_stream.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ - $(WRAPPER_ROOT)/ace/ACE.h \ - $(WRAPPER_ROOT)/ace/OS.h \ - $(WRAPPER_ROOT)/ace/Time_Value.h \ - $(WRAPPER_ROOT)/ace/config.h \ - $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ - $(WRAPPER_ROOT)/ace/Log_Priority.h \ - $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Synch.h \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ - $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Service_Object.h \ - $(WRAPPER_ROOT)/ace/Shared_Object.h \ - $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ - $(WRAPPER_ROOT)/ace/Proactor.h \ - $(WRAPPER_ROOT)/ace/Message_Block.h \ - $(WRAPPER_ROOT)/ace/Malloc.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ - $(WRAPPER_ROOT)/ace/Memory_Pool.h \ - $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Mem_Map.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.i \ - $(WRAPPER_ROOT)/ace/ReactorEx.h \ - $(WRAPPER_ROOT)/ace/Token.h \ - $(WRAPPER_ROOT)/ace/Reactor.h \ - $(WRAPPER_ROOT)/ace/Handle_Set.h \ - $(WRAPPER_ROOT)/ace/Pipe.h \ - $(WRAPPER_ROOT)/ace/Pipe.i \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.i \ - $(WRAPPER_ROOT)/ace/SOCK.i \ - $(WRAPPER_ROOT)/ace/SOCK_IO.i \ - $(WRAPPER_ROOT)/ace/INET_Addr.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Stream.h \ - $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Task.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i -.obj/bounded_buffer.o .shobj/bounded_buffer.so: bounded_buffer.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ - $(WRAPPER_ROOT)/ace/ACE.h \ - $(WRAPPER_ROOT)/ace/OS.h \ - $(WRAPPER_ROOT)/ace/Time_Value.h \ - $(WRAPPER_ROOT)/ace/config.h \ - $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ - $(WRAPPER_ROOT)/ace/Log_Priority.h \ - $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Block.h \ - $(WRAPPER_ROOT)/ace/Malloc.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Synch.h \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ - $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ - $(WRAPPER_ROOT)/ace/Memory_Pool.h \ - $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ - $(WRAPPER_ROOT)/ace/Mem_Map.h \ - $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h -.obj/priority_buffer.o .shobj/priority_buffer.so: priority_buffer.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ - $(WRAPPER_ROOT)/ace/ACE.h \ - $(WRAPPER_ROOT)/ace/OS.h \ - $(WRAPPER_ROOT)/ace/Time_Value.h \ - $(WRAPPER_ROOT)/ace/config.h \ - $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ - $(WRAPPER_ROOT)/ace/Log_Priority.h \ - $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Block.h \ - $(WRAPPER_ROOT)/ace/Malloc.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Synch.h \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ - $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ - $(WRAPPER_ROOT)/ace/Memory_Pool.h \ - $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ - $(WRAPPER_ROOT)/ace/Mem_Map.h \ - $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Read_Buffer.h \ - $(WRAPPER_ROOT)/ace/Read_Buffer.i \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Service_Object.h \ - $(WRAPPER_ROOT)/ace/Shared_Object.h \ - $(WRAPPER_ROOT)/ace/Proactor.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.i \ - $(WRAPPER_ROOT)/ace/ReactorEx.h \ - $(WRAPPER_ROOT)/ace/Token.h \ - $(WRAPPER_ROOT)/ace/Reactor.h \ - $(WRAPPER_ROOT)/ace/Handle_Set.h \ - $(WRAPPER_ROOT)/ace/Pipe.h \ - $(WRAPPER_ROOT)/ace/Pipe.i \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.i \ - $(WRAPPER_ROOT)/ace/SOCK.i \ - $(WRAPPER_ROOT)/ace/SOCK_IO.i \ - $(WRAPPER_ROOT)/ace/INET_Addr.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h + # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/ASX/Message_Queue/bounded_buffer.cpp b/examples/ASX/Message_Queue/bounded_buffer.cpp index faaf7e0cd00..08df53c8b93 100644 --- a/examples/ASX/Message_Queue/bounded_buffer.cpp +++ b/examples/ASX/Message_Queue/bounded_buffer.cpp @@ -4,7 +4,7 @@ // Message_Queue. It illustrates an implementation of the classic // "bounded buffer" program. -#include "ace/Log_Msg.h" + #include "ace/Message_Queue.h" #include "ace/Thread_Manager.h" diff --git a/examples/ASX/Message_Queue/buffer_stream.cpp b/examples/ASX/Message_Queue/buffer_stream.cpp index 3f7fc5a722b..fbfed5d13ce 100644 --- a/examples/ASX/Message_Queue/buffer_stream.cpp +++ b/examples/ASX/Message_Queue/buffer_stream.cpp @@ -8,7 +8,7 @@ // the use of these reusable components reduces the reliance on global // variables, as compared with the bounded_buffer.C example. -#include "ace/Log_Msg.h" + #include "ace/Synch.h" #include "ace/Service_Config.h" #include "ace/Stream.h" diff --git a/examples/ASX/Message_Queue/priority_buffer.cpp b/examples/ASX/Message_Queue/priority_buffer.cpp index 984c31c98bb..63897efc03b 100644 --- a/examples/ASX/Message_Queue/priority_buffer.cpp +++ b/examples/ASX/Message_Queue/priority_buffer.cpp @@ -4,7 +4,7 @@ // the length of each line via the use of an ASX Message_Queue. It // illustrates how priorities can be used for ACE Message_Queues. -#include "ace/Log_Msg.h" + #include "ace/Message_Queue.h" #include "ace/Read_Buffer.h" #include "ace/Thread_Manager.h" diff --git a/examples/ASX/UPIPE_Event_Server/Makefile b/examples/ASX/UPIPE_Event_Server/Makefile index bb0cdc00ed4..6a559a85f4e 100644 --- a/examples/ASX/UPIPE_Event_Server/Makefile +++ b/examples/ASX/UPIPE_Event_Server/Makefile @@ -55,21 +55,20 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ Options.h \ $(WRAPPER_ROOT)/ace/Profile_Timer.h \ Options.i @@ -81,12 +80,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/UPIPE_Acceptor.h \ $(WRAPPER_ROOT)/ace/UPIPE_Stream.h \ $(WRAPPER_ROOT)/ace/Stream.h \ @@ -100,27 +100,30 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ - $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/SPIPE.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.i \ + $(WRAPPER_ROOT)/ace/SPIPE.i \ + $(WRAPPER_ROOT)/ace/SPIPE_Acceptor.h \ + $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ + $(WRAPPER_ROOT)/ace/SPIPE_Stream.i \ + $(WRAPPER_ROOT)/ace/UPIPE_Acceptor.i \ + $(WRAPPER_ROOT)/ace/Map_Manager.h \ + $(WRAPPER_ROOT)/ace/Svc_Handler.h \ + $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Service_Config.h \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ @@ -134,44 +137,16 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ $(WRAPPER_ROOT)/ace/SOCK_IO.h \ $(WRAPPER_ROOT)/ace/SOCK.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/SOCK.i \ $(WRAPPER_ROOT)/ace/SOCK_IO.i \ $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i \ - $(WRAPPER_ROOT)/ace/SPIPE.h \ - $(WRAPPER_ROOT)/ace/SPIPE.i \ - $(WRAPPER_ROOT)/ace/SPIPE_Acceptor.h \ - $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ - $(WRAPPER_ROOT)/ace/SPIPE_Stream.i \ - $(WRAPPER_ROOT)/ace/UPIPE_Acceptor.i \ - $(WRAPPER_ROOT)/ace/Map_Manager.h \ - $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ - $(WRAPPER_ROOT)/ace/Map_Manager.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.h \ - $(WRAPPER_ROOT)/ace/Synch_Options.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ Peer_Router.h \ $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ $(WRAPPER_ROOT)/ace/Acceptor.i \ - $(WRAPPER_ROOT)/ace/Acceptor.cpp \ - Peer_Router.cpp \ - $(WRAPPER_ROOT)/ace/Get_Opt.h \ Options.h \ $(WRAPPER_ROOT)/ace/Profile_Timer.h \ Options.i @@ -181,12 +156,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ @@ -197,78 +173,40 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ - $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Proactor.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.i \ - $(WRAPPER_ROOT)/ace/ReactorEx.h \ - $(WRAPPER_ROOT)/ace/Token.h \ - $(WRAPPER_ROOT)/ace/Reactor.h \ - $(WRAPPER_ROOT)/ace/Handle_Set.h \ - $(WRAPPER_ROOT)/ace/Pipe.h \ - $(WRAPPER_ROOT)/ace/Pipe.i \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.i \ - $(WRAPPER_ROOT)/ace/SOCK.i \ - $(WRAPPER_ROOT)/ace/SOCK_IO.i \ - $(WRAPPER_ROOT)/ace/INET_Addr.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h .obj/Consumer_Router.o .shobj/Consumer_Router.so: Consumer_Router.cpp Consumer_Router.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/UPIPE_Acceptor.h \ $(WRAPPER_ROOT)/ace/UPIPE_Stream.h \ $(WRAPPER_ROOT)/ace/Stream.h \ @@ -276,23 +214,29 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ - $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ + $(WRAPPER_ROOT)/ace/SPIPE.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.i \ + $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ + $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/SPIPE.i \ + $(WRAPPER_ROOT)/ace/UPIPE_Addr.h \ + $(WRAPPER_ROOT)/ace/SPIPE_Acceptor.h \ + $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ + $(WRAPPER_ROOT)/ace/SPIPE_Stream.i \ + $(WRAPPER_ROOT)/ace/UPIPE_Acceptor.i \ + $(WRAPPER_ROOT)/ace/Svc_Handler.h \ + $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Service_Config.h \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ @@ -306,47 +250,17 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ $(WRAPPER_ROOT)/ace/SOCK_IO.h \ $(WRAPPER_ROOT)/ace/SOCK.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/SOCK.i \ $(WRAPPER_ROOT)/ace/SOCK_IO.i \ $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i \ - $(WRAPPER_ROOT)/ace/SPIPE.h \ - $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ - $(WRAPPER_ROOT)/ace/SPIPE.i \ - $(WRAPPER_ROOT)/ace/UPIPE_Addr.h \ - $(WRAPPER_ROOT)/ace/SPIPE_Acceptor.h \ - $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ - $(WRAPPER_ROOT)/ace/SPIPE_Stream.i \ - $(WRAPPER_ROOT)/ace/UPIPE_Acceptor.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.h \ - $(WRAPPER_ROOT)/ace/Synch_Options.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ Peer_Router.h \ $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ $(WRAPPER_ROOT)/ace/Acceptor.i \ - $(WRAPPER_ROOT)/ace/Acceptor.cpp \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ - $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ - $(WRAPPER_ROOT)/ace/Map_Manager.i \ - Peer_Router.cpp \ - $(WRAPPER_ROOT)/ace/Get_Opt.h \ Options.h \ $(WRAPPER_ROOT)/ace/Profile_Timer.h \ Options.i @@ -356,12 +270,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Service_Config.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ @@ -374,17 +289,11 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -413,30 +322,15 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ $(WRAPPER_ROOT)/ace/Acceptor.i \ - $(WRAPPER_ROOT)/ace/Acceptor.cpp \ $(WRAPPER_ROOT)/ace/UPIPE_Acceptor.h \ $(WRAPPER_ROOT)/ace/UPIPE_Stream.h \ $(WRAPPER_ROOT)/ace/Stream.h \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i \ + $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/SPIPE.h \ $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ $(WRAPPER_ROOT)/ace/SPIPE.i \ @@ -446,9 +340,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SPIPE_Stream.i \ $(WRAPPER_ROOT)/ace/UPIPE_Acceptor.i \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ - $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ - $(WRAPPER_ROOT)/ace/Map_Manager.i \ - Peer_Router.cpp Options.h \ + Options.h \ $(WRAPPER_ROOT)/ace/Profile_Timer.h \ Options.i diff --git a/examples/ASX/UPIPE_Event_Server/Options.cpp b/examples/ASX/UPIPE_Event_Server/Options.cpp index 2c0e4dca768..e8ef863edba 100644 --- a/examples/ASX/UPIPE_Event_Server/Options.cpp +++ b/examples/ASX/UPIPE_Event_Server/Options.cpp @@ -2,7 +2,7 @@ // $Id$ #include "ace/Synch.h" -#include "ace/Log_Msg.h" + #include "Options.h" #if defined (ACE_HAS_THREADS) diff --git a/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp b/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp index c06a05c0295..639959aefd1 100644 --- a/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp +++ b/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp @@ -5,7 +5,7 @@ #include "ace/Get_Opt.h" #include "ace/Service_Config.h" -#include "ace/Log_Msg.h" + #include "Peer_Router.h" #include "Options.h" diff --git a/examples/ASX/UPIPE_Event_Server/event_server.cpp b/examples/ASX/UPIPE_Event_Server/event_server.cpp index 58ebe4b5b32..c7c9e19d795 100644 --- a/examples/ASX/UPIPE_Event_Server/event_server.cpp +++ b/examples/ASX/UPIPE_Event_Server/event_server.cpp @@ -1,7 +1,7 @@ // Test the event server. // $Id$ -#include "ace/Log_Msg.h" + #include "ace/Stream.h" #include "ace/Service_Config.h" #include "Options.h" diff --git a/examples/CORBA/client.cpp b/examples/CORBA/client.cpp index e09b5fd5557..06052eeaa2a 100644 --- a/examples/CORBA/client.cpp +++ b/examples/CORBA/client.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "Test.hh" diff --git a/examples/Connection/blocking/Makefile b/examples/Connection/blocking/Makefile index 4240e569478..b56f53758ad 100644 --- a/examples/Connection/blocking/Makefile +++ b/examples/Connection/blocking/Makefile @@ -53,18 +53,19 @@ LDFLAGS += -L./ # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. .obj/SPIPE-connector.o .shobj/SPIPE-connector.so: SPIPE-connector.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ + $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SPIPE_Connector.h \ $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ $(WRAPPER_ROOT)/ace/SPIPE.h \ @@ -81,38 +82,24 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Block.h \ - $(WRAPPER_ROOT)/ace/Malloc.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ $(WRAPPER_ROOT)/ace/Service_Config.h \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ @@ -132,31 +119,24 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ $(WRAPPER_ROOT)/ace/Connector.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ - $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ - $(WRAPPER_ROOT)/ace/Map_Manager.i \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ - $(WRAPPER_ROOT)/ace/Connector.i \ - $(WRAPPER_ROOT)/ace/Connector.cpp + $(WRAPPER_ROOT)/ace/Connector.i .obj/SPIPE-acceptor.o .shobj/SPIPE-acceptor.so: SPIPE-acceptor.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ + $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SPIPE_Acceptor.h \ $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ $(WRAPPER_ROOT)/ace/SPIPE.h \ @@ -172,38 +152,24 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Block.h \ - $(WRAPPER_ROOT)/ace/Malloc.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ $(WRAPPER_ROOT)/ace/Service_Config.h \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ @@ -223,15 +189,9 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ - $(WRAPPER_ROOT)/ace/Acceptor.i \ - $(WRAPPER_ROOT)/ace/Acceptor.cpp + $(WRAPPER_ROOT)/ace/Acceptor.i .obj/test_spipe_connector.o .shobj/test_spipe_connector.so: test_spipe_connector.cpp \ $(WRAPPER_ROOT)/ace/SPIPE_Connector.h \ $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ @@ -241,12 +201,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ $(WRAPPER_ROOT)/ace/Addr.h \ @@ -260,38 +221,24 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Block.h \ - $(WRAPPER_ROOT)/ace/Malloc.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ $(WRAPPER_ROOT)/ace/Service_Config.h \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ @@ -311,18 +258,10 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ $(WRAPPER_ROOT)/ace/Connector.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ - $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ - $(WRAPPER_ROOT)/ace/Map_Manager.i \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ - $(WRAPPER_ROOT)/ace/Connector.i \ - $(WRAPPER_ROOT)/ace/Connector.cpp + $(WRAPPER_ROOT)/ace/Connector.i .obj/test_spipe_acceptor.o .shobj/test_spipe_acceptor.so: test_spipe_acceptor.cpp \ $(WRAPPER_ROOT)/ace/SPIPE_Acceptor.h \ $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ @@ -332,12 +271,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ $(WRAPPER_ROOT)/ace/Addr.h \ @@ -350,38 +290,24 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Block.h \ - $(WRAPPER_ROOT)/ace/Malloc.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ $(WRAPPER_ROOT)/ace/Service_Config.h \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ @@ -401,14 +327,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ - $(WRAPPER_ROOT)/ace/Acceptor.i \ - $(WRAPPER_ROOT)/ace/Acceptor.cpp + $(WRAPPER_ROOT)/ace/Acceptor.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/Connection/blocking/SPIPE-acceptor.cpp b/examples/Connection/blocking/SPIPE-acceptor.cpp index bb6bbd3f119..a96b3b6d13d 100644 --- a/examples/Connection/blocking/SPIPE-acceptor.cpp +++ b/examples/Connection/blocking/SPIPE-acceptor.cpp @@ -3,7 +3,7 @@ #define SPIPE_ACCEPTOR_C -#include "ace/Log_Msg.h" + #include "ace/SPIPE_Addr.h" #include "ace/Time_Value.h" #include "ace/SPIPE_Acceptor.h" diff --git a/examples/Connection/blocking/SPIPE-connector.cpp b/examples/Connection/blocking/SPIPE-connector.cpp index 3bc22f1a280..5ec480c72a2 100644 --- a/examples/Connection/blocking/SPIPE-connector.cpp +++ b/examples/Connection/blocking/SPIPE-connector.cpp @@ -3,7 +3,7 @@ #define SPIPE_CONNECTOR_C -#include "ace/Log_Msg.h" + #include "ace/SPIPE_Addr.h" #include "ace/SPIPE_Connector.h" #include "ace/Get_Opt.h" diff --git a/examples/Connection/misc/Makefile b/examples/Connection/misc/Makefile index cee99fe763c..0ee43cea754 100644 --- a/examples/Connection/misc/Makefile +++ b/examples/Connection/misc/Makefile @@ -38,20 +38,21 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. .obj/test_upipe.o .shobj/test_upipe.so: test_upipe.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Acceptor.h \ + $(WRAPPER_ROOT)/ace/Service_Config.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Acceptor.h \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Service_Object.h \ - $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -92,6 +93,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Strategies.h \ diff --git a/examples/Connection/misc/test_upipe.cpp b/examples/Connection/misc/test_upipe.cpp index 1c4cc96fa32..3969d6791e2 100644 --- a/examples/Connection/misc/test_upipe.cpp +++ b/examples/Connection/misc/test_upipe.cpp @@ -6,7 +6,7 @@ // ACE_UPIPEs. // Enable tracing -#include "ace/Log_Msg.h" + #include "ace/Acceptor.h" #include "ace/Connector.h" #include "ace/UPIPE_Acceptor.h" diff --git a/examples/Connection/non_blocking/CPP-acceptor.cpp b/examples/Connection/non_blocking/CPP-acceptor.cpp index e01586cc0d3..90898515c11 100644 --- a/examples/Connection/non_blocking/CPP-acceptor.cpp +++ b/examples/Connection/non_blocking/CPP-acceptor.cpp @@ -3,7 +3,7 @@ #define CPP_ACCEPTOR_C -#include "ace/Log_Msg.h" + #include "ace/Service_Config.h" #include "CPP-acceptor.h" diff --git a/examples/Connection/non_blocking/CPP-connector.cpp b/examples/Connection/non_blocking/CPP-connector.cpp index 9851eb91b46..b2628abfa52 100644 --- a/examples/Connection/non_blocking/CPP-connector.cpp +++ b/examples/Connection/non_blocking/CPP-connector.cpp @@ -3,7 +3,7 @@ #define CPP_CONNECTOR_C -#include "ace/Log_Msg.h" + #include "CPP-connector.h" #define PR_ST_1 ACE_PEER_STREAM_1 diff --git a/examples/Connection/non_blocking/Makefile b/examples/Connection/non_blocking/Makefile index 3098b81802c..40c38c46358 100644 --- a/examples/Connection/non_blocking/Makefile +++ b/examples/Connection/non_blocking/Makefile @@ -56,21 +56,21 @@ LDFLAGS += -L./ # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/CPP-connector.o .shobj/CPP-connector.so: CPP-connector.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ +.obj/CPP-connector.o .shobj/CPP-connector.so: CPP-connector.cpp CPP-connector.h \ + $(WRAPPER_ROOT)/ace/Service_Config.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - CPP-connector.h \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Service_Object.h \ - $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -80,17 +80,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -116,45 +110,29 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Connector.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ - $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ - $(WRAPPER_ROOT)/ace/Map_Manager.i \ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ - $(WRAPPER_ROOT)/ace/Connector.i \ - $(WRAPPER_ROOT)/ace/Connector.cpp \ - CPP-connector.cpp + $(WRAPPER_ROOT)/ace/Connector.i .obj/CPP-acceptor.o .shobj/CPP-acceptor.so: CPP-acceptor.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Service_Config.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Service_Object.h \ - $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -164,17 +142,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -203,26 +175,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ - $(WRAPPER_ROOT)/ace/Acceptor.i \ - $(WRAPPER_ROOT)/ace/Acceptor.cpp \ - CPP-acceptor.cpp + $(WRAPPER_ROOT)/ace/Acceptor.i .obj/test_sock_connector.o .shobj/test_sock_connector.so: test_sock_connector.cpp \ $(WRAPPER_ROOT)/ace/SOCK_Connector.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ @@ -232,12 +189,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ @@ -259,17 +217,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -285,31 +237,14 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Connector.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ - $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ - $(WRAPPER_ROOT)/ace/Map_Manager.i \ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ - $(WRAPPER_ROOT)/ace/Connector.i \ - $(WRAPPER_ROOT)/ace/Connector.cpp \ - CPP-connector.cpp + $(WRAPPER_ROOT)/ace/Connector.i .obj/test_sock_acceptor.o .shobj/test_sock_acceptor.so: test_sock_acceptor.cpp \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ @@ -319,12 +254,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ @@ -346,17 +282,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -373,26 +303,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ - $(WRAPPER_ROOT)/ace/Acceptor.i \ - $(WRAPPER_ROOT)/ace/Acceptor.cpp \ - CPP-acceptor.cpp + $(WRAPPER_ROOT)/ace/Acceptor.i .obj/test_tli_connector.o .shobj/test_tli_connector.so: test_tli_connector.cpp \ $(WRAPPER_ROOT)/ace/TLI_Connector.h \ $(WRAPPER_ROOT)/ace/TLI_Stream.h \ @@ -402,12 +317,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/TLI.i \ @@ -427,17 +343,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -459,31 +369,14 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Connector.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ - $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ - $(WRAPPER_ROOT)/ace/Map_Manager.i \ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ - $(WRAPPER_ROOT)/ace/Connector.i \ - $(WRAPPER_ROOT)/ace/Connector.cpp \ - CPP-connector.cpp + $(WRAPPER_ROOT)/ace/Connector.i .obj/test_tli_acceptor.o .shobj/test_tli_acceptor.so: test_tli_acceptor.cpp \ $(WRAPPER_ROOT)/ace/TLI_Acceptor.h \ $(WRAPPER_ROOT)/ace/TLI.h \ @@ -492,12 +385,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/TLI.i \ @@ -519,17 +413,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -552,26 +440,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ - $(WRAPPER_ROOT)/ace/Acceptor.i \ - $(WRAPPER_ROOT)/ace/Acceptor.cpp \ - CPP-acceptor.cpp + $(WRAPPER_ROOT)/ace/Acceptor.i .obj/test_spipe_connector.o .shobj/test_spipe_connector.so: test_spipe_connector.cpp \ $(WRAPPER_ROOT)/ace/SPIPE_Connector.h \ $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ @@ -581,12 +454,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ $(WRAPPER_ROOT)/ace/Addr.h \ @@ -606,17 +480,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -639,31 +507,14 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Connector.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ - $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ - $(WRAPPER_ROOT)/ace/Map_Manager.i \ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ - $(WRAPPER_ROOT)/ace/Connector.i \ - $(WRAPPER_ROOT)/ace/Connector.cpp \ - CPP-connector.cpp + $(WRAPPER_ROOT)/ace/Connector.i .obj/test_spipe_acceptor.o .shobj/test_spipe_acceptor.so: test_spipe_acceptor.cpp \ $(WRAPPER_ROOT)/ace/SPIPE_Acceptor.h \ $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ @@ -673,12 +524,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ $(WRAPPER_ROOT)/ace/Addr.h \ @@ -698,17 +550,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -732,25 +578,10 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ - $(WRAPPER_ROOT)/ace/Acceptor.i \ - $(WRAPPER_ROOT)/ace/Acceptor.cpp \ - CPP-acceptor.cpp + $(WRAPPER_ROOT)/ace/Acceptor.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/IPC_SAP/DEV_SAP/reader/Makefile b/examples/IPC_SAP/DEV_SAP/reader/Makefile index 12373f002d5..fb56477c9b1 100644 --- a/examples/IPC_SAP/DEV_SAP/reader/Makefile +++ b/examples/IPC_SAP/DEV_SAP/reader/Makefile @@ -46,15 +46,16 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. .obj/reader.o .shobj/reader.so: reader.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ - $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Record.i \ $(WRAPPER_ROOT)/ace/DEV_Addr.h \ $(WRAPPER_ROOT)/ace/Addr.h \ diff --git a/examples/IPC_SAP/DEV_SAP/reader/reader.cpp b/examples/IPC_SAP/DEV_SAP/reader/reader.cpp index 656dd0b0fa9..1741c209c13 100644 --- a/examples/IPC_SAP/DEV_SAP/reader/reader.cpp +++ b/examples/IPC_SAP/DEV_SAP/reader/reader.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/OS.h" diff --git a/examples/IPC_SAP/DEV_SAP/writer/Makefile b/examples/IPC_SAP/DEV_SAP/writer/Makefile index dfa8198f829..891a7dd49a0 100644 --- a/examples/IPC_SAP/DEV_SAP/writer/Makefile +++ b/examples/IPC_SAP/DEV_SAP/writer/Makefile @@ -46,23 +46,24 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. .obj/writer.o .shobj/writer.so: writer.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/DEV_Connector.h \ + $(WRAPPER_ROOT)/ace/DEV_IO.h \ + $(WRAPPER_ROOT)/ace/DEV.h \ + $(WRAPPER_ROOT)/ace/IO_SAP.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/IO_SAP.i \ $(WRAPPER_ROOT)/ace/DEV_Addr.h \ $(WRAPPER_ROOT)/ace/Addr.h \ - $(WRAPPER_ROOT)/ace/DEV_Connector.h \ - $(WRAPPER_ROOT)/ace/DEV_IO.h \ - $(WRAPPER_ROOT)/ace/DEV.h \ - $(WRAPPER_ROOT)/ace/IO_SAP.h \ - $(WRAPPER_ROOT)/ace/IO_SAP.i \ $(WRAPPER_ROOT)/ace/DEV.i \ $(WRAPPER_ROOT)/ace/DEV_IO.i \ $(WRAPPER_ROOT)/ace/DEV_Connector.i \ diff --git a/examples/IPC_SAP/DEV_SAP/writer/writer.cpp b/examples/IPC_SAP/DEV_SAP/writer/writer.cpp index 3175e5e771f..2f0216c2c25 100644 --- a/examples/IPC_SAP/DEV_SAP/writer/writer.cpp +++ b/examples/IPC_SAP/DEV_SAP/writer/writer.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/DEV_Connector.h" diff --git a/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp b/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp index 222d9283448..be447a3c73d 100644 --- a/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp +++ b/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/FIFO_Send.h" diff --git a/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp b/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp index 32599ce01a8..205ff83501d 100644 --- a/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp +++ b/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/FIFO_Recv.h" diff --git a/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp b/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp index cde046c26ea..0e7004584ee 100644 --- a/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp +++ b/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp @@ -6,7 +6,7 @@ // the fifo. The child reads from the ACE_FIFO and executes the more // command. -#include "ace/Log_Msg.h" + #include "ace/FIFO_Recv.h" #include "ace/FIFO_Send.h" diff --git a/examples/IPC_SAP/FIFO_SAP/Makefile b/examples/IPC_SAP/FIFO_SAP/Makefile index 9ee2b323493..c88921eb4fc 100644 --- a/examples/IPC_SAP/FIFO_SAP/Makefile +++ b/examples/IPC_SAP/FIFO_SAP/Makefile @@ -51,12 +51,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/FIFO_Send.i \ $(WRAPPER_ROOT)/ace/FIFO_Send_Msg.i @@ -69,61 +70,65 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/FIFO_Recv.i \ $(WRAPPER_ROOT)/ace/FIFO_Recv_Msg.i .obj/FIFO-client.o .shobj/FIFO-client.so: FIFO-client.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/FIFO_Send.h \ + $(WRAPPER_ROOT)/ace/FIFO.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/FIFO_Send.h \ - $(WRAPPER_ROOT)/ace/FIFO.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/FIFO_Send.i .obj/FIFO-server.o .shobj/FIFO-server.so: FIFO-server.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/FIFO_Recv.h \ + $(WRAPPER_ROOT)/ace/FIFO.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/FIFO_Recv.h \ - $(WRAPPER_ROOT)/ace/FIFO.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/FIFO_Recv.i .obj/FIFO-test.o .shobj/FIFO-test.so: FIFO-test.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/FIFO_Recv.h \ + $(WRAPPER_ROOT)/ace/FIFO.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/FIFO_Recv.h \ - $(WRAPPER_ROOT)/ace/FIFO.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/FIFO_Recv.i \ $(WRAPPER_ROOT)/ace/FIFO_Send.h \ diff --git a/examples/IPC_SAP/FILE_SAP/Makefile b/examples/IPC_SAP/FILE_SAP/Makefile index cf0a6764be7..f24ef545e4a 100644 --- a/examples/IPC_SAP/FILE_SAP/Makefile +++ b/examples/IPC_SAP/FILE_SAP/Makefile @@ -41,12 +41,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/ACE.i \ - $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ $(WRAPPER_ROOT)/ace/FILE_Addr.h \ $(WRAPPER_ROOT)/ace/Addr.h \ diff --git a/examples/IPC_SAP/FILE_SAP/client.cpp b/examples/IPC_SAP/FILE_SAP/client.cpp index a62869d097d..5e103653f3a 100644 --- a/examples/IPC_SAP/FILE_SAP/client.cpp +++ b/examples/IPC_SAP/FILE_SAP/client.cpp @@ -1,7 +1,7 @@ #include "ace/OS.h" // $Id$ -#include "ace/Log_Msg.h" + #include "ace/FILE_Addr.h" #include "ace/FILE_Connector.h" #include "ace/FILE_IO.h" diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp index 7c6206ab2a2..9801bde8199 100644 --- a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp +++ b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp @@ -2,7 +2,7 @@ // $Id$ -#include "ace/Log_Msg.h" + #include "ace/SOCK_Connector.h" #include "ace/INET_Addr.h" diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp index 52de75662e3..96013f6f19f 100644 --- a/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp +++ b/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp @@ -2,7 +2,7 @@ // ACE_SOCK_Acceptor and ACE_SOCK_Stream classes. // $Id$ -#include "ace/Log_Msg.h" + #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Stream.h" #include "ace/INET_Addr.h" diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp index 1996d6b4223..41a1c5db682 100644 --- a/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp +++ b/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp @@ -2,7 +2,7 @@ // $Id$ -#include "ace/Log_Msg.h" + #include "ace/LSOCK_Connector.h" #include "ace/UNIX_Addr.h" diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp index 887baba81bc..25ecf7aa8cd 100644 --- a/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp +++ b/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp @@ -2,7 +2,7 @@ // $Id$ -#include "ace/Log_Msg.h" + #include "ace/LSOCK_Acceptor.h" #include "ace/LSOCK_Stream.h" #include "ace/UNIX_Addr.h" diff --git a/examples/IPC_SAP/SOCK_SAP/Makefile b/examples/IPC_SAP/SOCK_SAP/Makefile index 604ff0da614..75eebdece96 100644 --- a/examples/IPC_SAP/SOCK_SAP/Makefile +++ b/examples/IPC_SAP/SOCK_SAP/Makefile @@ -49,20 +49,21 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. .obj/CPP-inclient.o .shobj/CPP-inclient.so: CPP-inclient.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/SOCK_Connector.h \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ + $(WRAPPER_ROOT)/ace/SOCK_IO.h \ + $(WRAPPER_ROOT)/ace/SOCK.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/SOCK_Connector.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ @@ -72,21 +73,22 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/SOCK_Connector.i .obj/CPP-unclient.o .shobj/CPP-unclient.so: CPP-unclient.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/LSOCK_Connector.h \ + $(WRAPPER_ROOT)/ace/SOCK_Connector.h \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ + $(WRAPPER_ROOT)/ace/SOCK_IO.h \ + $(WRAPPER_ROOT)/ace/SOCK.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/LSOCK_Connector.h \ - $(WRAPPER_ROOT)/ace/SOCK_Connector.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ @@ -102,20 +104,21 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/UNIX_Addr.h \ $(WRAPPER_ROOT)/ace/LSOCK_Connector.i .obj/CPP-inserver.o .shobj/CPP-inserver.so: CPP-inserver.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ + $(WRAPPER_ROOT)/ace/SOCK_IO.h \ + $(WRAPPER_ROOT)/ace/SOCK.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ @@ -133,12 +136,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ @@ -147,21 +151,22 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i .obj/CPP-unserver.o .shobj/CPP-unserver.so: CPP-unserver.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/LSOCK_Acceptor.h \ + $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ + $(WRAPPER_ROOT)/ace/SOCK_IO.h \ + $(WRAPPER_ROOT)/ace/SOCK.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/LSOCK_Acceptor.h \ - $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ @@ -184,12 +189,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ @@ -214,12 +220,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ @@ -236,11 +243,25 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ - $(WRAPPER_ROOT)/ace/Trace.h + $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/Trace.h \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Record.i .obj/C-inserver.o .shobj/C-inserver.so: C-inserver.cpp \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ - $(WRAPPER_ROOT)/ace/Trace.h + $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/Trace.h \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Record.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/IPC_SAP/SPIPE_SAP/Makefile b/examples/IPC_SAP/SPIPE_SAP/Makefile index 10d79cb2a7a..b95818890e2 100644 --- a/examples/IPC_SAP/SPIPE_SAP/Makefile +++ b/examples/IPC_SAP/SPIPE_SAP/Makefile @@ -45,18 +45,19 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. .obj/client.o .shobj/client.so: client.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ + $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SPIPE_Connector.h \ $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ $(WRAPPER_ROOT)/ace/SPIPE.h \ @@ -73,12 +74,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SPIPE_Acceptor.h \ $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ $(WRAPPER_ROOT)/ace/SPIPE.h \ @@ -88,18 +90,19 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SPIPE_Stream.i \ shared.h .obj/consumer_msg.o .shobj/consumer_msg.so: consumer_msg.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ + $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SPIPE_Acceptor.h \ $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ $(WRAPPER_ROOT)/ace/SPIPE.h \ @@ -109,18 +112,19 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SPIPE_Stream.i \ shared.h .obj/consumer_read.o .shobj/consumer_read.so: consumer_read.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ + $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SPIPE_Acceptor.h \ $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ $(WRAPPER_ROOT)/ace/SPIPE.h \ @@ -130,18 +134,19 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SPIPE_Stream.i \ shared.h .obj/producer_msg.o .shobj/producer_msg.so: producer_msg.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ + $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SPIPE_Connector.h \ $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ $(WRAPPER_ROOT)/ace/SPIPE.h \ @@ -152,18 +157,19 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SPIPE_Connector.i \ shared.h .obj/producer_read.o .shobj/producer_read.so: producer_read.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ + $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SPIPE_Connector.h \ $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ $(WRAPPER_ROOT)/ace/SPIPE.h \ @@ -174,18 +180,19 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SPIPE_Connector.i \ shared.h .obj/NPClient.o .shobj/NPClient.so: NPClient.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ + $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SPIPE_Connector.h \ $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ $(WRAPPER_ROOT)/ace/SPIPE.h \ @@ -195,18 +202,19 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SPIPE_Stream.i \ $(WRAPPER_ROOT)/ace/SPIPE_Connector.i .obj/NPServer.o .shobj/NPServer.so: NPServer.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ + $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SPIPE_Acceptor.h \ $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ $(WRAPPER_ROOT)/ace/SPIPE.h \ diff --git a/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp b/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp index 73c3a065b01..a4594064882 100644 --- a/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp +++ b/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/SPIPE_Addr.h" diff --git a/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp b/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp index 875ff5ddf93..5a122fefc14 100644 --- a/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp +++ b/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/SPIPE_Addr.h" diff --git a/examples/IPC_SAP/SPIPE_SAP/client.cpp b/examples/IPC_SAP/SPIPE_SAP/client.cpp index b571e19edb9..20d3caa4765 100644 --- a/examples/IPC_SAP/SPIPE_SAP/client.cpp +++ b/examples/IPC_SAP/SPIPE_SAP/client.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/SPIPE_Addr.h" diff --git a/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp b/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp index 614961c9d7e..85d6339a0f6 100644 --- a/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp +++ b/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/SPIPE_Addr.h" diff --git a/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp b/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp index 42eeb33aa11..d6ca116b5db 100644 --- a/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp +++ b/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/SPIPE_Addr.h" diff --git a/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp b/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp index adbcc3922a1..e2f2940e75f 100644 --- a/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp +++ b/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/SPIPE_Addr.h" diff --git a/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp b/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp index 7da62d56dd9..033dacb04ab 100644 --- a/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp +++ b/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/SPIPE_Addr.h" diff --git a/examples/IPC_SAP/TLI_SAP/CPP-client.cpp b/examples/IPC_SAP/TLI_SAP/CPP-client.cpp index 3cfe1db65aa..cf491dff8fa 100644 --- a/examples/IPC_SAP/TLI_SAP/CPP-client.cpp +++ b/examples/IPC_SAP/TLI_SAP/CPP-client.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/TLI_Connector.h" diff --git a/examples/IPC_SAP/TLI_SAP/CPP-server.cpp b/examples/IPC_SAP/TLI_SAP/CPP-server.cpp index 1c0b8787d4d..a47023b3609 100644 --- a/examples/IPC_SAP/TLI_SAP/CPP-server.cpp +++ b/examples/IPC_SAP/TLI_SAP/CPP-server.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/TLI_Acceptor.h" diff --git a/examples/IPC_SAP/TLI_SAP/Makefile b/examples/IPC_SAP/TLI_SAP/Makefile index ce6a90c2a83..a5743d7ef36 100644 --- a/examples/IPC_SAP/TLI_SAP/Makefile +++ b/examples/IPC_SAP/TLI_SAP/Makefile @@ -48,20 +48,21 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. .obj/ftp-client.o .shobj/ftp-client.so: ftp-client.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/TLI_Connector.h \ + $(WRAPPER_ROOT)/ace/TLI_Stream.h \ + $(WRAPPER_ROOT)/ace/TLI.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/TLI_Connector.h \ - $(WRAPPER_ROOT)/ace/TLI_Stream.h \ - $(WRAPPER_ROOT)/ace/TLI.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/TLI.i \ @@ -69,26 +70,26 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/TLI_Stream.i \ $(WRAPPER_ROOT)/ace/TLI_Connector.i .obj/ftp-server.o .shobj/ftp-server.so: ftp-server.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/TLI_Acceptor.h \ $(WRAPPER_ROOT)/ace/TLI.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.h \ @@ -100,20 +101,21 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/TLI_Stream.i \ $(WRAPPER_ROOT)/ace/TLI_Acceptor.i .obj/db-client.o .shobj/db-client.so: db-client.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/TLI_Connector.h \ + $(WRAPPER_ROOT)/ace/TLI_Stream.h \ + $(WRAPPER_ROOT)/ace/TLI.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/TLI_Connector.h \ - $(WRAPPER_ROOT)/ace/TLI_Stream.h \ - $(WRAPPER_ROOT)/ace/TLI.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/TLI.i \ @@ -121,19 +123,20 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/TLI_Stream.i \ $(WRAPPER_ROOT)/ace/TLI_Connector.i .obj/db-server.o .shobj/db-server.so: db-server.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/TLI_Acceptor.h \ + $(WRAPPER_ROOT)/ace/TLI.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/TLI_Acceptor.h \ - $(WRAPPER_ROOT)/ace/TLI.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/TLI.i \ @@ -149,23 +152,23 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i + $(WRAPPER_ROOT)/ace/Event_Handler.h .obj/CPP-client.o .shobj/CPP-client.so: CPP-client.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/TLI_Connector.h \ + $(WRAPPER_ROOT)/ace/TLI_Stream.h \ + $(WRAPPER_ROOT)/ace/TLI.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/TLI_Connector.h \ - $(WRAPPER_ROOT)/ace/TLI_Stream.h \ - $(WRAPPER_ROOT)/ace/TLI.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/TLI.i \ @@ -173,19 +176,20 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/TLI_Stream.i \ $(WRAPPER_ROOT)/ace/TLI_Connector.i .obj/CPP-server.o .shobj/CPP-server.so: CPP-server.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/TLI_Acceptor.h \ + $(WRAPPER_ROOT)/ace/TLI.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/TLI_Acceptor.h \ - $(WRAPPER_ROOT)/ace/TLI.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/TLI.i \ diff --git a/examples/IPC_SAP/TLI_SAP/db-client.cpp b/examples/IPC_SAP/TLI_SAP/db-client.cpp index 45a72a4d67c..4e37630b43d 100644 --- a/examples/IPC_SAP/TLI_SAP/db-client.cpp +++ b/examples/IPC_SAP/TLI_SAP/db-client.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/TLI_Connector.h" diff --git a/examples/IPC_SAP/TLI_SAP/db-server.cpp b/examples/IPC_SAP/TLI_SAP/db-server.cpp index 6d850acbd88..83cf8d1e31a 100644 --- a/examples/IPC_SAP/TLI_SAP/db-server.cpp +++ b/examples/IPC_SAP/TLI_SAP/db-server.cpp @@ -1,7 +1,7 @@ /* Simple multi-threaded database server example. */ // $Id$ -#include "ace/Log_Msg.h" + #include "ace/TLI_Acceptor.h" #include "ace/Thread_Manager.h" diff --git a/examples/IPC_SAP/TLI_SAP/ftp-client.cpp b/examples/IPC_SAP/TLI_SAP/ftp-client.cpp index 8a367a54a96..ae5bdece3f5 100644 --- a/examples/IPC_SAP/TLI_SAP/ftp-client.cpp +++ b/examples/IPC_SAP/TLI_SAP/ftp-client.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/TLI_Connector.h" diff --git a/examples/IPC_SAP/TLI_SAP/ftp-server.cpp b/examples/IPC_SAP/TLI_SAP/ftp-server.cpp index fa7dcf7f951..046f4dc0464 100644 --- a/examples/IPC_SAP/TLI_SAP/ftp-server.cpp +++ b/examples/IPC_SAP/TLI_SAP/ftp-server.cpp @@ -1,7 +1,7 @@ /* Simple file transfer example */ // $Id$ -#include "ace/Log_Msg.h" + #include "ace/Thread_Manager.h" #include "ace/TLI_Acceptor.h" diff --git a/examples/IPC_SAP/UPIPE_SAP/Makefile b/examples/IPC_SAP/UPIPE_SAP/Makefile index ba8ff4b7735..06ac8fb11cd 100644 --- a/examples/IPC_SAP/UPIPE_SAP/Makefile +++ b/examples/IPC_SAP/UPIPE_SAP/Makefile @@ -40,17 +40,18 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. .obj/ex1.o .shobj/ex1.so: ex1.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Stream.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Stream.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ @@ -61,61 +62,26 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ - $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Proactor.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.i \ - $(WRAPPER_ROOT)/ace/ReactorEx.h \ - $(WRAPPER_ROOT)/ace/Token.h \ - $(WRAPPER_ROOT)/ace/Reactor.h \ - $(WRAPPER_ROOT)/ace/Handle_Set.h \ - $(WRAPPER_ROOT)/ace/Pipe.h \ - $(WRAPPER_ROOT)/ace/Pipe.i \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.i \ - $(WRAPPER_ROOT)/ace/SOCK.i \ - $(WRAPPER_ROOT)/ace/SOCK_IO.i \ - $(WRAPPER_ROOT)/ace/INET_Addr.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/UPIPE_Acceptor.h \ $(WRAPPER_ROOT)/ace/UPIPE_Stream.h \ $(WRAPPER_ROOT)/ace/SPIPE.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ + $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/SPIPE.i \ $(WRAPPER_ROOT)/ace/UPIPE_Addr.h \ $(WRAPPER_ROOT)/ace/SPIPE_Acceptor.h \ @@ -125,19 +91,20 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/UPIPE_Connector.h \ $(WRAPPER_ROOT)/ace/UPIPE_Connector.i .obj/ex2.o .shobj/ex2.so: ex2.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/UPIPE_Connector.h \ + $(WRAPPER_ROOT)/ace/UPIPE_Stream.h \ + $(WRAPPER_ROOT)/ace/Stream.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/UPIPE_Connector.h \ - $(WRAPPER_ROOT)/ace/UPIPE_Stream.h \ - $(WRAPPER_ROOT)/ace/Stream.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ @@ -148,59 +115,24 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ - $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Proactor.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.i \ - $(WRAPPER_ROOT)/ace/ReactorEx.h \ - $(WRAPPER_ROOT)/ace/Token.h \ - $(WRAPPER_ROOT)/ace/Reactor.h \ - $(WRAPPER_ROOT)/ace/Handle_Set.h \ - $(WRAPPER_ROOT)/ace/Pipe.h \ - $(WRAPPER_ROOT)/ace/Pipe.i \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/SPIPE.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ - $(WRAPPER_ROOT)/ace/SOCK.i \ - $(WRAPPER_ROOT)/ace/SOCK_IO.i \ - $(WRAPPER_ROOT)/ace/INET_Addr.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i \ - $(WRAPPER_ROOT)/ace/SPIPE.h \ $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ + $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/SPIPE.i \ $(WRAPPER_ROOT)/ace/UPIPE_Addr.h \ $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ @@ -211,19 +143,20 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/UPIPE_Acceptor.i \ auto_builtin_ptr.h .obj/ex3.o .shobj/ex3.so: ex3.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/UPIPE_Connector.h \ + $(WRAPPER_ROOT)/ace/UPIPE_Stream.h \ + $(WRAPPER_ROOT)/ace/Stream.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/UPIPE_Connector.h \ - $(WRAPPER_ROOT)/ace/UPIPE_Stream.h \ - $(WRAPPER_ROOT)/ace/Stream.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ @@ -234,59 +167,24 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ - $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Proactor.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.i \ - $(WRAPPER_ROOT)/ace/ReactorEx.h \ - $(WRAPPER_ROOT)/ace/Token.h \ - $(WRAPPER_ROOT)/ace/Reactor.h \ - $(WRAPPER_ROOT)/ace/Handle_Set.h \ - $(WRAPPER_ROOT)/ace/Pipe.h \ - $(WRAPPER_ROOT)/ace/Pipe.i \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/SPIPE.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ - $(WRAPPER_ROOT)/ace/SOCK.i \ - $(WRAPPER_ROOT)/ace/SOCK_IO.i \ - $(WRAPPER_ROOT)/ace/INET_Addr.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i \ - $(WRAPPER_ROOT)/ace/SPIPE.h \ $(WRAPPER_ROOT)/ace/SPIPE_Addr.h \ + $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/SPIPE.i \ $(WRAPPER_ROOT)/ace/UPIPE_Addr.h \ $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ diff --git a/examples/IPC_SAP/UPIPE_SAP/ex1.cpp b/examples/IPC_SAP/UPIPE_SAP/ex1.cpp index be6eeed5f85..ba5490504c3 100644 --- a/examples/IPC_SAP/UPIPE_SAP/ex1.cpp +++ b/examples/IPC_SAP/UPIPE_SAP/ex1.cpp @@ -5,7 +5,7 @@ // // Author : Gerhard Lenzer and Douglas C. Schmidt -#include "ace/Log_Msg.h" + #include "ace/Stream.h" #include "ace/UPIPE_Acceptor.h" #include "ace/UPIPE_Connector.h" diff --git a/examples/IPC_SAP/UPIPE_SAP/ex2.cpp b/examples/IPC_SAP/UPIPE_SAP/ex2.cpp index b683d6608c5..63e37e7089a 100644 --- a/examples/IPC_SAP/UPIPE_SAP/ex2.cpp +++ b/examples/IPC_SAP/UPIPE_SAP/ex2.cpp @@ -6,7 +6,7 @@ // Author : Gerhard Lenzer and Douglas C. Schmidt #include <fstream.h> -#include "ace/Log_Msg.h" + #include "ace/UPIPE_Connector.h" #include "ace/UPIPE_Acceptor.h" #include "auto_builtin_ptr.h" diff --git a/examples/IPC_SAP/UPIPE_SAP/ex3.cpp b/examples/IPC_SAP/UPIPE_SAP/ex3.cpp index 9b4cefd4ffe..f6999a2d73b 100644 --- a/examples/IPC_SAP/UPIPE_SAP/ex3.cpp +++ b/examples/IPC_SAP/UPIPE_SAP/ex3.cpp @@ -7,7 +7,7 @@ // Authors: Gerhard Lenzer and Prashant Jain. #include <fstream.h> -#include "ace/Log_Msg.h" + #include "ace/UPIPE_Connector.h" #include "ace/UPIPE_Acceptor.h" #include "auto_builtin_ptr.h" diff --git a/examples/Log_Msg/Makefile b/examples/Log_Msg/Makefile index 9949795ba24..54892bdc78f 100644 --- a/examples/Log_Msg/Makefile +++ b/examples/Log_Msg/Makefile @@ -40,16 +40,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/test_log_msg.o .shobj/test_log_msg.so: test_log_msg.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ - $(WRAPPER_ROOT)/ace/ACE.h \ - $(WRAPPER_ROOT)/ace/OS.h \ - $(WRAPPER_ROOT)/ace/Time_Value.h \ - $(WRAPPER_ROOT)/ace/config.h \ - $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ - $(WRAPPER_ROOT)/ace/Log_Priority.h \ - $(WRAPPER_ROOT)/ace/Log_Record.i +.obj/test_log_msg.o .shobj/test_log_msg.so: test_log_msg.cpp # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/Log_Msg/test_log_msg.cpp b/examples/Log_Msg/test_log_msg.cpp index 00868283025..98177805dc0 100644 --- a/examples/Log_Msg/test_log_msg.cpp +++ b/examples/Log_Msg/test_log_msg.cpp @@ -2,7 +2,7 @@ // $Id$ -#include "ace/Log_Msg.h" + static void cleanup (void) diff --git a/examples/Logger/Acceptor-server/Makefile b/examples/Logger/Acceptor-server/Makefile index caf3e445e80..d0f098bdf9a 100644 --- a/examples/Logger/Acceptor-server/Makefile +++ b/examples/Logger/Acceptor-server/Makefile @@ -37,71 +37,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/Logging_Acceptor.o .shobj/Logging_Acceptor.so: Logging_Acceptor.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ - $(WRAPPER_ROOT)/ace/ACE.h \ - $(WRAPPER_ROOT)/ace/OS.h \ - $(WRAPPER_ROOT)/ace/Time_Value.h \ - $(WRAPPER_ROOT)/ace/config.h \ - $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ - $(WRAPPER_ROOT)/ace/Log_Priority.h \ - $(WRAPPER_ROOT)/ace/Log_Record.i \ - Logging_Acceptor.h \ - $(WRAPPER_ROOT)/ace/Singleton.h \ - $(WRAPPER_ROOT)/ace/Reactor.h \ - $(WRAPPER_ROOT)/ace/Handle_Set.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/Synch.h \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ - $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ - $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.i \ - $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Token.h \ - $(WRAPPER_ROOT)/ace/Pipe.h \ - $(WRAPPER_ROOT)/ace/Pipe.i \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.i \ - $(WRAPPER_ROOT)/ace/SOCK.i \ - $(WRAPPER_ROOT)/ace/SOCK_IO.i \ - $(WRAPPER_ROOT)/ace/INET_Addr.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ - Logging_Handler.h -.obj/Logging_Handler.o .shobj/Logging_Handler.so: Logging_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ - $(WRAPPER_ROOT)/ace/ACE.h \ - $(WRAPPER_ROOT)/ace/OS.h \ - $(WRAPPER_ROOT)/ace/Time_Value.h \ - $(WRAPPER_ROOT)/ace/config.h \ - $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ - $(WRAPPER_ROOT)/ace/Log_Priority.h \ - $(WRAPPER_ROOT)/ace/Log_Record.i \ - Logging_Handler.h \ - $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/INET_Addr.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.i \ - $(WRAPPER_ROOT)/ace/SOCK.i \ - $(WRAPPER_ROOT)/ace/SOCK_IO.i \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.i + # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/Logger/Acceptor-server/server_loggerd.cpp b/examples/Logger/Acceptor-server/server_loggerd.cpp index 8300e11a965..21776447b73 100644 --- a/examples/Logger/Acceptor-server/server_loggerd.cpp +++ b/examples/Logger/Acceptor-server/server_loggerd.cpp @@ -7,7 +7,7 @@ // components. #include "ace/Get_Opt.h" -#include "ace/Log_Msg.h" + #include "ace/Acceptor.h" #include "ace/SOCK_Acceptor.h" #include "ace/Synch.h" diff --git a/examples/Logger/client/Makefile b/examples/Logger/client/Makefile index 665086e9d8f..7ca028e3861 100644 --- a/examples/Logger/client/Makefile +++ b/examples/Logger/client/Makefile @@ -38,6 +38,29 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - +.obj/logging_app.o .shobj/logging_app.so: logging_app.cpp \ + $(WRAPPER_ROOT)/ace/SOCK_Connector.h \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ + $(WRAPPER_ROOT)/ace/SOCK_IO.h \ + $(WRAPPER_ROOT)/ace/SOCK.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/OS.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ + $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/Trace.h \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.i \ + $(WRAPPER_ROOT)/ace/SOCK.i \ + $(WRAPPER_ROOT)/ace/SOCK_IO.i \ + $(WRAPPER_ROOT)/ace/INET_Addr.h \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ + $(WRAPPER_ROOT)/ace/SOCK_Connector.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/Logger/client/logging_app.cpp b/examples/Logger/client/logging_app.cpp index 8f3173eb844..937bbe8341c 100644 --- a/examples/Logger/client/logging_app.cpp +++ b/examples/Logger/client/logging_app.cpp @@ -4,7 +4,7 @@ // than going through the client logging daemon. #include "ace/SOCK_Connector.h" -#include "ace/Log_Msg.h" + #include "ace/Log_Record.h" static u_short LOGGER_PORT = ACE_DEFAULT_SERVER_PORT; diff --git a/examples/Logger/simple-server/Logging_Acceptor.cpp b/examples/Logger/simple-server/Logging_Acceptor.cpp index b23d6f7f403..641ed58256c 100644 --- a/examples/Logger/simple-server/Logging_Acceptor.cpp +++ b/examples/Logger/simple-server/Logging_Acceptor.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "Logging_Acceptor.h" diff --git a/examples/Logger/simple-server/Logging_Handler.cpp b/examples/Logger/simple-server/Logging_Handler.cpp index 005e4cf2fc3..ceb88ac14da 100644 --- a/examples/Logger/simple-server/Logging_Handler.cpp +++ b/examples/Logger/simple-server/Logging_Handler.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "Logging_Handler.h" diff --git a/examples/Logger/simple-server/Makefile b/examples/Logger/simple-server/Makefile index 773d9f513b8..21d55783684 100644 --- a/examples/Logger/simple-server/Makefile +++ b/examples/Logger/simple-server/Makefile @@ -46,23 +46,35 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/Logging_Acceptor.o .shobj/Logging_Acceptor.so: Logging_Acceptor.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ +.obj/Logging_Acceptor.o .shobj/Logging_Acceptor.so: Logging_Acceptor.cpp Logging_Acceptor.h \ + $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ + $(WRAPPER_ROOT)/ace/SOCK_IO.h \ + $(WRAPPER_ROOT)/ace/SOCK.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - Logging_Acceptor.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.i \ + $(WRAPPER_ROOT)/ace/SOCK.i \ + $(WRAPPER_ROOT)/ace/SOCK_IO.i \ + $(WRAPPER_ROOT)/ace/INET_Addr.h \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + Logging_Handler.h Reactor_Singleton.h \ $(WRAPPER_ROOT)/ace/Singleton.h \ $(WRAPPER_ROOT)/ace/Reactor.h \ $(WRAPPER_ROOT)/ace/Handle_Set.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -76,32 +88,20 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Pipe.h \ $(WRAPPER_ROOT)/ace/Pipe.i \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.i \ - $(WRAPPER_ROOT)/ace/SOCK.i \ - $(WRAPPER_ROOT)/ace/SOCK_IO.i \ - $(WRAPPER_ROOT)/ace/INET_Addr.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ - Logging_Handler.h -.obj/Logging_Handler.o .shobj/Logging_Handler.so: Logging_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Reactor.i +.obj/Logging_Handler.o .shobj/Logging_Handler.so: Logging_Handler.cpp Logging_Handler.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - Logging_Handler.h \ - $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ @@ -111,6 +111,25 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/IPC_SAP.i \ $(WRAPPER_ROOT)/ace/SOCK.i \ $(WRAPPER_ROOT)/ace/SOCK_IO.i \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.i + $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ + Reactor_Singleton.h \ + $(WRAPPER_ROOT)/ace/Singleton.h \ + $(WRAPPER_ROOT)/ace/Reactor.h \ + $(WRAPPER_ROOT)/ace/Handle_Set.h \ + $(WRAPPER_ROOT)/ace/Timer_Queue.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ + $(WRAPPER_ROOT)/ace/Synch_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Queue.i \ + $(WRAPPER_ROOT)/ace/Signal.h \ + $(WRAPPER_ROOT)/ace/Set.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Token.h \ + $(WRAPPER_ROOT)/ace/Pipe.h \ + $(WRAPPER_ROOT)/ace/Pipe.i \ + $(WRAPPER_ROOT)/ace/Reactor.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/Logger/simple-server/server_loggerd.cpp b/examples/Logger/simple-server/server_loggerd.cpp index a94aef775b0..2d65a8b56db 100644 --- a/examples/Logger/simple-server/server_loggerd.cpp +++ b/examples/Logger/simple-server/server_loggerd.cpp @@ -8,7 +8,7 @@ // used. #include "ace/Get_Opt.h" -#include "ace/Log_Msg.h" + #include "Logging_Acceptor.h" #include "Reactor_Singleton.h" diff --git a/examples/Mem_Map/IO-tests/Makefile b/examples/Mem_Map/IO-tests/Makefile index c7f825136cb..f0e55da262c 100644 --- a/examples/Mem_Map/IO-tests/Makefile +++ b/examples/Mem_Map/IO-tests/Makefile @@ -49,15 +49,15 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/Mem_Map.h \ - $(WRAPPER_ROOT)/ace/ACE.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - IO_Test.h \ + $(WRAPPER_ROOT)/ace/Mem_Map.h IO_Test.h \ $(WRAPPER_ROOT)/ace/Profile_Timer.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/Mem_Map/file-reverse/Makefile b/examples/Mem_Map/file-reverse/Makefile index ccc7ce66724..4056d367f39 100644 --- a/examples/Mem_Map/file-reverse/Makefile +++ b/examples/Mem_Map/file-reverse/Makefile @@ -43,16 +43,17 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. .obj/file-reverse.o .shobj/file-reverse.so: file-reverse.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Mem_Map.h + $(WRAPPER_ROOT)/ace/ACE.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/Mem_Map/file-reverse/file-reverse.cpp b/examples/Mem_Map/file-reverse/file-reverse.cpp index 5c199747bb5..0e357ded29f 100644 --- a/examples/Mem_Map/file-reverse/file-reverse.cpp +++ b/examples/Mem_Map/file-reverse/file-reverse.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/Mem_Map.h" diff --git a/examples/Misc/Makefile b/examples/Misc/Makefile index fd4a1a9afc8..a7de5c6cb29 100644 --- a/examples/Misc/Makefile +++ b/examples/Misc/Makefile @@ -54,34 +54,46 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Dump_T.h \ - $(WRAPPER_ROOT)/ace/Dump_T.cpp + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Dump_T.h +.obj/test_get_opt.o .shobj/test_get_opt.so: test_get_opt.cpp \ + $(WRAPPER_ROOT)/ace/Get_Opt.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/OS.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ + $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/Trace.h \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i .obj/test_profile_timer.o .shobj/test_profile_timer.so: test_profile_timer.cpp \ $(WRAPPER_ROOT)/ace/Profile_Timer.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ - $(WRAPPER_ROOT)/ace/Log_Record.i + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i .obj/test_read_buffer.o .shobj/test_read_buffer.so: test_read_buffer.cpp \ $(WRAPPER_ROOT)/ace/Service_Config.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ @@ -90,12 +102,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -105,17 +118,11 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -147,51 +154,49 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ - $(WRAPPER_ROOT)/ace/Log_Record.i + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i .obj/test_trace.o .shobj/test_trace.so: test_trace.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Signal.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i + $(WRAPPER_ROOT)/ace/Set.h .obj/test_XtReactor1.o .shobj/test_XtReactor1.so: test_XtReactor1.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/XtReactor.h \ + $(WRAPPER_ROOT)/ace/Reactor.h \ + $(WRAPPER_ROOT)/ace/Handle_Set.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/XtReactor.h \ - $(WRAPPER_ROOT)/ace/Reactor.h \ - $(WRAPPER_ROOT)/ace/Handle_Set.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Synch.h \ @@ -200,14 +205,10 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.i \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Pipe.h \ $(WRAPPER_ROOT)/ace/Pipe.i \ @@ -225,24 +226,23 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h .obj/test_XtReactor2.o .shobj/test_XtReactor2.so: test_XtReactor2.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/XtReactor.h \ + $(WRAPPER_ROOT)/ace/Reactor.h \ + $(WRAPPER_ROOT)/ace/Handle_Set.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/XtReactor.h \ - $(WRAPPER_ROOT)/ace/Reactor.h \ - $(WRAPPER_ROOT)/ace/Handle_Set.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Synch.h \ @@ -251,14 +251,10 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.i \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Pipe.h \ $(WRAPPER_ROOT)/ace/Pipe.i \ @@ -276,8 +272,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h diff --git a/examples/Misc/test_XtReactor1.cpp b/examples/Misc/test_XtReactor1.cpp index 723726bb5b0..6c1647ec4f6 100644 --- a/examples/Misc/test_XtReactor1.cpp +++ b/examples/Misc/test_XtReactor1.cpp @@ -3,7 +3,7 @@ // <ecn@clark.net> XtReactor implementation. -#include "ace/Log_Msg.h" + #include "ace/XtReactor.h" #include "ace/Message_Block.h" diff --git a/examples/Misc/test_XtReactor2.cpp b/examples/Misc/test_XtReactor2.cpp index b43f1eca4f2..31fab787b26 100644 --- a/examples/Misc/test_XtReactor2.cpp +++ b/examples/Misc/test_XtReactor2.cpp @@ -3,7 +3,7 @@ // XtReactor implementation. -#include "ace/Log_Msg.h" + #include "ace/XtReactor.h" #include "ace/Message_Block.h" diff --git a/examples/Misc/test_get_opt.cpp b/examples/Misc/test_get_opt.cpp index a35216ed956..c68928b6e57 100644 --- a/examples/Misc/test_get_opt.cpp +++ b/examples/Misc/test_get_opt.cpp @@ -3,7 +3,7 @@ // Test the ACE_Get_Opt class. #include "ace/Get_Opt.h" -#include "ace/Log_Msg.h" + int main (int argc, char *argv[]) diff --git a/examples/Misc/test_profile_timer.cpp b/examples/Misc/test_profile_timer.cpp index 39fc37b13a3..366876a42a5 100644 --- a/examples/Misc/test_profile_timer.cpp +++ b/examples/Misc/test_profile_timer.cpp @@ -1,7 +1,7 @@ #include "ace/Profile_Timer.h" // $Id$ -#include "ace/Log_Msg.h" + static const int DEFAULT_ITERATIONS = 100000000; diff --git a/examples/Misc/test_trace.cpp b/examples/Misc/test_trace.cpp index 97c1e078d7d..22f0919bf33 100644 --- a/examples/Misc/test_trace.cpp +++ b/examples/Misc/test_trace.cpp @@ -2,7 +2,7 @@ // $Id$ #define ACE_NTRACE 0 -#include "ace/Log_Msg.h" + #if defined (ACE_MT_SAFE) #include "ace/Thread.h" diff --git a/examples/OS/Process/process.cpp b/examples/OS/Process/process.cpp index dc9665611a6..9e901f8317a 100644 --- a/examples/OS/Process/process.cpp +++ b/examples/OS/Process/process.cpp @@ -18,7 +18,7 @@ // ============================================================================ #include "ace/OS.h" -#include "ace/Log_Msg.h" + #include "ace/Process.h" #if defined (ACE_WIN32) diff --git a/examples/Reactor/Dgram/Makefile b/examples/Reactor/Dgram/Makefile index 5c2204cd91a..53760e3be11 100644 --- a/examples/Reactor/Dgram/Makefile +++ b/examples/Reactor/Dgram/Makefile @@ -48,12 +48,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Synch.h \ @@ -62,14 +63,10 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.i \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Pipe.h \ $(WRAPPER_ROOT)/ace/Pipe.i \ @@ -93,12 +90,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Synch.h \ @@ -107,14 +105,10 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.i \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Pipe.h \ $(WRAPPER_ROOT)/ace/Pipe.i \ diff --git a/examples/Reactor/Misc/Makefile b/examples/Reactor/Misc/Makefile index 581e4b89505..a20cd7d06ce 100644 --- a/examples/Reactor/Misc/Makefile +++ b/examples/Reactor/Misc/Makefile @@ -47,34 +47,31 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. .obj/pingpong.o .shobj/pingpong.so: pingpong.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Reactor.h \ $(WRAPPER_ROOT)/ace/Handle_Set.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.i \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Pipe.h \ $(WRAPPER_ROOT)/ace/Pipe.i \ @@ -90,19 +87,20 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i .obj/notification.o .shobj/notification.so: notification.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Service_Config.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Service_Object.h \ - $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -112,17 +110,11 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -147,19 +139,20 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Reactor.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h .obj/signal_tester.o .shobj/signal_tester.so: signal_tester.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Service_Config.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Service_Object.h \ - $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -169,17 +162,11 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -204,30 +191,32 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Reactor.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h .obj/test_event_handler_t.o .shobj/test_event_handler_t.so: test_event_handler_t.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Event_Handler_T.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Event_Handler_T.h \ - $(WRAPPER_ROOT)/ace/Event_Handler.h + $(WRAPPER_ROOT)/ace/ACE.i .obj/test_handle_set.o .shobj/test_handle_set.so: test_handle_set.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Handle_Set.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Handle_Set.h + $(WRAPPER_ROOT)/ace/ACE.i .obj/test_reactors.o .shobj/test_reactors.so: test_reactors.cpp \ $(WRAPPER_ROOT)/ace/Reactor.h \ $(WRAPPER_ROOT)/ace/Handle_Set.h \ @@ -235,12 +224,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Synch.h \ @@ -249,14 +239,10 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.i \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Pipe.h \ $(WRAPPER_ROOT)/ace/Pipe.i \ @@ -279,38 +265,80 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Task.i -.obj/test_signals.o .shobj/test_signals.so: test_signals.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h +.obj/test_signals_1.o .shobj/test_signals_1.so: test_signals_1.cpp \ + $(WRAPPER_ROOT)/ace/Service_Config.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ + $(WRAPPER_ROOT)/ace/Synch_T.h \ + $(WRAPPER_ROOT)/ace/Set.h \ + $(WRAPPER_ROOT)/ace/Proactor.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ + $(WRAPPER_ROOT)/ace/Memory_Pool.h \ + $(WRAPPER_ROOT)/ace/Signal.h \ + $(WRAPPER_ROOT)/ace/Mem_Map.h \ + $(WRAPPER_ROOT)/ace/Timer_Queue.h \ + $(WRAPPER_ROOT)/ace/Timer_Queue.i \ + $(WRAPPER_ROOT)/ace/ReactorEx.h \ + $(WRAPPER_ROOT)/ace/Token.h \ + $(WRAPPER_ROOT)/ace/Reactor.h \ + $(WRAPPER_ROOT)/ace/Handle_Set.h \ + $(WRAPPER_ROOT)/ace/Pipe.h \ + $(WRAPPER_ROOT)/ace/Pipe.i \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ + $(WRAPPER_ROOT)/ace/SOCK_IO.h \ + $(WRAPPER_ROOT)/ace/SOCK.h \ + $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.i \ + $(WRAPPER_ROOT)/ace/SOCK.i \ + $(WRAPPER_ROOT)/ace/SOCK_IO.i \ + $(WRAPPER_ROOT)/ace/INET_Addr.h \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ + $(WRAPPER_ROOT)/ace/Reactor.i \ + $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h +.obj/test_signals_2.o .shobj/test_signals_2.so: test_signals_2.cpp \ $(WRAPPER_ROOT)/ace/Reactor.h \ $(WRAPPER_ROOT)/ace/Handle_Set.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/OS.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ + $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/Trace.h \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Synch.h \ @@ -319,14 +347,10 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.i \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Pipe.h \ $(WRAPPER_ROOT)/ace/Pipe.i \ @@ -346,34 +370,33 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ - $(WRAPPER_ROOT)/ace/Log_Record.i + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i .obj/test_timer_queue.o .shobj/test_timer_queue.so: test_timer_queue.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Timer_Queue.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/Reactor/Misc/notification.cpp b/examples/Reactor/Misc/notification.cpp index 8d8fd9bf643..bf5fabb86b9 100644 --- a/examples/Reactor/Misc/notification.cpp +++ b/examples/Reactor/Misc/notification.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/Service_Config.h" diff --git a/examples/Reactor/Misc/pingpong.cpp b/examples/Reactor/Misc/pingpong.cpp index 42c7012c4c9..a9b88e8f6bc 100644 --- a/examples/Reactor/Misc/pingpong.cpp +++ b/examples/Reactor/Misc/pingpong.cpp @@ -35,7 +35,7 @@ stop it earlier, just hit the control-C sequence and you'll see the same messages. */ -#include "ace/Log_Msg.h" + #include "ace/Synch.h" #include "ace/Reactor.h" #include "ace/Pipe.h" diff --git a/examples/Reactor/Misc/signal_tester.cpp b/examples/Reactor/Misc/signal_tester.cpp index a210b3241f8..37613f14f38 100644 --- a/examples/Reactor/Misc/signal_tester.cpp +++ b/examples/Reactor/Misc/signal_tester.cpp @@ -6,7 +6,7 @@ // addition, this example illustrates how to use the ACE_Reactor for // devices that perform I/O via signals (such as SVR4 message queues). -#include "ace/Log_Msg.h" + #include "ace/Service_Config.h" // Used to shut down the event loop. diff --git a/examples/Reactor/Misc/test_event_handler_t.cpp b/examples/Reactor/Misc/test_event_handler_t.cpp index 06aadb402a0..beedb8e7e2d 100644 --- a/examples/Reactor/Misc/test_event_handler_t.cpp +++ b/examples/Reactor/Misc/test_event_handler_t.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/Event_Handler_T.h" diff --git a/examples/Reactor/Misc/test_handle_set.cpp b/examples/Reactor/Misc/test_handle_set.cpp index 193cb87d88b..39975aa7e60 100644 --- a/examples/Reactor/Misc/test_handle_set.cpp +++ b/examples/Reactor/Misc/test_handle_set.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/Handle_Set.h" diff --git a/examples/Reactor/Misc/test_signals_2.cpp b/examples/Reactor/Misc/test_signals_2.cpp index 8054ef7d410..86ab5057ea4 100644 --- a/examples/Reactor/Misc/test_signals_2.cpp +++ b/examples/Reactor/Misc/test_signals_2.cpp @@ -96,7 +96,7 @@ second SIGQUIT we exit and dump core since that's what happens with the default disposition for SIGQUIT. */ -#include "ace/Log_Msg.h" + #include "ace/Reactor.h" class Sig_Handler_1 : public ACE_Event_Handler diff --git a/examples/Reactor/Misc/test_timer_queue.cpp b/examples/Reactor/Misc/test_timer_queue.cpp index 7256bfb54c5..641342b77cc 100644 --- a/examples/Reactor/Misc/test_timer_queue.cpp +++ b/examples/Reactor/Misc/test_timer_queue.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/Timer_Queue.h" diff --git a/examples/Reactor/Multicast/Makefile b/examples/Reactor/Multicast/Makefile index 980cb7d28b3..556086b9ebe 100644 --- a/examples/Reactor/Multicast/Makefile +++ b/examples/Reactor/Multicast/Makefile @@ -51,12 +51,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/SOCK_Dgram.h \ diff --git a/examples/Reactor/Multicast/client.cpp b/examples/Reactor/Multicast/client.cpp index 23e009e0549..7a116083336 100644 --- a/examples/Reactor/Multicast/client.cpp +++ b/examples/Reactor/Multicast/client.cpp @@ -3,7 +3,7 @@ // This program reads in messages from stdin and sends them to a // Log_Wrapper. -#include "ace/Log_Msg.h" + #include "Log_Wrapper.h" const char *MCAST_ADDR = ACE_DEFAULT_MULTICAST_ADDR; diff --git a/examples/Reactor/Multicast/server.cpp b/examples/Reactor/Multicast/server.cpp index f6946a38649..b8fdcd06b07 100644 --- a/examples/Reactor/Multicast/server.cpp +++ b/examples/Reactor/Multicast/server.cpp @@ -7,7 +7,7 @@ #include "ace/SOCK_Dgram.h" #include "ace/INET_Addr.h" -#include "ace/Log_Msg.h" + #include "ace/SOCK_Dgram_Mcast.h" #include "ace/Reactor.h" #include "Log_Wrapper.h" diff --git a/examples/Reactor/Ntalker/Makefile b/examples/Reactor/Ntalker/Makefile index d01010c27a0..a2871b2038e 100644 --- a/examples/Reactor/Ntalker/Makefile +++ b/examples/Reactor/Ntalker/Makefile @@ -46,12 +46,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/SOCK_Dgram_Mcast.h \ $(WRAPPER_ROOT)/ace/SOCK_Dgram.h \ @@ -71,14 +72,10 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.i \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Pipe.h \ $(WRAPPER_ROOT)/ace/Pipe.i \ diff --git a/examples/Registry/test_registry_iterator.cpp b/examples/Registry/test_registry_iterator.cpp index c7d578f7171..ab69116bdbe 100644 --- a/examples/Registry/test_registry_iterator.cpp +++ b/examples/Registry/test_registry_iterator.cpp @@ -7,7 +7,7 @@ #include "ace/Registry.h" -#include "ace/Log_Msg.h" + // Indentation while printing names static const u_long INDENTATION_LEVEL = 3; diff --git a/examples/Registry/test_registry_update.cpp b/examples/Registry/test_registry_update.cpp index 7c3612f2daa..2c6dc0b1a61 100644 --- a/examples/Registry/test_registry_update.cpp +++ b/examples/Registry/test_registry_update.cpp @@ -12,7 +12,7 @@ // if used with the CURRENT_USER predefined registry. #include "ace/Registry.h" -#include "ace/Log_Msg.h" + // Name for application's naming context static ACE_Registry::Name application_context_name; diff --git a/examples/Service_Configurator/IPC-tests/client/Makefile b/examples/Service_Configurator/IPC-tests/client/Makefile index d6fbca0eeac..f93be189f08 100644 --- a/examples/Service_Configurator/IPC-tests/client/Makefile +++ b/examples/Service_Configurator/IPC-tests/client/Makefile @@ -58,12 +58,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ @@ -90,12 +91,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ @@ -121,12 +123,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ @@ -148,12 +151,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SOCK_Connector.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ $(WRAPPER_ROOT)/ace/SOCK_IO.h \ @@ -175,12 +179,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/TLI_Connector.h \ $(WRAPPER_ROOT)/ace/TLI_Stream.h \ $(WRAPPER_ROOT)/ace/TLI.h \ @@ -198,12 +203,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SOCK_Dgram.h \ $(WRAPPER_ROOT)/ace/SOCK.h \ $(WRAPPER_ROOT)/ace/Addr.h \ @@ -219,12 +225,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/FIFO_Send_Msg.h \ $(WRAPPER_ROOT)/ace/FIFO_Send.h \ $(WRAPPER_ROOT)/ace/FIFO.h \ @@ -239,12 +246,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/SOCK_Dgram_Bcast.h \ $(WRAPPER_ROOT)/ace/SOCK_Dgram.h \ @@ -261,12 +269,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SPIPE_Connector.h \ $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ $(WRAPPER_ROOT)/ace/SPIPE.h \ @@ -279,20 +288,21 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SPIPE_Connector.i \ $(WRAPPER_ROOT)/ace/Get_Opt.h .obj/remote_service_directory_test.o .shobj/remote_service_directory_test.so: remote_service_directory_test.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/SOCK_Connector.h \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ + $(WRAPPER_ROOT)/ace/SOCK_IO.h \ + $(WRAPPER_ROOT)/ace/SOCK.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/SOCK_Connector.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.h \ $(WRAPPER_ROOT)/ace/IPC_SAP.i \ diff --git a/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp index 2fdaea350d1..3fc4cde16f0 100644 --- a/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp @@ -5,7 +5,7 @@ #include "ace/INET_Addr.h" #include "ace/SOCK_Dgram_Bcast.h" -#include "ace/Log_Msg.h" + #include "ace/Get_Opt.h" /* Name of the program. */ diff --git a/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp index 641c6db7b84..fff3de3f808 100644 --- a/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp @@ -5,7 +5,7 @@ #include "ace/LSOCK_CODgram.h" #include "ace/LSOCK_Dgram.h" #include "ace/UNIX_Addr.h" -#include "ace/Log_Msg.h" + #include "ace/Get_Opt.h" #if defined (ACE_HAS_MSG) && !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) diff --git a/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp index 23cbe5f17db..577c140163e 100644 --- a/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp @@ -5,7 +5,7 @@ #include "ace/Mem_Map.h" #include "ace/FIFO_Send_Msg.h" -#include "ace/Log_Msg.h" + #include "ace/Get_Opt.h" static const BUF_LEN = 256; diff --git a/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp index 0f081bceb7d..fcc4c474bda 100644 --- a/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp @@ -6,7 +6,7 @@ #include "ace/LSOCK_Connector.h" #include "ace/UNIX_Addr.h" -#include "ace/Log_Msg.h" + #include "ace/Get_Opt.h" #if defined (ACE_HAS_MSG) && !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) diff --git a/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp index 52f93a3d126..268e10513db 100644 --- a/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp @@ -5,7 +5,7 @@ #include "ace/Mem_Map.h" #include "ace/SPIPE_Connector.h" -#include "ace/Log_Msg.h" + #include "ace/Get_Opt.h" #if defined (ACE_HAS_STREAM_PIPES) diff --git a/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp index 482fab04d56..6d01a999534 100644 --- a/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp @@ -3,7 +3,7 @@ #include "ace/LSOCK_Connector.h" #include "ace/UNIX_Addr.h" -#include "ace/Log_Msg.h" + #include "ace/Get_Opt.h" #if defined (ACE_HAS_MSG) && !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) diff --git a/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp index 845dd3ef529..8da500530be 100644 --- a/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp @@ -4,7 +4,7 @@ #include "ace/Mem_Map.h" #include "ace/SOCK_Dgram.h" -#include "ace/Log_Msg.h" + #include "ace/INET_Addr.h" #include "ace/Get_Opt.h" diff --git a/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp index 84dcfc84d24..dc99a8c0176 100644 --- a/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp @@ -2,7 +2,7 @@ // $Id$ -#include "ace/Log_Msg.h" + #include "ace/SOCK_Connector.h" #include "ace/INET_Addr.h" #include "ace/Get_Opt.h" diff --git a/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp index 7bcf86607e3..d439ea9ae88 100644 --- a/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp @@ -3,7 +3,7 @@ #include "ace/Mem_Map.h" -#include "ace/Log_Msg.h" + #include "ace/SOCK_Connector.h" #include "ace/SOCK_CODgram.h" #include "ace/INET_Addr.h" diff --git a/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp index e9837132dd4..c9abb6dc2b9 100644 --- a/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp @@ -5,8 +5,8 @@ #include "ace/Mem_Map.h" #include "ace/TLI_Connector.h" #include "ace/INET_Addr.h" -#include "ace/Log_Msg.h" -#include "ace/Log_Msg.h" + + #include "ace/Get_Opt.h" #if defined (ACE_HAS_TLI) diff --git a/examples/Service_Configurator/IPC-tests/server/Makefile b/examples/Service_Configurator/IPC-tests/server/Makefile index 3f5a97aabb3..517d1db3e84 100644 --- a/examples/Service_Configurator/IPC-tests/server/Makefile +++ b/examples/Service_Configurator/IPC-tests/server/Makefile @@ -66,12 +66,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -81,17 +82,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -120,18 +115,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i \ $(WRAPPER_ROOT)/ace/LSOCK_Dgram.h \ $(WRAPPER_ROOT)/ace/SOCK_Dgram.h \ $(WRAPPER_ROOT)/ace/SOCK_Dgram.i \ @@ -149,12 +134,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -164,17 +150,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -203,18 +183,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i \ $(WRAPPER_ROOT)/ace/LSOCK_CODgram.h \ $(WRAPPER_ROOT)/ace/LSOCK.h \ $(WRAPPER_ROOT)/ace/LSOCK.i \ @@ -232,12 +202,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -247,17 +218,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -286,18 +251,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i \ $(WRAPPER_ROOT)/ace/FIFO_Recv_Msg.h \ $(WRAPPER_ROOT)/ace/FIFO_Recv.h \ $(WRAPPER_ROOT)/ace/FIFO.h \ @@ -313,12 +268,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -328,17 +284,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -367,18 +317,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i \ $(WRAPPER_ROOT)/ace/UNIX_Addr.h \ $(WRAPPER_ROOT)/ace/LSOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ @@ -396,12 +336,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -411,17 +352,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -450,18 +385,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i \ $(WRAPPER_ROOT)/ace/UNIX_Addr.h \ $(WRAPPER_ROOT)/ace/LSOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ @@ -479,12 +404,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -494,17 +420,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -533,18 +453,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i \ $(WRAPPER_ROOT)/ace/SOCK_Dgram.h \ $(WRAPPER_ROOT)/ace/SOCK_Dgram.i \ Handle_R_Dgram.i \ @@ -557,12 +467,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -572,17 +483,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -611,18 +516,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ Handle_R_Stream.i \ $(WRAPPER_ROOT)/ace/Get_Opt.h @@ -634,12 +529,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -649,17 +545,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -688,18 +578,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i \ Handle_Timeout.i \ $(WRAPPER_ROOT)/ace/Get_Opt.h .obj/Handle_Broadcast.o .shobj/Handle_Broadcast.so: Handle_Broadcast.cpp Handle_Broadcast.h \ @@ -710,12 +590,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -725,17 +606,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -764,18 +639,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i \ $(WRAPPER_ROOT)/ace/SOCK_Dgram.h \ $(WRAPPER_ROOT)/ace/SOCK_Dgram.i \ Handle_Broadcast.i \ @@ -788,12 +653,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -803,17 +669,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -842,18 +702,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Module.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i \ $(WRAPPER_ROOT)/ace/SPIPE_Acceptor.h \ $(WRAPPER_ROOT)/ace/SPIPE_Stream.h \ $(WRAPPER_ROOT)/ace/SPIPE.h \ @@ -868,12 +718,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/Addr.h \ Handle_Thr_Stream.h \ @@ -890,17 +741,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -925,30 +770,15 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Dynamic.h \ - $(WRAPPER_ROOT)/ace/Svc_Handler.i \ $(WRAPPER_ROOT)/ace/Strategies.h \ - $(WRAPPER_ROOT)/ace/Strategies.cpp \ $(WRAPPER_ROOT)/ace/Acceptor.i \ - $(WRAPPER_ROOT)/ace/Acceptor.cpp \ $(WRAPPER_ROOT)/ace/Service_Record.h \ $(WRAPPER_ROOT)/ace/Stream.h \ - $(WRAPPER_ROOT)/ace/Stream.cpp \ - $(WRAPPER_ROOT)/ace/Stream.i \ - Handle_Thr_Stream.cpp Handle_Thr_Stream.i \ + $(WRAPPER_ROOT)/ace/Module.h \ + Handle_Thr_Stream.i \ $(WRAPPER_ROOT)/ace/TLI_Stream.h \ $(WRAPPER_ROOT)/ace/TLI.h \ $(WRAPPER_ROOT)/ace/TLI.i \ @@ -963,12 +793,13 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -978,17 +809,11 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ diff --git a/examples/Service_Configurator/Misc/Makefile b/examples/Service_Configurator/Misc/Makefile index e9364dace7a..d7d51470617 100644 --- a/examples/Service_Configurator/Misc/Makefile +++ b/examples/Service_Configurator/Misc/Makefile @@ -52,12 +52,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -67,17 +68,11 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ diff --git a/examples/Shared_Malloc/Makefile b/examples/Shared_Malloc/Makefile index bcc2444175f..d14e9eb6489 100644 --- a/examples/Shared_Malloc/Makefile +++ b/examples/Shared_Malloc/Makefile @@ -52,15 +52,15 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - Malloc.h \ - $(WRAPPER_ROOT)/ace/Malloc.h \ - $(WRAPPER_ROOT)/ace/ACE.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + Malloc.h $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -68,17 +68,10 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ - $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h .obj/Options.o .shobj/Options.so: Options.cpp \ $(WRAPPER_ROOT)/ace/Get_Opt.h \ @@ -86,12 +79,12 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - Options.h + $(WRAPPER_ROOT)/ace/ACE.i Options.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/Shared_Malloc/Options.cpp b/examples/Shared_Malloc/Options.cpp index 41400ccff78..bded6518699 100644 --- a/examples/Shared_Malloc/Options.cpp +++ b/examples/Shared_Malloc/Options.cpp @@ -1,7 +1,7 @@ #include "ace/Get_Opt.h" // $Id$ -#include "ace/Log_Msg.h" + #include "Options.h" // Static Singleton instance. diff --git a/examples/Shared_Malloc/test_persistence.cpp b/examples/Shared_Malloc/test_persistence.cpp index 76770815026..1afef0a4a60 100644 --- a/examples/Shared_Malloc/test_persistence.cpp +++ b/examples/Shared_Malloc/test_persistence.cpp @@ -2,7 +2,7 @@ // $Id$ -#include "ace/Log_Msg.h" + #include "ace/Malloc.h" typedef ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> MALLOC; diff --git a/examples/Shared_Memory/test_MM.cpp b/examples/Shared_Memory/test_MM.cpp index 93f6a264eb2..c8ad144377e 100644 --- a/examples/Shared_Memory/test_MM.cpp +++ b/examples/Shared_Memory/test_MM.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/Shared_Memory_MM.h" diff --git a/examples/Shared_Memory/test_SV.cpp b/examples/Shared_Memory/test_SV.cpp index f05e4a8c86a..0b818e7f1b0 100644 --- a/examples/Shared_Memory/test_SV.cpp +++ b/examples/Shared_Memory/test_SV.cpp @@ -1,4 +1,4 @@ -#include "ace/Log_Msg.h" + // $Id$ #include "ace/Shared_Memory_SV.h" diff --git a/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp b/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp index e6ed03525d1..8b1b4e74a0a 100644 --- a/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp +++ b/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp @@ -1,7 +1,7 @@ #include "ace/Typed_SV_Message_Queue.h" // $Id$ -#include "ace/Log_Msg.h" + #include "test.h" int diff --git a/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp b/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp index 210ffe199c3..f5c5dd571b0 100644 --- a/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp +++ b/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp @@ -2,7 +2,7 @@ #include "ace/Signal.h" #include "ace/Typed_SV_Message_Queue.h" -#include "ace/Log_Msg.h" + #include "test.h" // Must be global for signal Message... diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp index eda16178483..f9931705c26 100644 --- a/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp +++ b/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ace/Log_Msg.h" + #include "ace/SV_Shared_Memory.h" #include "ace/SV_Semaphore_Simple.h" #include "ace/Signal.h" diff --git a/examples/Threads/Makefile b/examples/Threads/Makefile index 8f5f808ccaa..292ce6fdf65 100644 --- a/examples/Threads/Makefile +++ b/examples/Threads/Makefile @@ -57,40 +57,35 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/test_barrier1.o .shobj/test_barrier1.so: test_barrier1.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ +.obj/test_auto_event.o .shobj/test_auto_event.so: test_auto_event.cpp \ + $(WRAPPER_ROOT)/ace/Service_Config.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Service_Object.h \ - $(WRAPPER_ROOT)/ace/Shared_Object.h \ - $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -113,56 +108,40 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h -.obj/test_barrier2.o .shobj/test_barrier2.so: test_barrier2.cpp \ - $(WRAPPER_ROOT)/ace/Task.h \ - $(WRAPPER_ROOT)/ace/Service_Object.h \ - $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ + $(WRAPPER_ROOT)/ace/Singleton.h +.obj/test_barrier1.o .shobj/test_barrier1.so: test_barrier1.cpp \ + $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Block.h \ - $(WRAPPER_ROOT)/ace/Malloc.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Service_Config.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/Set.h \ + $(WRAPPER_ROOT)/ace/Proactor.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ - $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ @@ -182,9 +161,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i -.obj/test_future1.o .shobj/test_future1.so: test_future1.cpp \ + $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h +.obj/test_barrier2.o .shobj/test_barrier2.so: test_barrier2.cpp \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ @@ -192,45 +170,32 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Block.h \ - $(WRAPPER_ROOT)/ace/Malloc.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ $(WRAPPER_ROOT)/ace/Service_Config.h \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ @@ -252,16 +217,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Future.h \ - $(WRAPPER_ROOT)/ace/Future.cpp \ - $(WRAPPER_ROOT)/ace/Method_Object.h \ - $(WRAPPER_ROOT)/ace/Activation_Queue.h \ - $(WRAPPER_ROOT)/ace/Auto_Ptr.h \ - $(WRAPPER_ROOT)/ace/Auto_Ptr.cpp \ - $(WRAPPER_ROOT)/ace/Auto_Ptr.i -.obj/test_future2.o .shobj/test_future2.so: test_future2.cpp \ + $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h +.obj/test_future1.o .shobj/test_future1.so: test_future1.cpp \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ @@ -269,47 +226,106 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ + $(WRAPPER_ROOT)/ace/Synch_T.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ + $(WRAPPER_ROOT)/ace/Memory_Pool.h \ + $(WRAPPER_ROOT)/ace/Signal.h \ + $(WRAPPER_ROOT)/ace/Set.h \ + $(WRAPPER_ROOT)/ace/Mem_Map.h \ + $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ + $(WRAPPER_ROOT)/ace/Future.h \ + $(WRAPPER_ROOT)/ace/Method_Object.h \ + $(WRAPPER_ROOT)/ace/Activation_Queue.h \ + $(WRAPPER_ROOT)/ace/Auto_Ptr.h +.obj/test_future2.o .shobj/test_future2.so: test_future2.cpp \ + $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/OS.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ + $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/Trace.h \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ + $(WRAPPER_ROOT)/ace/Future.h \ + $(WRAPPER_ROOT)/ace/Method_Object.h \ + $(WRAPPER_ROOT)/ace/Activation_Queue.h \ + $(WRAPPER_ROOT)/ace/Auto_Ptr.h +.obj/test_manual_event.o .shobj/test_manual_event.so: test_manual_event.cpp \ $(WRAPPER_ROOT)/ace/Service_Config.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/OS.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ + $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/Trace.h \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ + $(WRAPPER_ROOT)/ace/Synch_T.h \ + $(WRAPPER_ROOT)/ace/Set.h \ $(WRAPPER_ROOT)/ace/Proactor.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ + $(WRAPPER_ROOT)/ace/Memory_Pool.h \ + $(WRAPPER_ROOT)/ace/Signal.h \ + $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ @@ -329,101 +345,87 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i \ - $(WRAPPER_ROOT)/ace/Future.h \ - $(WRAPPER_ROOT)/ace/Future.cpp \ - $(WRAPPER_ROOT)/ace/Method_Object.h \ - $(WRAPPER_ROOT)/ace/Activation_Queue.h \ - $(WRAPPER_ROOT)/ace/Auto_Ptr.h \ - $(WRAPPER_ROOT)/ace/Auto_Ptr.cpp \ - $(WRAPPER_ROOT)/ace/Auto_Ptr.i + $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h .obj/test_process_mutex.o .shobj/test_process_mutex.so: test_process_mutex.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i + $(WRAPPER_ROOT)/ace/Signal.h \ + $(WRAPPER_ROOT)/ace/Set.h .obj/test_process_semaphore.o .shobj/test_process_semaphore.so: test_process_semaphore.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i + $(WRAPPER_ROOT)/ace/Signal.h \ + $(WRAPPER_ROOT)/ace/Set.h .obj/test_reader_writer.o .shobj/test_reader_writer.so: test_reader_writer.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Get_Opt.h -.obj/test_recursive_mutex.o .shobj/test_recursive_mutex.so: test_recursive_mutex.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ +.obj/test_recursive_mutex.o .shobj/test_recursive_mutex.so: test_recursive_mutex.cpp +.obj/test_task_one.o .shobj/test_task_one.so: test_task_one.cpp \ + $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Service_Object.h \ - $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -433,20 +435,18 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ - $(WRAPPER_ROOT)/ace/Proactor.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ + $(WRAPPER_ROOT)/ace/Set.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ + $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ + $(WRAPPER_ROOT)/ace/Service_Config.h \ + $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ @@ -466,9 +466,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Get_Opt.h -.obj/test_task.o .shobj/test_task.so: test_task.cpp \ + $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h +.obj/test_task_two.o .shobj/test_task_two.so: test_task_two.cpp \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ @@ -476,45 +475,32 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Block.h \ - $(WRAPPER_ROOT)/ace/Malloc.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ $(WRAPPER_ROOT)/ace/Service_Config.h \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ @@ -536,63 +522,34 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i -.obj/test_task_two.o .shobj/test_task_two.so: test_task_two.cpp \ - $(WRAPPER_ROOT)/ace/Task.h \ - $(WRAPPER_ROOT)/ace/Service_Object.h \ - $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h +.obj/test_task_three.o .shobj/test_task_three.so: test_task_three.cpp \ + $(WRAPPER_ROOT)/ace/Reactor.h \ + $(WRAPPER_ROOT)/ace/Handle_Set.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue.h \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Block.h \ - $(WRAPPER_ROOT)/ace/Malloc.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ - $(WRAPPER_ROOT)/ace/Memory_Pool.h \ + $(WRAPPER_ROOT)/ace/Timer_Queue.i \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ - $(WRAPPER_ROOT)/ace/Mem_Map.h \ - $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Proactor.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.i \ - $(WRAPPER_ROOT)/ace/ReactorEx.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Token.h \ - $(WRAPPER_ROOT)/ace/Reactor.h \ - $(WRAPPER_ROOT)/ace/Handle_Set.h \ $(WRAPPER_ROOT)/ace/Pipe.h \ $(WRAPPER_ROOT)/ace/Pipe.i \ $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ @@ -606,38 +563,64 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ + $(WRAPPER_ROOT)/ace/Service_Config.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Proactor.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ + $(WRAPPER_ROOT)/ace/Memory_Pool.h \ + $(WRAPPER_ROOT)/ace/Mem_Map.h \ + $(WRAPPER_ROOT)/ace/ReactorEx.h \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i -.obj/test_task_three.o .shobj/test_task_three.so: test_task_three.cpp \ - $(WRAPPER_ROOT)/ace/Reactor.h \ - $(WRAPPER_ROOT)/ace/Handle_Set.h \ + $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h +.obj/test_task_four.o .shobj/test_task_four.so: test_task_four.cpp \ + $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Timer_Queue.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Timer_Queue.i \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ + $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Mem_Map.h \ + $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ + $(WRAPPER_ROOT)/ace/Service_Config.h \ + $(WRAPPER_ROOT)/ace/Proactor.h \ + $(WRAPPER_ROOT)/ace/Timer_Queue.h \ + $(WRAPPER_ROOT)/ace/Timer_Queue.i \ + $(WRAPPER_ROOT)/ace/ReactorEx.h \ $(WRAPPER_ROOT)/ace/Token.h \ + $(WRAPPER_ROOT)/ace/Reactor.h \ + $(WRAPPER_ROOT)/ace/Handle_Set.h \ $(WRAPPER_ROOT)/ace/Pipe.h \ $(WRAPPER_ROOT)/ace/Pipe.i \ $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ @@ -651,33 +634,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Service_Object.h \ - $(WRAPPER_ROOT)/ace/Shared_Object.h \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Proactor.h \ - $(WRAPPER_ROOT)/ace/Message_Block.h \ - $(WRAPPER_ROOT)/ace/Malloc.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ - $(WRAPPER_ROOT)/ace/Memory_Pool.h \ - $(WRAPPER_ROOT)/ace/Mem_Map.h \ - $(WRAPPER_ROOT)/ace/ReactorEx.h \ - $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Task.i + $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h .obj/test_thread_manager.o .shobj/test_thread_manager.so: test_thread_manager.cpp \ $(WRAPPER_ROOT)/ace/Service_Config.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ @@ -686,12 +643,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -701,17 +659,11 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -743,45 +695,32 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Block.h \ - $(WRAPPER_ROOT)/ace/Malloc.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ $(WRAPPER_ROOT)/ace/Service_Config.h \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ @@ -803,8 +742,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i + $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h .obj/test_thread_specific.o .shobj/test_thread_specific.so: test_thread_specific.cpp \ $(WRAPPER_ROOT)/ace/Service_Config.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ @@ -813,12 +751,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread.h \ @@ -828,17 +767,11 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ @@ -862,55 +795,38 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h -.obj/test_tss.o .shobj/test_tss.so: test_tss.cpp \ - $(WRAPPER_ROOT)/ace/Task.h \ +.obj/test_tss1.o .shobj/test_tss1.so: test_tss1.cpp \ + $(WRAPPER_ROOT)/ace/Service_Config.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Event_Handler.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.h \ - $(WRAPPER_ROOT)/ace/Message_Block.h \ - $(WRAPPER_ROOT)/ace/Malloc.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Set.h \ + $(WRAPPER_ROOT)/ace/Proactor.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ - $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ @@ -931,7 +847,45 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i + $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h +.obj/test_tss2.o .shobj/test_tss2.so: test_tss2.cpp \ + $(WRAPPER_ROOT)/ace/Task.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/OS.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ + $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/Trace.h \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ + $(WRAPPER_ROOT)/ace/Synch_T.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ + $(WRAPPER_ROOT)/ace/Memory_Pool.h \ + $(WRAPPER_ROOT)/ace/Signal.h \ + $(WRAPPER_ROOT)/ace/Set.h \ + $(WRAPPER_ROOT)/ace/Mem_Map.h \ + $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ + $(WRAPPER_ROOT)/ace/Token.h .obj/test_token.o .shobj/test_token.so: test_token.cpp \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Synch.h \ @@ -939,68 +893,33 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/Trace.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ - $(WRAPPER_ROOT)/ace/Synch_T.cpp \ - $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Synch_T.i \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ - $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ $(WRAPPER_ROOT)/ace/Malloc.h \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ - $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ - $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.cpp \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ - $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ - $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ - $(WRAPPER_ROOT)/ace/Message_Queue.i \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Task.cpp \ - $(WRAPPER_ROOT)/ace/Module.h \ - $(WRAPPER_ROOT)/ace/Module.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.h \ - $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ - $(WRAPPER_ROOT)/ace/Stream_Modules.i \ - $(WRAPPER_ROOT)/ace/Module.i \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Proactor.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue.i \ - $(WRAPPER_ROOT)/ace/ReactorEx.h \ - $(WRAPPER_ROOT)/ace/Reactor.h \ - $(WRAPPER_ROOT)/ace/Handle_Set.h \ - $(WRAPPER_ROOT)/ace/Pipe.h \ - $(WRAPPER_ROOT)/ace/Pipe.i \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ - $(WRAPPER_ROOT)/ace/Addr.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.i \ - $(WRAPPER_ROOT)/ace/SOCK.i \ - $(WRAPPER_ROOT)/ace/SOCK_IO.i \ - $(WRAPPER_ROOT)/ace/INET_Addr.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Task.i + $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/Threads/test_auto_event.cpp b/examples/Threads/test_auto_event.cpp index 3b793d22bf5..4f83d50db71 100644 --- a/examples/Threads/test_auto_event.cpp +++ b/examples/Threads/test_auto_event.cpp @@ -1,6 +1,6 @@ -// This test shows the use of an ACE_Auto_Event as a signaling // $Id$ +// This test shows the use of an ACE_Auto_Event as a signaling // mechanism. Two threads are created (one a reader, the other a // writer). The reader waits till the writer has completed // calculations. Upon waking up the reader prints the data calculated @@ -12,6 +12,7 @@ #include "ace/Singleton.h" #include "ace/Thread_Manager.h" +#if defined (ACE_HAS_THREADS) // Shared event between reader and writer. The ACE_Thread_Mutex is // necessary to make sure that only one ACE_Auto_Event is created. // The default constructor for ACE_Auto_Event sets it initially into @@ -102,3 +103,11 @@ main (int argc, char **argv) return 0; } +#else +int +main (int, char *[]) +{ + ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); + return 0; +} +#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_barrier1.cpp b/examples/Threads/test_barrier1.cpp index d868fb0dfd4..6b213819ca0 100644 --- a/examples/Threads/test_barrier1.cpp +++ b/examples/Threads/test_barrier1.cpp @@ -3,7 +3,7 @@ // mechanisms work. -#include "ace/Log_Msg.h" + #include "ace/Synch.h" #include "ace/Thread_Manager.h" #include "ace/Service_Config.h" diff --git a/examples/Threads/test_barrier2.cpp b/examples/Threads/test_barrier2.cpp index 911d49ed1dd..dadb314a490 100644 --- a/examples/Threads/test_barrier2.cpp +++ b/examples/Threads/test_barrier2.cpp @@ -16,7 +16,7 @@ #include <iostream.h> #include "ace/Task.h" #include "ace/Service_Config.h" -#include "ace/Log_Msg.h" + #if defined (ACE_HAS_THREADS) diff --git a/examples/Threads/test_future1.cpp b/examples/Threads/test_future1.cpp index dc67efe4b93..c3e010b5853 100644 --- a/examples/Threads/test_future1.cpp +++ b/examples/Threads/test_future1.cpp @@ -19,7 +19,7 @@ #include <math.h> #include "ace/Task.h" -#include "ace/Log_Msg.h" + #include "ace/Synch.h" #include "ace/Message_Queue.h" #include "ace/Future.h" diff --git a/examples/Threads/test_future2.cpp b/examples/Threads/test_future2.cpp index 4cf44ad8ce4..70b65a0f2c5 100644 --- a/examples/Threads/test_future2.cpp +++ b/examples/Threads/test_future2.cpp @@ -27,7 +27,7 @@ #include <math.h> #include "ace/Task.h" -#include "ace/Log_Msg.h" + #include "ace/Synch.h" #include "ace/Message_Queue.h" #include "ace/Future.h" diff --git a/examples/Threads/test_manual_event.cpp b/examples/Threads/test_manual_event.cpp index fd22a697555..26d477fabc0 100644 --- a/examples/Threads/test_manual_event.cpp +++ b/examples/Threads/test_manual_event.cpp @@ -15,6 +15,7 @@ #include "ace/Synch.h" #include "ace/Thread_Manager.h" +#if defined (ACE_HAS_THREADS) static ACE_Atomic_Op <ACE_Thread_Mutex, u_long> amount_of_work = (u_long) 0; class Pseudo_Barrier @@ -97,3 +98,11 @@ main (int argc, char **argv) return 0; } +#else +int +main (int, char *[]) +{ + ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); + return 0; +} +#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_process_mutex.cpp b/examples/Threads/test_process_mutex.cpp index 8f7442e36e8..fb23c8b73be 100644 --- a/examples/Threads/test_process_mutex.cpp +++ b/examples/Threads/test_process_mutex.cpp @@ -3,7 +3,6 @@ // This program tests ACE_Process_Mutexes. To run it, open 3 or 4 // windows and run this program in each window... -#include "ace/Log_Msg.h" #include "ace/Synch.h" #include "ace/Signal.h" diff --git a/examples/Threads/test_process_semaphore.cpp b/examples/Threads/test_process_semaphore.cpp index b1309400d29..d7933897f8e 100644 --- a/examples/Threads/test_process_semaphore.cpp +++ b/examples/Threads/test_process_semaphore.cpp @@ -3,7 +3,6 @@ // This program tests ACE_Process_Semaphore. To run it, open 3 or 4 // windows and run this program in each window... -#include "ace/Log_Msg.h" #include "ace/Synch.h" #include "ace/Signal.h" @@ -22,7 +21,7 @@ main (int argc, char *argv[]) ACE_Process_Semaphore pm (1, name); - ACE_Sig_Action sa (ACE_SignalHandler (handler), SIGINT); + ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT); for (int i = 0; i < 100 && !done; i++) { @@ -54,3 +53,4 @@ main (int argc, char *argv[]) pm.remove (); return 0; } + diff --git a/examples/Threads/test_reader_writer.cpp b/examples/Threads/test_reader_writer.cpp index ea781972f6b..ef888133d83 100644 --- a/examples/Threads/test_reader_writer.cpp +++ b/examples/Threads/test_reader_writer.cpp @@ -3,7 +3,7 @@ // implementation of readers/writer locks on Win32 and Posix pthreads. -#include "ace/Log_Msg.h" + #include "ace/Synch.h" #include "ace/Thread.h" #include "ace/Thread_Manager.h" diff --git a/examples/Threads/test_recursive_mutex.cpp b/examples/Threads/test_recursive_mutex.cpp index 4c21147f82e..1cc2892b2a8 100644 --- a/examples/Threads/test_recursive_mutex.cpp +++ b/examples/Threads/test_recursive_mutex.cpp @@ -1,16 +1,14 @@ -// This test program verifies the functionality of the ACE_OS // $Id$ +// This test program verifies the functionality of the ACE_OS // implementation of recursive mutexes on Win32 and Posix pthreads. -#include "ace/Log_Msg.h" - -#if defined (ACE_HAS_THREADS) - #include "ace/Service_Config.h" #include "ace/Get_Opt.h" #include "ace/Synch.h" +#if defined (ACE_HAS_THREADS) + // Total number of iterations. static size_t n_iterations = 1000; static size_t n_threads = 4; diff --git a/examples/Threads/test_task_four.cpp b/examples/Threads/test_task_four.cpp index 6bfa6698255..64209cb3430 100644 --- a/examples/Threads/test_task_four.cpp +++ b/examples/Threads/test_task_four.cpp @@ -32,7 +32,7 @@ #include "ace/Task.h" #include "ace/Service_Config.h" -#include "ace/Log_Msg.h" + #if defined (ACE_HAS_THREADS) diff --git a/examples/Threads/test_task_one.cpp b/examples/Threads/test_task_one.cpp index 7cd7976d2bb..d0a8a12e6c4 100644 --- a/examples/Threads/test_task_one.cpp +++ b/examples/Threads/test_task_one.cpp @@ -7,7 +7,7 @@ #include "ace/Task.h" #include "ace/Service_Config.h" -#include "ace/Log_Msg.h" + #if defined (ACE_HAS_THREADS) diff --git a/examples/Threads/test_task_three.cpp b/examples/Threads/test_task_three.cpp index aedea6fc158..c6ad69511b5 100644 --- a/examples/Threads/test_task_three.cpp +++ b/examples/Threads/test_task_three.cpp @@ -16,7 +16,7 @@ #include "ace/Reactor.h" #include "ace/Service_Config.h" #include "ace/Task.h" -#include "ace/Log_Msg.h" + #if defined (ACE_HAS_THREADS) diff --git a/examples/Threads/test_task_two.cpp b/examples/Threads/test_task_two.cpp index 45f6b93ff87..9f25962c795 100644 --- a/examples/Threads/test_task_two.cpp +++ b/examples/Threads/test_task_two.cpp @@ -5,7 +5,7 @@ // ACE Thread Manager. #include "ace/Task.h" -#include "ace/Log_Msg.h" + #include "ace/Service_Config.h" #include "ace/Synch.h" diff --git a/examples/Threads/test_thread_pool.cpp b/examples/Threads/test_thread_pool.cpp index accb652e7c4..68741156b83 100644 --- a/examples/Threads/test_thread_pool.cpp +++ b/examples/Threads/test_thread_pool.cpp @@ -12,7 +12,7 @@ #include "ace/Task.h" #include "ace/Service_Config.h" -#include "ace/Log_Msg.h" + #include "ace/Task.h" #if defined (ACE_HAS_THREADS) diff --git a/examples/Threads/test_thread_specific.cpp b/examples/Threads/test_thread_specific.cpp index 41b70c8c012..f7a4f6dccf3 100644 --- a/examples/Threads/test_thread_specific.cpp +++ b/examples/Threads/test_thread_specific.cpp @@ -2,7 +2,8 @@ // $Id$ #include "ace/Synch.h" -#include "ace/Log_Msg.h" + +#if defined (ACE_HAS_THREADS) // Define a class that will be stored in thread-specific data. Note // that as far as this class is concerned it's just a regular C++ @@ -206,3 +207,13 @@ main (int argc, char *argv[]) #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) template class ACE_TSS<Errno>; #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ + +#else +int +main (void) +{ + ACE_ERROR_RETURN ((LM_ERROR, + "ACE doesn't support support threads on this platform (yet)\n"), + -1); +} +#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_tss1.cpp b/examples/Threads/test_tss1.cpp index 8f1d7c81528..7efdc9dc3ef 100644 --- a/examples/Threads/test_tss1.cpp +++ b/examples/Threads/test_tss1.cpp @@ -22,9 +22,9 @@ #include "ace/Service_Config.h" #include "ace/Synch.h" -#include "ace/Log_Msg.h" #include "ace/Task.h" -#include "test_config.h" + +#if defined (ACE_HAS_THREADS) static int iterations = 100; @@ -101,22 +101,21 @@ public: virtual int svc (void); }; -template <ACE_SYNCH_1> -int Tester<ACE_SYNCH_2>::open (void *) +template <ACE_SYNCH_1> int +Tester<ACE_SYNCH_2>::open (void *) { - this->activate (); - return 0; + return this->activate (); } template <ACE_SYNCH_1> int Tester<ACE_SYNCH_2>::close (u_long) { - ACE_DEBUG ((LM_DEBUG, close running\n!)); + ACE_DEBUG ((LM_DEBUG, "close running\n!")); close_started = 1; ACE_OS::sleep (2); - ACE_DEBUG ((LM_DEBUG, "close: trying to log error code 7!"\n)); + ACE_DEBUG ((LM_DEBUG, "close: trying to log error code 7!\n")); TSS_Error->error (7); - ACE_DEBUG ((LM_DEBUG, "close: logging succeeded!"\n)); + ACE_DEBUG ((LM_DEBUG, "close: logging succeeded!\n")); return 0; } @@ -133,7 +132,7 @@ Tester<ACE_SYNCH_2>::svc (void) } int -main (int argc, char *argv[]) +main (int, char *[]) { Tester<ACE_MT_SYNCH> tester; @@ -142,14 +141,24 @@ main (int argc, char *argv[]) while (!close_started) continue; - ACE_DEBUG ((LM_DEBUG, "main: trying to log error code 7!"\n)); + ACE_DEBUG ((LM_DEBUG, "main: trying to log error code 7!\n")); TSS_Error->error (3); - ACE_DEBUG ((LM_DEBUG, "main: logging succeeded!"\n)); + ACE_DEBUG ((LM_DEBUG, "main: logging succeeded!\n")); return 0; } #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) template class ACE_TSS<Errno>; #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ + +#else +int +main (void) +{ + ACE_ERROR_RETURN ((LM_ERROR, + "ACE doesn't support support threads on this platform (yet)\n"), + -1); +} +#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_tss2.cpp b/examples/Threads/test_tss2.cpp index 2ce269e71f7..24a8d958e91 100644 --- a/examples/Threads/test_tss2.cpp +++ b/examples/Threads/test_tss2.cpp @@ -65,7 +65,7 @@ public: int open (void *arg); - void *svc (void *arg); + static void *svc (void *arg); static int wait_count_; static int max_count_; @@ -104,8 +104,8 @@ Test_Task::~Test_Task (void) wait_count_--; } -int -Test_Task::svc (void *) +void * +Test_Task::svc (void *arg) { ACE_TSS<TSS_Obj> tss (new TSS_Obj); @@ -147,7 +147,8 @@ Test_Task::svc (void *) int Test_Task::open (void *arg) { - ACE_Thread::spawn (Task_Task::svc, arg); + if (ACE_Thread::spawn (Test_Task::svc, arg) == -1) + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Thread::spawn"), 0); return 0; } |