From c9d703df3ec454cd772b03a69a3d1d72a7cb731c Mon Sep 17 00:00:00 2001 From: nw1 Date: Thu, 28 Aug 1997 02:18:48 +0000 Subject: ACE libraries are renamed to conform with MicroSuck's convention. --- .../ASX/Event_Server/Event_Server/Event_Server.mak | 321 ++++++++- .../ASX/Event_Server/Event_Server/Event_Server.mdp | Bin 45568 -> 46592 bytes .../ASX/Event_Server/Transceiver/transceiver.mak | 27 +- .../ASX/Event_Server/Transceiver/transceiver.mdp | Bin 43520 -> 43520 bytes .../ASX/UPIPE_Event_Server/UPIPE_Event_Server.mak | 76 ++- .../ASX/UPIPE_Event_Server/UPIPE_Event_Server.mdp | Bin 50688 -> 45056 bytes examples/Connection/blocking/SPIPE.mak | 168 ++++- examples/Connection/blocking/SPIPE.mdp | Bin 53760 -> 51200 bytes examples/Connection/non_blocking/non_blocking.mak | 92 ++- examples/Connection/non_blocking/non_blocking.mdp | Bin 48078 -> 50176 bytes examples/IPC_SAP/SOCK_SAP/SOCK_SAP.mak | 43 +- examples/IPC_SAP/SOCK_SAP/SOCK_SAP.mdp | Bin 43520 -> 43520 bytes examples/Log_Msg/Log_Msg.mak | 35 +- examples/Log_Msg/Log_Msg.mdp | Bin 38400 -> 39936 bytes examples/Logger/Acceptor-server/server_loggerd.mak | 155 ++++- examples/Logger/Acceptor-server/server_loggerd.mdp | Bin 43008 -> 44032 bytes examples/Logger/client/client.mak | 13 +- examples/Logger/client/client.mdp | Bin 39424 -> 39936 bytes examples/Logger/simple-server/server_loggerd.mak | 121 +++- examples/Logger/simple-server/server_loggerd.mdp | Bin 43008 -> 44032 bytes examples/Naming/Naming.mak | 51 +- examples/Naming/Naming.mdp | Bin 52224 -> 53248 bytes examples/OS/Process/Process.mak | 30 +- examples/OS/Process/Process.mdp | Bin 39936 -> 40448 bytes examples/Reactor/Misc/Misc.mak | 48 +- examples/Reactor/Misc/Misc.mdp | Bin 57344 -> 51200 bytes examples/Reactor/Ntalker/ntalker.mak | 45 +- examples/Reactor/Ntalker/ntalker.mdp | Bin 48640 -> 44032 bytes examples/Reactor/Proactor/test_proactor.mak | 52 +- examples/Reactor/Proactor/test_proactor.mdp | Bin 54784 -> 54272 bytes examples/Reactor/ReactorEx/reactorex.mdp | Bin 73728 -> 73728 bytes examples/Reactor/WFMO_Reactor/reactorex.mdp | Bin 73728 -> 73728 bytes examples/Threads/test.mak | 739 ++++++++++++--------- examples/Threads/test.mdp | Bin 123904 -> 128512 bytes 34 files changed, 1551 insertions(+), 465 deletions(-) (limited to 'examples') diff --git a/examples/ASX/Event_Server/Event_Server/Event_Server.mak b/examples/ASX/Event_Server/Event_Server/Event_Server.mak index 91bf8be653e..57958b6d444 100644 --- a/examples/ASX/Event_Server/Event_Server/Event_Server.mak +++ b/examples/ASX/Event_Server/Event_Server/Event_Server.mak @@ -79,8 +79,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/Event_Server.pdb" /debug /machine:I386\ @@ -130,23 +130,49 @@ CPP_SBRS=.\. SOURCE=.\Supplier_Router.cpp DEP_CPP_SUPPL=\ + "..\..\..\..\ace\config-win32.h"\ ".\Options.h"\ + ".\Options.i"\ + ".\Peer_Router.h"\ ".\Supplier_Router.h"\ + {$(INCLUDE)}"\ace\Acceptor.cpp"\ + {$(INCLUDE)}"\ace\Acceptor.h"\ + {$(INCLUDE)}"\ace\Acceptor.i"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Asynch_IO.h"\ + {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Containers.cpp"\ {$(INCLUDE)}"\ace\Containers.h"\ {$(INCLUDE)}"\ace\Containers.i"\ + {$(INCLUDE)}"\ace\Dynamic.h"\ + {$(INCLUDE)}"\ace\Dynamic.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ + {$(INCLUDE)}"\ace\Handle_Set.h"\ + {$(INCLUDE)}"\ace\Handle_Set.i"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ + {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ {$(INCLUDE)}"\ace\IPC_SAP.h"\ {$(INCLUDE)}"\ace\IPC_SAP.i"\ + {$(INCLUDE)}"\ace\Local_Tokens.h"\ + {$(INCLUDE)}"\ace\Local_Tokens.i"\ {$(INCLUDE)}"\ace\Log_Msg.h"\ {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ @@ -163,9 +189,30 @@ DEP_CPP_SUPPL=\ {$(INCLUDE)}"\ace\Mem_Map.i"\ {$(INCLUDE)}"\ace\Memory_Pool.h"\ {$(INCLUDE)}"\ace\Memory_Pool.i"\ + {$(INCLUDE)}"\ace\Message_Block.h"\ + {$(INCLUDE)}"\ace\Message_Block.i"\ + {$(INCLUDE)}"\ace\Message_Queue.cpp"\ + {$(INCLUDE)}"\ace\Message_Queue.h"\ + {$(INCLUDE)}"\ace\Message_Queue.i"\ + {$(INCLUDE)}"\ace\Module.cpp"\ + {$(INCLUDE)}"\ace\Module.h"\ + {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ + {$(INCLUDE)}"\ace\Pipe.h"\ + {$(INCLUDE)}"\ace\Pipe.i"\ + {$(INCLUDE)}"\ace\Proactor.h"\ + {$(INCLUDE)}"\ace\Proactor.i"\ + {$(INCLUDE)}"\ace\Profile_Timer.h"\ + {$(INCLUDE)}"\ace\Profile_Timer.i"\ + {$(INCLUDE)}"\ace\Reactor.h"\ + {$(INCLUDE)}"\ace\Reactor.i"\ + {$(INCLUDE)}"\ace\ReactorEx.h"\ + {$(INCLUDE)}"\ace\ReactorEx.i"\ {$(INCLUDE)}"\ace\Service_Config.h"\ + {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ @@ -183,19 +230,51 @@ DEP_CPP_SUPPL=\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ + {$(INCLUDE)}"\ace\Strategies.h"\ + {$(INCLUDE)}"\ace\Strategies_T.cpp"\ + {$(INCLUDE)}"\ace\Strategies_T.h"\ + {$(INCLUDE)}"\ace\Stream_Modules.cpp"\ + {$(INCLUDE)}"\ace\Stream_Modules.h"\ + {$(INCLUDE)}"\ace\Stream_Modules.i"\ {$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\ {$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\ {$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\ {$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\ + {$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\ + {$(INCLUDE)}"\ace\Svc_Handler.cpp"\ + {$(INCLUDE)}"\ace\Svc_Handler.h"\ + {$(INCLUDE)}"\ace\Svc_Handler.i"\ {$(INCLUDE)}"\ace\Synch.h"\ {$(INCLUDE)}"\ace\Synch.i"\ + {$(INCLUDE)}"\ace\Synch_Options.h"\ {$(INCLUDE)}"\ace\Synch_T.cpp"\ {$(INCLUDE)}"\ace\Synch_T.h"\ {$(INCLUDE)}"\ace\Synch_T.i"\ + {$(INCLUDE)}"\ace\Task.h"\ + {$(INCLUDE)}"\ace\Task.i"\ + {$(INCLUDE)}"\ace\Task_T.cpp"\ + {$(INCLUDE)}"\ace\Task_T.h"\ + {$(INCLUDE)}"\ace\Task_T.i"\ {$(INCLUDE)}"\ace\Thread.h"\ {$(INCLUDE)}"\ace\Thread.i"\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ + {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ + {$(INCLUDE)}"\ace\Timer_Heap.h"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ + {$(INCLUDE)}"\ace\Timer_List.h"\ + {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_List_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.i"\ + {$(INCLUDE)}"\ace\Timer_Wheel.h"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ + {$(INCLUDE)}"\ace\Token.h"\ + {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ {$(INCLUDE)}"\ace\ws2tcpip.h"\ @@ -209,6 +288,7 @@ DEP_CPP_SUPPL=\ SOURCE=.\Event_Analyzer.cpp DEP_CPP_EVENT=\ + "..\..\..\..\ace\config-win32.h"\ ".\Event_Analyzer.h"\ ".\Options.h"\ ".\Options.i"\ @@ -218,6 +298,10 @@ DEP_CPP_EVENT=\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Containers.cpp"\ @@ -225,6 +309,9 @@ DEP_CPP_EVENT=\ {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ @@ -262,6 +349,8 @@ DEP_CPP_EVENT=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -349,25 +438,51 @@ DEP_CPP_EVENT=\ SOURCE=.\event_server.cpp DEP_CPP_EVENT_=\ + "..\..\..\..\ace\config-win32.h"\ ".\Consumer_Router.h"\ ".\Event_Analyzer.h"\ ".\Options.h"\ + ".\Options.i"\ + ".\Peer_Router.h"\ ".\Supplier_Router.h"\ + {$(INCLUDE)}"\ace\Acceptor.cpp"\ + {$(INCLUDE)}"\ace\Acceptor.h"\ + {$(INCLUDE)}"\ace\Acceptor.i"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Asynch_IO.h"\ + {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Containers.cpp"\ {$(INCLUDE)}"\ace\Containers.h"\ {$(INCLUDE)}"\ace\Containers.i"\ + {$(INCLUDE)}"\ace\Dynamic.h"\ + {$(INCLUDE)}"\ace\Dynamic.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ + {$(INCLUDE)}"\ace\Handle_Set.h"\ + {$(INCLUDE)}"\ace\Handle_Set.i"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ + {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ {$(INCLUDE)}"\ace\IPC_SAP.h"\ {$(INCLUDE)}"\ace\IPC_SAP.i"\ + {$(INCLUDE)}"\ace\Local_Tokens.h"\ + {$(INCLUDE)}"\ace\Local_Tokens.i"\ {$(INCLUDE)}"\ace\Log_Msg.h"\ {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ @@ -384,9 +499,30 @@ DEP_CPP_EVENT_=\ {$(INCLUDE)}"\ace\Mem_Map.i"\ {$(INCLUDE)}"\ace\Memory_Pool.h"\ {$(INCLUDE)}"\ace\Memory_Pool.i"\ + {$(INCLUDE)}"\ace\Message_Block.h"\ + {$(INCLUDE)}"\ace\Message_Block.i"\ + {$(INCLUDE)}"\ace\Message_Queue.cpp"\ + {$(INCLUDE)}"\ace\Message_Queue.h"\ + {$(INCLUDE)}"\ace\Message_Queue.i"\ + {$(INCLUDE)}"\ace\Module.cpp"\ + {$(INCLUDE)}"\ace\Module.h"\ + {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ + {$(INCLUDE)}"\ace\Pipe.h"\ + {$(INCLUDE)}"\ace\Pipe.i"\ + {$(INCLUDE)}"\ace\Proactor.h"\ + {$(INCLUDE)}"\ace\Proactor.i"\ + {$(INCLUDE)}"\ace\Profile_Timer.h"\ + {$(INCLUDE)}"\ace\Profile_Timer.i"\ + {$(INCLUDE)}"\ace\Reactor.h"\ + {$(INCLUDE)}"\ace\Reactor.i"\ + {$(INCLUDE)}"\ace\ReactorEx.h"\ + {$(INCLUDE)}"\ace\ReactorEx.i"\ {$(INCLUDE)}"\ace\Service_Config.h"\ + {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ @@ -401,25 +537,70 @@ DEP_CPP_EVENT_=\ {$(INCLUDE)}"\ace\SOCK_IO.i"\ {$(INCLUDE)}"\ace\SOCK_Stream.h"\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ + {$(INCLUDE)}"\ace\SPIPE.h"\ + {$(INCLUDE)}"\ace\SPIPE.i"\ + {$(INCLUDE)}"\ace\SPIPE_Acceptor.h"\ + {$(INCLUDE)}"\ace\SPIPE_Addr.h"\ + {$(INCLUDE)}"\ace\SPIPE_Addr.i"\ + {$(INCLUDE)}"\ace\SPIPE_Stream.h"\ + {$(INCLUDE)}"\ace\SPIPE_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ + {$(INCLUDE)}"\ace\Strategies.h"\ + {$(INCLUDE)}"\ace\Strategies_T.cpp"\ + {$(INCLUDE)}"\ace\Strategies_T.h"\ + {$(INCLUDE)}"\ace\Stream.cpp"\ {$(INCLUDE)}"\ace\Stream.h"\ + {$(INCLUDE)}"\ace\Stream.i"\ + {$(INCLUDE)}"\ace\Stream_Modules.cpp"\ + {$(INCLUDE)}"\ace\Stream_Modules.h"\ + {$(INCLUDE)}"\ace\Stream_Modules.i"\ {$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\ {$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\ {$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\ {$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\ + {$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\ + {$(INCLUDE)}"\ace\Svc_Handler.cpp"\ + {$(INCLUDE)}"\ace\Svc_Handler.h"\ + {$(INCLUDE)}"\ace\Svc_Handler.i"\ {$(INCLUDE)}"\ace\Synch.h"\ {$(INCLUDE)}"\ace\Synch.i"\ + {$(INCLUDE)}"\ace\Synch_Options.h"\ {$(INCLUDE)}"\ace\Synch_T.cpp"\ {$(INCLUDE)}"\ace\Synch_T.h"\ {$(INCLUDE)}"\ace\Synch_T.i"\ + {$(INCLUDE)}"\ace\Task.h"\ + {$(INCLUDE)}"\ace\Task.i"\ + {$(INCLUDE)}"\ace\Task_T.cpp"\ + {$(INCLUDE)}"\ace\Task_T.h"\ + {$(INCLUDE)}"\ace\Task_T.i"\ {$(INCLUDE)}"\ace\Thread.h"\ {$(INCLUDE)}"\ace\Thread.i"\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ + {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ + {$(INCLUDE)}"\ace\Timer_Heap.h"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ + {$(INCLUDE)}"\ace\Timer_List.h"\ + {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_List_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.i"\ + {$(INCLUDE)}"\ace\Timer_Wheel.h"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ + {$(INCLUDE)}"\ace\Token.h"\ + {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ {$(INCLUDE)}"\ace\UPIPE_Acceptor.h"\ + {$(INCLUDE)}"\ace\UPIPE_Acceptor.i"\ + {$(INCLUDE)}"\ace\UPIPE_Addr.h"\ + {$(INCLUDE)}"\ace\UPIPE_Stream.h"\ + {$(INCLUDE)}"\ace\UPIPE_Stream.i"\ {$(INCLUDE)}"\ace\ws2tcpip.h"\ @@ -432,20 +613,33 @@ DEP_CPP_EVENT_=\ SOURCE=.\Options.cpp DEP_CPP_OPTIO=\ + "..\..\..\..\ace\config-win32.h"\ ".\Options.h"\ + ".\Options.i"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ {$(INCLUDE)}"\ace\Get_Opt.h"\ + {$(INCLUDE)}"\ace\Get_Opt.i"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\Log_Msg.h"\ {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ {$(INCLUDE)}"\ace\Log_Record.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ + {$(INCLUDE)}"\ace\Profile_Timer.h"\ + {$(INCLUDE)}"\ace\Profile_Timer.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ @@ -460,6 +654,7 @@ DEP_CPP_OPTIO=\ {$(INCLUDE)}"\ace\Synch_T.i"\ {$(INCLUDE)}"\ace\Thread.h"\ {$(INCLUDE)}"\ace\Thread.i"\ + {$(INCLUDE)}"\ace\Time_Value.h"\ {$(INCLUDE)}"\ace\Trace.h"\ {$(INCLUDE)}"\ace\ws2tcpip.h"\ @@ -473,30 +668,152 @@ DEP_CPP_OPTIO=\ SOURCE=.\Peer_Router.cpp DEP_CPP_PEER_=\ + "..\..\..\..\ace\config-win32.h"\ ".\Options.h"\ + ".\Options.i"\ ".\Peer_Router.h"\ + {$(INCLUDE)}"\ace\Acceptor.cpp"\ + {$(INCLUDE)}"\ace\Acceptor.h"\ + {$(INCLUDE)}"\ace\Acceptor.i"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ + {$(INCLUDE)}"\ace\Addr.h"\ + {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Asynch_IO.h"\ + {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ + {$(INCLUDE)}"\ace\Containers.cpp"\ + {$(INCLUDE)}"\ace\Containers.h"\ + {$(INCLUDE)}"\ace\Containers.i"\ + {$(INCLUDE)}"\ace\Dynamic.h"\ + {$(INCLUDE)}"\ace\Dynamic.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Get_Opt.h"\ + {$(INCLUDE)}"\ace\Get_Opt.i"\ + {$(INCLUDE)}"\ace\Handle_Set.h"\ + {$(INCLUDE)}"\ace\Handle_Set.i"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ + {$(INCLUDE)}"\ace\INET_Addr.h"\ + {$(INCLUDE)}"\ace\INET_Addr.i"\ + {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ + {$(INCLUDE)}"\ace\IPC_SAP.h"\ + {$(INCLUDE)}"\ace\IPC_SAP.i"\ + {$(INCLUDE)}"\ace\Local_Tokens.h"\ + {$(INCLUDE)}"\ace\Local_Tokens.i"\ {$(INCLUDE)}"\ace\Log_Msg.h"\ {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ {$(INCLUDE)}"\ace\Log_Record.i"\ + {$(INCLUDE)}"\ace\Malloc.h"\ + {$(INCLUDE)}"\ace\Malloc.i"\ + {$(INCLUDE)}"\ace\Malloc_T.cpp"\ + {$(INCLUDE)}"\ace\Malloc_T.h"\ + {$(INCLUDE)}"\ace\Malloc_T.i"\ + {$(INCLUDE)}"\ace\Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Map_Manager.h"\ + {$(INCLUDE)}"\ace\Map_Manager.i"\ + {$(INCLUDE)}"\ace\Mem_Map.h"\ + {$(INCLUDE)}"\ace\Mem_Map.i"\ + {$(INCLUDE)}"\ace\Memory_Pool.h"\ + {$(INCLUDE)}"\ace\Memory_Pool.i"\ + {$(INCLUDE)}"\ace\Message_Block.h"\ + {$(INCLUDE)}"\ace\Message_Block.i"\ + {$(INCLUDE)}"\ace\Message_Queue.cpp"\ + {$(INCLUDE)}"\ace\Message_Queue.h"\ + {$(INCLUDE)}"\ace\Message_Queue.i"\ + {$(INCLUDE)}"\ace\Module.cpp"\ + {$(INCLUDE)}"\ace\Module.h"\ + {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ + {$(INCLUDE)}"\ace\Pipe.h"\ + {$(INCLUDE)}"\ace\Pipe.i"\ + {$(INCLUDE)}"\ace\Proactor.h"\ + {$(INCLUDE)}"\ace\Proactor.i"\ + {$(INCLUDE)}"\ace\Profile_Timer.h"\ + {$(INCLUDE)}"\ace\Profile_Timer.i"\ + {$(INCLUDE)}"\ace\Reactor.h"\ + {$(INCLUDE)}"\ace\Reactor.i"\ + {$(INCLUDE)}"\ace\ReactorEx.h"\ + {$(INCLUDE)}"\ace\ReactorEx.i"\ {$(INCLUDE)}"\ace\Service_Config.h"\ + {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ + {$(INCLUDE)}"\ace\Signal.h"\ + {$(INCLUDE)}"\ace\Signal.i"\ + {$(INCLUDE)}"\ace\SOCK.h"\ + {$(INCLUDE)}"\ace\SOCK.i"\ + {$(INCLUDE)}"\ace\SOCK_Acceptor.h"\ + {$(INCLUDE)}"\ace\SOCK_Acceptor.i"\ + {$(INCLUDE)}"\ace\SOCK_IO.h"\ + {$(INCLUDE)}"\ace\SOCK_IO.i"\ + {$(INCLUDE)}"\ace\SOCK_Stream.h"\ + {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ + {$(INCLUDE)}"\ace\Strategies.h"\ + {$(INCLUDE)}"\ace\Strategies_T.cpp"\ + {$(INCLUDE)}"\ace\Strategies_T.h"\ + {$(INCLUDE)}"\ace\Stream_Modules.cpp"\ + {$(INCLUDE)}"\ace\Stream_Modules.h"\ + {$(INCLUDE)}"\ace\Stream_Modules.i"\ + {$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\ + {$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\ + {$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\ + {$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\ + {$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\ + {$(INCLUDE)}"\ace\Svc_Handler.cpp"\ + {$(INCLUDE)}"\ace\Svc_Handler.h"\ + {$(INCLUDE)}"\ace\Svc_Handler.i"\ + {$(INCLUDE)}"\ace\Synch.h"\ + {$(INCLUDE)}"\ace\Synch.i"\ + {$(INCLUDE)}"\ace\Synch_Options.h"\ + {$(INCLUDE)}"\ace\Synch_T.cpp"\ + {$(INCLUDE)}"\ace\Synch_T.h"\ + {$(INCLUDE)}"\ace\Synch_T.i"\ + {$(INCLUDE)}"\ace\Task.h"\ + {$(INCLUDE)}"\ace\Task.i"\ + {$(INCLUDE)}"\ace\Task_T.cpp"\ + {$(INCLUDE)}"\ace\Task_T.h"\ + {$(INCLUDE)}"\ace\Task_T.i"\ + {$(INCLUDE)}"\ace\Thread.h"\ + {$(INCLUDE)}"\ace\Thread.i"\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ + {$(INCLUDE)}"\ace\Thread_Manager.i"\ + {$(INCLUDE)}"\ace\Time_Value.h"\ + {$(INCLUDE)}"\ace\Timer_Heap.h"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ + {$(INCLUDE)}"\ace\Timer_List.h"\ + {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_List_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.i"\ + {$(INCLUDE)}"\ace\Timer_Wheel.h"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ + {$(INCLUDE)}"\ace\Token.h"\ + {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ {$(INCLUDE)}"\ace\ws2tcpip.h"\ diff --git a/examples/ASX/Event_Server/Event_Server/Event_Server.mdp b/examples/ASX/Event_Server/Event_Server/Event_Server.mdp index 1de71f31e9d..ab68a0bb649 100644 Binary files a/examples/ASX/Event_Server/Event_Server/Event_Server.mdp and b/examples/ASX/Event_Server/Event_Server/Event_Server.mdp differ diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.mak b/examples/ASX/Event_Server/Transceiver/transceiver.mak index e181efe56e6..3b775d89043 100644 --- a/examples/ASX/Event_Server/Transceiver/transceiver.mak +++ b/examples/ASX/Event_Server/Transceiver/transceiver.mak @@ -13,7 +13,7 @@ CFG=Transceiver - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE on this makefile !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "Transceiver.mak" CFG="Transceiver - Win32 Debug" +!MESSAGE NMAKE /f "transceiver.mak" CFG="Transceiver - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -30,8 +30,9 @@ NULL=nul !ENDIF ################################################################################ # Begin Project -CPP=cl.exe +# PROP Target_Last_Scanned "Transceiver - Win32 Debug" RSC=rc.exe +CPP=cl.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "Debug" @@ -45,15 +46,15 @@ RSC=rc.exe OUTDIR=.\. INTDIR=.\Debug -ALL : "$(OUTDIR)\Transceiver.exe" +ALL : "$(OUTDIR)\transceiver.exe" CLEAN : -@erase "$(INTDIR)\transceiver.obj" -@erase "$(INTDIR)\vc40.idb" -@erase "$(INTDIR)\vc40.pdb" - -@erase "$(OUTDIR)\Transceiver.exe" - -@erase "$(OUTDIR)\Transceiver.ilk" - -@erase "$(OUTDIR)\Transceiver.pdb" + -@erase "$(OUTDIR)\transceiver.exe" + -@erase "$(OUTDIR)\transceiver.ilk" + -@erase "$(OUTDIR)\transceiver.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @@ -68,27 +69,27 @@ CLEAN : BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -BSC32_FLAGS=/nologo /o"$(OUTDIR)/Transceiver.bsc" +BSC32_FLAGS=/nologo /o"$(OUTDIR)/transceiver.bsc" BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ - /pdb:"$(OUTDIR)/Transceiver.pdb" /debug /machine:I386\ - /out:"$(OUTDIR)/Transceiver.exe" + /pdb:"$(OUTDIR)/transceiver.pdb" /debug /machine:I386\ + /out:"$(OUTDIR)/transceiver.exe" LINK32_OBJS= \ "$(INTDIR)\transceiver.obj" -"$(OUTDIR)\Transceiver.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) +"$(OUTDIR)\transceiver.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ - /Fp"$(INTDIR)/Transceiver.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c + /Fp"$(INTDIR)/transceiver.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c CPP_OBJS=.\Debug/ CPP_SBRS=.\. diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.mdp b/examples/ASX/Event_Server/Transceiver/transceiver.mdp index 29117e6bcfa..355b5416994 100644 Binary files a/examples/ASX/Event_Server/Transceiver/transceiver.mdp and b/examples/ASX/Event_Server/Transceiver/transceiver.mdp differ diff --git a/examples/ASX/UPIPE_Event_Server/UPIPE_Event_Server.mak b/examples/ASX/UPIPE_Event_Server/UPIPE_Event_Server.mak index dc75b3be588..648fefb06c2 100644 --- a/examples/ASX/UPIPE_Event_Server/UPIPE_Event_Server.mak +++ b/examples/ASX/UPIPE_Event_Server/UPIPE_Event_Server.mak @@ -32,8 +32,9 @@ NULL=nul !ENDIF ################################################################################ # Begin Project -CPP=cl.exe +# PROP Target_Last_Scanned "UPIPE_Event_Server - Win32 Debug" RSC=rc.exe +CPP=cl.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "Debug" @@ -80,8 +81,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/UPIPE_Event_Server.pdb" /debug /machine:I386\ @@ -131,6 +132,7 @@ CPP_SBRS=.\. SOURCE=.\Supplier_Router.cpp DEP_CPP_SUPPL=\ + "..\..\..\ace\config-win32.h"\ ".\Options.h"\ ".\Options.i"\ ".\Peer_Router.cpp"\ @@ -145,6 +147,10 @@ DEP_CPP_SUPPL=\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Containers.cpp"\ @@ -154,6 +160,9 @@ DEP_CPP_SUPPL=\ {$(INCLUDE)}"\ace\Dynamic.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Get_Opt.h"\ {$(INCLUDE)}"\ace\Get_Opt.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ @@ -193,6 +202,8 @@ DEP_CPP_SUPPL=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -286,8 +297,7 @@ DEP_CPP_SUPPL=\ {$(INCLUDE)}"\ace\ws2tcpip.h"\ -"$(INTDIR)\Supplier_Router.obj" : $(SOURCE) $(DEP_CPP_SUPPL) "$(INTDIR)"\ - ".\Peer_Router.cpp" +"$(INTDIR)\Supplier_Router.obj" : $(SOURCE) $(DEP_CPP_SUPPL) "$(INTDIR)" # End Source File @@ -296,6 +306,7 @@ DEP_CPP_SUPPL=\ SOURCE=.\Event_Analyzer.cpp DEP_CPP_EVENT=\ + "..\..\..\ace\config-win32.h"\ ".\Event_Analyzer.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ @@ -303,6 +314,10 @@ DEP_CPP_EVENT=\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Containers.cpp"\ @@ -310,10 +325,15 @@ DEP_CPP_EVENT=\ {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -345,6 +365,8 @@ DEP_CPP_EVENT=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -430,6 +452,7 @@ DEP_CPP_EVENT=\ SOURCE=.\event_server.cpp DEP_CPP_EVENT_=\ + "..\..\..\ace\config-win32.h"\ ".\Consumer_Router.h"\ ".\Event_Analyzer.h"\ ".\Options.h"\ @@ -446,6 +469,10 @@ DEP_CPP_EVENT_=\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Containers.cpp"\ @@ -455,6 +482,9 @@ DEP_CPP_EVENT_=\ {$(INCLUDE)}"\ace\Dynamic.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Get_Opt.h"\ {$(INCLUDE)}"\ace\Get_Opt.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ @@ -494,6 +524,8 @@ DEP_CPP_EVENT_=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -589,8 +621,7 @@ DEP_CPP_EVENT_=\ {$(INCLUDE)}"\ace\ws2tcpip.h"\ -"$(INTDIR)\event_server.obj" : $(SOURCE) $(DEP_CPP_EVENT_) "$(INTDIR)"\ - ".\Peer_Router.cpp" +"$(INTDIR)\event_server.obj" : $(SOURCE) $(DEP_CPP_EVENT_) "$(INTDIR)" # End Source File @@ -599,10 +630,15 @@ DEP_CPP_EVENT_=\ SOURCE=.\Options.cpp DEP_CPP_OPTIO=\ + "..\..\..\ace\config-win32.h"\ ".\Options.h"\ ".\Options.i"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ @@ -615,6 +651,8 @@ DEP_CPP_OPTIO=\ {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ {$(INCLUDE)}"\ace\Log_Record.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Profile_Timer.h"\ @@ -647,8 +685,10 @@ DEP_CPP_OPTIO=\ SOURCE=.\Peer_Router.cpp DEP_CPP_PEER_=\ + "..\..\..\ace\config-win32.h"\ ".\Options.h"\ ".\Options.i"\ + ".\Peer_Router.cpp"\ ".\Peer_Router.h"\ {$(INCLUDE)}"\ace\Acceptor.cpp"\ {$(INCLUDE)}"\ace\Acceptor.h"\ @@ -659,6 +699,10 @@ DEP_CPP_PEER_=\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Containers.cpp"\ @@ -668,6 +712,9 @@ DEP_CPP_PEER_=\ {$(INCLUDE)}"\ace\Dynamic.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Get_Opt.h"\ {$(INCLUDE)}"\ace\Get_Opt.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ @@ -707,6 +754,8 @@ DEP_CPP_PEER_=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -800,7 +849,8 @@ DEP_CPP_PEER_=\ {$(INCLUDE)}"\ace\ws2tcpip.h"\ -"$(INTDIR)\Peer_Router.obj" : $(SOURCE) $(DEP_CPP_PEER_) "$(INTDIR)" +"$(INTDIR)\Peer_Router.obj" : $(SOURCE) $(DEP_CPP_PEER_) "$(INTDIR)"\ + ".\Peer_Router.cpp" # End Source File @@ -809,6 +859,7 @@ DEP_CPP_PEER_=\ SOURCE=.\Consumer_Router.cpp DEP_CPP_CONSU=\ + "..\..\..\ace\config-win32.h"\ ".\Consumer_Router.h"\ ".\Options.h"\ ".\Options.i"\ @@ -823,6 +874,10 @@ DEP_CPP_CONSU=\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Containers.cpp"\ @@ -832,6 +887,9 @@ DEP_CPP_CONSU=\ {$(INCLUDE)}"\ace\Dynamic.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Get_Opt.h"\ {$(INCLUDE)}"\ace\Get_Opt.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ @@ -871,6 +929,8 @@ DEP_CPP_CONSU=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ diff --git a/examples/ASX/UPIPE_Event_Server/UPIPE_Event_Server.mdp b/examples/ASX/UPIPE_Event_Server/UPIPE_Event_Server.mdp index d07cbed02f2..5fe4dad98ec 100644 Binary files a/examples/ASX/UPIPE_Event_Server/UPIPE_Event_Server.mdp and b/examples/ASX/UPIPE_Event_Server/UPIPE_Event_Server.mdp differ diff --git a/examples/Connection/blocking/SPIPE.mak b/examples/Connection/blocking/SPIPE.mak index 8f4ccb18297..fcb214d02c4 100644 --- a/examples/Connection/blocking/SPIPE.mak +++ b/examples/Connection/blocking/SPIPE.mak @@ -31,8 +31,9 @@ NULL=nul !ENDIF ################################################################################ # Begin Project -CPP=cl.exe +# PROP Target_Last_Scanned "acceptor - Win32 Debug" RSC=rc.exe +CPP=cl.exe !IF "$(CFG)" == "connector - Win32 Debug" @@ -67,7 +68,7 @@ CLEAN : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /YX /c CPP_OBJS=.\Debug/ CPP_SBRS=.\. # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -80,8 +81,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/connector.pdb" /debug /machine:I386\ @@ -128,7 +129,7 @@ CLEAN : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /YX /c CPP_OBJS=.\Debug/ CPP_SBRS=.\. # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -141,8 +142,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/acceptor.pdb" /debug /machine:I386\ @@ -159,7 +160,8 @@ LINK32_OBJS= \ !ENDIF CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ - /Fp"$(INTDIR)/connector.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c + /D "UNICODE" /Fp"$(INTDIR)/connector.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/"\ + /c .c{$(CPP_OBJS)}.obj: $(CPP) $(CPP_PROJ) $< @@ -188,22 +190,39 @@ CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ SOURCE=.\test_spipe_connector.cpp DEP_CPP_TEST_=\ + "..\..\..\ace\config-win32.h"\ ".\SPIPE-connector.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Asynch_IO.h"\ + {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Connector.cpp"\ {$(INCLUDE)}"\ace\Connector.h"\ {$(INCLUDE)}"\ace\Connector.i"\ + {$(INCLUDE)}"\ace\Containers.cpp"\ + {$(INCLUDE)}"\ace\Containers.h"\ + {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Dynamic.h"\ {$(INCLUDE)}"\ace\Dynamic.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -235,6 +254,8 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -249,9 +270,6 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -272,9 +290,6 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\SPIPE_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -306,8 +321,19 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ + {$(INCLUDE)}"\ace\Timer_Heap.h"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ + {$(INCLUDE)}"\ace\Timer_List.h"\ + {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_List_T.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.i"\ + {$(INCLUDE)}"\ace\Timer_Wheel.h"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -323,24 +349,41 @@ DEP_CPP_TEST_=\ SOURCE=".\SPIPE-connector.cpp" DEP_CPP_SPIPE=\ + "..\..\..\ace\config-win32.h"\ ".\SPIPE-connector.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Asynch_IO.h"\ + {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Connector.cpp"\ {$(INCLUDE)}"\ace\Connector.h"\ {$(INCLUDE)}"\ace\Connector.i"\ + {$(INCLUDE)}"\ace\Containers.cpp"\ + {$(INCLUDE)}"\ace\Containers.h"\ + {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Dynamic.h"\ {$(INCLUDE)}"\ace\Dynamic.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Get_Opt.h"\ {$(INCLUDE)}"\ace\Get_Opt.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -372,6 +415,8 @@ DEP_CPP_SPIPE=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -386,9 +431,6 @@ DEP_CPP_SPIPE=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -409,9 +451,6 @@ DEP_CPP_SPIPE=\ {$(INCLUDE)}"\ace\SPIPE_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -443,8 +482,19 @@ DEP_CPP_SPIPE=\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ + {$(INCLUDE)}"\ace\Timer_Heap.h"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ + {$(INCLUDE)}"\ace\Timer_List.h"\ + {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_List_T.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.i"\ + {$(INCLUDE)}"\ace\Timer_Wheel.h"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -465,6 +515,7 @@ DEP_CPP_SPIPE=\ SOURCE=.\test_spipe_acceptor.cpp DEP_CPP_TEST_S=\ + "..\..\..\ace\config-win32.h"\ ".\SPIPE-acceptor.h"\ {$(INCLUDE)}"\ace\Acceptor.cpp"\ {$(INCLUDE)}"\ace\Acceptor.h"\ @@ -473,14 +524,30 @@ DEP_CPP_TEST_S=\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Asynch_IO.h"\ + {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ + {$(INCLUDE)}"\ace\Containers.cpp"\ + {$(INCLUDE)}"\ace\Containers.h"\ + {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Dynamic.h"\ {$(INCLUDE)}"\ace\Dynamic.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -512,6 +579,8 @@ DEP_CPP_TEST_S=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -526,9 +595,6 @@ DEP_CPP_TEST_S=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -548,9 +614,6 @@ DEP_CPP_TEST_S=\ {$(INCLUDE)}"\ace\SPIPE_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -582,8 +645,19 @@ DEP_CPP_TEST_S=\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ + {$(INCLUDE)}"\ace\Timer_Heap.h"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ + {$(INCLUDE)}"\ace\Timer_List.h"\ + {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_List_T.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.i"\ + {$(INCLUDE)}"\ace\Timer_Wheel.h"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -599,6 +673,7 @@ DEP_CPP_TEST_S=\ SOURCE=".\SPIPE-acceptor.cpp" DEP_CPP_SPIPE_=\ + "..\..\..\ace\config-win32.h"\ ".\SPIPE-acceptor.h"\ {$(INCLUDE)}"\ace\Acceptor.cpp"\ {$(INCLUDE)}"\ace\Acceptor.h"\ @@ -609,16 +684,30 @@ DEP_CPP_SPIPE_=\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ + {$(INCLUDE)}"\ace\Containers.cpp"\ + {$(INCLUDE)}"\ace\Containers.h"\ + {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Dynamic.h"\ {$(INCLUDE)}"\ace\Dynamic.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Get_Opt.h"\ {$(INCLUDE)}"\ace\Get_Opt.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -650,6 +739,8 @@ DEP_CPP_SPIPE_=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -664,9 +755,6 @@ DEP_CPP_SPIPE_=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -686,9 +774,6 @@ DEP_CPP_SPIPE_=\ {$(INCLUDE)}"\ace\SPIPE_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -720,8 +805,19 @@ DEP_CPP_SPIPE_=\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ + {$(INCLUDE)}"\ace\Timer_Heap.h"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ + {$(INCLUDE)}"\ace\Timer_List.h"\ + {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_List_T.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.i"\ + {$(INCLUDE)}"\ace\Timer_Wheel.h"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ diff --git a/examples/Connection/blocking/SPIPE.mdp b/examples/Connection/blocking/SPIPE.mdp index d6b4a9d48f0..cf90e895b58 100644 Binary files a/examples/Connection/blocking/SPIPE.mdp and b/examples/Connection/blocking/SPIPE.mdp differ diff --git a/examples/Connection/non_blocking/non_blocking.mak b/examples/Connection/non_blocking/non_blocking.mak index 1b523083d6d..b6c56ebfd35 100644 --- a/examples/Connection/non_blocking/non_blocking.mak +++ b/examples/Connection/non_blocking/non_blocking.mak @@ -66,6 +66,24 @@ CLEAN : "$(INTDIR)" : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" +"$(OUTDIR)" : + +"$(INTDIR)" : + +"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + +.c{$(CPP_OBJS)}.obj: + +.c{$(CPP_SBRS)}.sbr: + +.cpp{$(CPP_OBJS)}.obj: + +.cpp{$(CPP_SBRS)}.sbr: + +.cxx{$(CPP_OBJS)}.obj: + +.cxx{$(CPP_SBRS)}.sbr: + # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_OBJS=.\Debug/ @@ -80,8 +98,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/client.pdb" /debug /machine:I386 /out:"$(OUTDIR)/client.exe" @@ -126,6 +144,24 @@ CLEAN : "$(INTDIR)" : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" +"$(OUTDIR)" : + +"$(INTDIR)" : + +"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + +.c{$(CPP_OBJS)}.obj: + +.cpp{$(CPP_OBJS)}.obj: + +.cxx{$(CPP_OBJS)}.obj: + +.c{$(CPP_SBRS)}.sbr: + +.cpp{$(CPP_SBRS)}.sbr: + +.cxx{$(CPP_SBRS)}.sbr: + # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_OBJS=.\Debug/ @@ -140,8 +176,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/server.pdb" /debug /machine:I386 /out:"$(OUTDIR)/server.exe" @@ -186,6 +222,7 @@ CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ SOURCE=.\test_sock_connector.cpp DEP_CPP_TEST_=\ + "..\..\..\ace\config-win32.h"\ ".\CPP-connector.cpp"\ ".\CPP-connector.h"\ {$(INCLUDE)}"\ace\ACE.h"\ @@ -194,6 +231,10 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Connector.cpp"\ @@ -206,10 +247,15 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Dynamic.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -241,6 +287,8 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -329,6 +377,7 @@ DEP_CPP_TEST_=\ SOURCE=".\CPP-connector.cpp" DEP_CPP_CPP_C=\ + "..\..\..\ace\config-win32.h"\ ".\CPP-connector.cpp"\ ".\CPP-connector.h"\ {$(INCLUDE)}"\ace\ACE.h"\ @@ -337,6 +386,10 @@ DEP_CPP_CPP_C=\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Connector.cpp"\ @@ -349,10 +402,15 @@ DEP_CPP_CPP_C=\ {$(INCLUDE)}"\ace\Dynamic.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -384,6 +442,8 @@ DEP_CPP_CPP_C=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -475,6 +535,7 @@ DEP_CPP_CPP_C=\ SOURCE=.\test_sock_acceptor.cpp DEP_CPP_TEST_S=\ + "..\..\..\ace\config-win32.h"\ ".\CPP-acceptor.cpp"\ ".\CPP-acceptor.h"\ {$(INCLUDE)}"\ace\Acceptor.cpp"\ @@ -486,6 +547,10 @@ DEP_CPP_TEST_S=\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Containers.cpp"\ @@ -495,10 +560,15 @@ DEP_CPP_TEST_S=\ {$(INCLUDE)}"\ace\Dynamic.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -530,6 +600,8 @@ DEP_CPP_TEST_S=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -618,6 +690,7 @@ DEP_CPP_TEST_S=\ SOURCE=".\CPP-acceptor.cpp" DEP_CPP_CPP_A=\ + "..\..\..\ace\config-win32.h"\ ".\CPP-acceptor.cpp"\ ".\CPP-acceptor.h"\ {$(INCLUDE)}"\ace\Acceptor.cpp"\ @@ -629,6 +702,10 @@ DEP_CPP_CPP_A=\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Containers.cpp"\ @@ -638,10 +715,15 @@ DEP_CPP_CPP_A=\ {$(INCLUDE)}"\ace\Dynamic.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -673,6 +755,8 @@ DEP_CPP_CPP_A=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ diff --git a/examples/Connection/non_blocking/non_blocking.mdp b/examples/Connection/non_blocking/non_blocking.mdp index 74591decafa..7861293ad00 100644 Binary files a/examples/Connection/non_blocking/non_blocking.mdp and b/examples/Connection/non_blocking/non_blocking.mdp differ diff --git a/examples/IPC_SAP/SOCK_SAP/SOCK_SAP.mak b/examples/IPC_SAP/SOCK_SAP/SOCK_SAP.mak index eec2fbd5fcf..6557bfcd68c 100644 --- a/examples/IPC_SAP/SOCK_SAP/SOCK_SAP.mak +++ b/examples/IPC_SAP/SOCK_SAP/SOCK_SAP.mak @@ -38,8 +38,9 @@ NULL=nul !ENDIF ################################################################################ # Begin Project -CPP=cl.exe +# PROP Target_Last_Scanned "CPP_inserver - Win32 Debug" RSC=rc.exe +CPP=cl.exe !IF "$(CFG)" == "C_inclient - Win32 Debug" @@ -86,8 +87,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/C_inclient.pdb" /debug /machine:I386\ @@ -145,8 +146,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/C_inserver.pdb" /debug /machine:I386\ @@ -204,8 +205,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/CPP_inclient.pdb" /debug /machine:I386\ @@ -263,8 +264,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/CPP_inserver.pdb" /debug /machine:I386\ @@ -309,14 +310,20 @@ CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ SOURCE=".\C-inclient.cpp" DEP_CPP_C_INC=\ + "..\..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Log_Msg.h"\ {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ {$(INCLUDE)}"\ace\Log_Record.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\SString.h"\ @@ -340,14 +347,20 @@ DEP_CPP_C_INC=\ SOURCE=".\C-inserver.cpp" DEP_CPP_C_INS=\ + "..\..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Log_Msg.h"\ {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ {$(INCLUDE)}"\ace\Log_Record.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\SString.h"\ @@ -371,10 +384,14 @@ DEP_CPP_C_INS=\ SOURCE=".\CPP-inclient.cpp" DEP_CPP_CPP_I=\ + "..\..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ @@ -385,6 +402,8 @@ DEP_CPP_CPP_I=\ {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ {$(INCLUDE)}"\ace\Log_Record.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\SOCK.h"\ @@ -417,10 +436,14 @@ DEP_CPP_CPP_I=\ SOURCE=".\CPP-inserver.cpp" DEP_CPP_CPP_IN=\ + "..\..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ @@ -433,6 +456,8 @@ DEP_CPP_CPP_IN=\ {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ {$(INCLUDE)}"\ace\Log_Record.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\SOCK.h"\ diff --git a/examples/IPC_SAP/SOCK_SAP/SOCK_SAP.mdp b/examples/IPC_SAP/SOCK_SAP/SOCK_SAP.mdp index 79281028543..35082182248 100644 Binary files a/examples/IPC_SAP/SOCK_SAP/SOCK_SAP.mdp and b/examples/IPC_SAP/SOCK_SAP/SOCK_SAP.mdp differ diff --git a/examples/Log_Msg/Log_Msg.mak b/examples/Log_Msg/Log_Msg.mak index 7c725f81ca9..3aa5b9fd03a 100644 --- a/examples/Log_Msg/Log_Msg.mak +++ b/examples/Log_Msg/Log_Msg.mak @@ -31,6 +31,7 @@ NULL=nul !ENDIF ################################################################################ # Begin Project +# PROP Target_Last_Scanned "Log_Msg - Win32 Debug" RSC=rc.exe CPP=cl.exe @@ -77,8 +78,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ace-r.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"./test_log_msg.exe" -LINK32_FLAGS=ace-r.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"./test_log_msg.exe" +LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\ /pdb:"$(OUTDIR)/test_log_msg.pdb" /machine:I386\ @@ -138,8 +139,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"./test_log_msg.exe" -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"./test_log_msg.exe" +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/test_log_msg.pdb" /debug /machine:I386\ @@ -188,11 +189,31 @@ LINK32_OBJS= \ # Begin Source File SOURCE=.\test_log_msg.cpp -NODEP_CPP_TEST_=\ - ".\ace\OS.h"\ +DEP_CPP_TEST_=\ + "..\..\ace\config-win32.h"\ + {$(INCLUDE)}"\ace\ACE.h"\ + {$(INCLUDE)}"\ace\ACE.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ + {$(INCLUDE)}"\ace\config-win32-common.h"\ + {$(INCLUDE)}"\ace\config.h"\ + {$(INCLUDE)}"\ace\Log_Msg.h"\ + {$(INCLUDE)}"\ace\Log_Priority.h"\ + {$(INCLUDE)}"\ace\Log_Record.h"\ + {$(INCLUDE)}"\ace\Log_Record.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ + {$(INCLUDE)}"\ace\OS.h"\ + {$(INCLUDE)}"\ace\OS.i"\ + {$(INCLUDE)}"\ace\SString.h"\ + {$(INCLUDE)}"\ace\SString.i"\ + {$(INCLUDE)}"\ace\stdcpp.h"\ + {$(INCLUDE)}"\ace\Trace.h"\ + {$(INCLUDE)}"\ace\ws2tcpip.h"\ -"$(INTDIR)\test_log_msg.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\test_log_msg.obj" : $(SOURCE) $(DEP_CPP_TEST_) "$(INTDIR)" # End Source File diff --git a/examples/Log_Msg/Log_Msg.mdp b/examples/Log_Msg/Log_Msg.mdp index a775997e594..993abfab3f5 100644 Binary files a/examples/Log_Msg/Log_Msg.mdp and b/examples/Log_Msg/Log_Msg.mdp differ diff --git a/examples/Logger/Acceptor-server/server_loggerd.mak b/examples/Logger/Acceptor-server/server_loggerd.mak index 8efe0821838..f25484e8258 100644 --- a/examples/Logger/Acceptor-server/server_loggerd.mak +++ b/examples/Logger/Acceptor-server/server_loggerd.mak @@ -31,6 +31,7 @@ NULL=nul !ENDIF ################################################################################ # Begin Project +# PROP Target_Last_Scanned "server_loggerd - Win32 Debug" RSC=rc.exe CPP=cl.exe # PROP BASE Use_MFC 0 @@ -74,8 +75,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/server_loggerd.pdb" /debug /machine:I386\ @@ -119,8 +120,156 @@ CPP_SBRS=.\. # Begin Source File SOURCE=.\server_loggerd.cpp +DEP_CPP_SERVE=\ + "..\..\..\ace\config-win32.h"\ + {$(INCLUDE)}"\ace\Acceptor.cpp"\ + {$(INCLUDE)}"\ace\Acceptor.h"\ + {$(INCLUDE)}"\ace\Acceptor.i"\ + {$(INCLUDE)}"\ace\ACE.h"\ + {$(INCLUDE)}"\ace\ACE.i"\ + {$(INCLUDE)}"\ace\Addr.h"\ + {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Asynch_IO.h"\ + {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ + {$(INCLUDE)}"\ace\config-win32-common.h"\ + {$(INCLUDE)}"\ace\config.h"\ + {$(INCLUDE)}"\ace\Containers.cpp"\ + {$(INCLUDE)}"\ace\Containers.h"\ + {$(INCLUDE)}"\ace\Containers.i"\ + {$(INCLUDE)}"\ace\Dynamic.h"\ + {$(INCLUDE)}"\ace\Dynamic.i"\ + {$(INCLUDE)}"\ace\Event_Handler.h"\ + {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ + {$(INCLUDE)}"\ace\Get_Opt.h"\ + {$(INCLUDE)}"\ace\Get_Opt.i"\ + {$(INCLUDE)}"\ace\Handle_Set.h"\ + {$(INCLUDE)}"\ace\Handle_Set.i"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ + {$(INCLUDE)}"\ace\INET_Addr.h"\ + {$(INCLUDE)}"\ace\INET_Addr.i"\ + {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ + {$(INCLUDE)}"\ace\IPC_SAP.h"\ + {$(INCLUDE)}"\ace\IPC_SAP.i"\ + {$(INCLUDE)}"\ace\Local_Tokens.h"\ + {$(INCLUDE)}"\ace\Local_Tokens.i"\ + {$(INCLUDE)}"\ace\Log_Msg.h"\ + {$(INCLUDE)}"\ace\Log_Priority.h"\ + {$(INCLUDE)}"\ace\Log_Record.h"\ + {$(INCLUDE)}"\ace\Log_Record.i"\ + {$(INCLUDE)}"\ace\Malloc.h"\ + {$(INCLUDE)}"\ace\Malloc.i"\ + {$(INCLUDE)}"\ace\Malloc_T.cpp"\ + {$(INCLUDE)}"\ace\Malloc_T.h"\ + {$(INCLUDE)}"\ace\Malloc_T.i"\ + {$(INCLUDE)}"\ace\Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Map_Manager.h"\ + {$(INCLUDE)}"\ace\Map_Manager.i"\ + {$(INCLUDE)}"\ace\Mem_Map.h"\ + {$(INCLUDE)}"\ace\Mem_Map.i"\ + {$(INCLUDE)}"\ace\Memory_Pool.h"\ + {$(INCLUDE)}"\ace\Memory_Pool.i"\ + {$(INCLUDE)}"\ace\Message_Block.h"\ + {$(INCLUDE)}"\ace\Message_Block.i"\ + {$(INCLUDE)}"\ace\Message_Queue.cpp"\ + {$(INCLUDE)}"\ace\Message_Queue.h"\ + {$(INCLUDE)}"\ace\Message_Queue.i"\ + {$(INCLUDE)}"\ace\Module.cpp"\ + {$(INCLUDE)}"\ace\Module.h"\ + {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ + {$(INCLUDE)}"\ace\OS.h"\ + {$(INCLUDE)}"\ace\OS.i"\ + {$(INCLUDE)}"\ace\Pipe.h"\ + {$(INCLUDE)}"\ace\Pipe.i"\ + {$(INCLUDE)}"\ace\Proactor.h"\ + {$(INCLUDE)}"\ace\Proactor.i"\ + {$(INCLUDE)}"\ace\Reactor.h"\ + {$(INCLUDE)}"\ace\Reactor.i"\ + {$(INCLUDE)}"\ace\ReactorEx.h"\ + {$(INCLUDE)}"\ace\ReactorEx.i"\ + {$(INCLUDE)}"\ace\Service_Config.h"\ + {$(INCLUDE)}"\ace\Service_Config.i"\ + {$(INCLUDE)}"\ace\Service_Object.h"\ + {$(INCLUDE)}"\ace\Service_Object.i"\ + {$(INCLUDE)}"\ace\Shared_Object.h"\ + {$(INCLUDE)}"\ace\Shared_Object.i"\ + {$(INCLUDE)}"\ace\Signal.h"\ + {$(INCLUDE)}"\ace\Signal.i"\ + {$(INCLUDE)}"\ace\Singleton.cpp"\ + {$(INCLUDE)}"\ace\Singleton.h"\ + {$(INCLUDE)}"\ace\Singleton.i"\ + {$(INCLUDE)}"\ace\SOCK.h"\ + {$(INCLUDE)}"\ace\SOCK.i"\ + {$(INCLUDE)}"\ace\SOCK_Acceptor.h"\ + {$(INCLUDE)}"\ace\SOCK_Acceptor.i"\ + {$(INCLUDE)}"\ace\SOCK_IO.h"\ + {$(INCLUDE)}"\ace\SOCK_IO.i"\ + {$(INCLUDE)}"\ace\SOCK_Stream.h"\ + {$(INCLUDE)}"\ace\SOCK_Stream.i"\ + {$(INCLUDE)}"\ace\SString.h"\ + {$(INCLUDE)}"\ace\SString.i"\ + {$(INCLUDE)}"\ace\stdcpp.h"\ + {$(INCLUDE)}"\ace\Strategies.h"\ + {$(INCLUDE)}"\ace\Strategies_T.cpp"\ + {$(INCLUDE)}"\ace\Strategies_T.h"\ + {$(INCLUDE)}"\ace\Stream_Modules.cpp"\ + {$(INCLUDE)}"\ace\Stream_Modules.h"\ + {$(INCLUDE)}"\ace\Stream_Modules.i"\ + {$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\ + {$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\ + {$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\ + {$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\ + {$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\ + {$(INCLUDE)}"\ace\Svc_Handler.cpp"\ + {$(INCLUDE)}"\ace\Svc_Handler.h"\ + {$(INCLUDE)}"\ace\Svc_Handler.i"\ + {$(INCLUDE)}"\ace\Synch.h"\ + {$(INCLUDE)}"\ace\Synch.i"\ + {$(INCLUDE)}"\ace\Synch_Options.h"\ + {$(INCLUDE)}"\ace\Synch_T.cpp"\ + {$(INCLUDE)}"\ace\Synch_T.h"\ + {$(INCLUDE)}"\ace\Synch_T.i"\ + {$(INCLUDE)}"\ace\Task.h"\ + {$(INCLUDE)}"\ace\Task.i"\ + {$(INCLUDE)}"\ace\Task_T.cpp"\ + {$(INCLUDE)}"\ace\Task_T.h"\ + {$(INCLUDE)}"\ace\Task_T.i"\ + {$(INCLUDE)}"\ace\Thread.h"\ + {$(INCLUDE)}"\ace\Thread.i"\ + {$(INCLUDE)}"\ace\Thread_Manager.h"\ + {$(INCLUDE)}"\ace\Thread_Manager.i"\ + {$(INCLUDE)}"\ace\Time_Value.h"\ + {$(INCLUDE)}"\ace\Timer_Heap.h"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ + {$(INCLUDE)}"\ace\Timer_List.h"\ + {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_List_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.i"\ + {$(INCLUDE)}"\ace\Timer_Wheel.h"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ + {$(INCLUDE)}"\ace\Token.h"\ + {$(INCLUDE)}"\ace\Token.i"\ + {$(INCLUDE)}"\ace\Trace.h"\ + {$(INCLUDE)}"\ace\ws2tcpip.h"\ + -"$(INTDIR)\server_loggerd.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\server_loggerd.obj" : $(SOURCE) $(DEP_CPP_SERVE) "$(INTDIR)" # End Source File diff --git a/examples/Logger/Acceptor-server/server_loggerd.mdp b/examples/Logger/Acceptor-server/server_loggerd.mdp index f9a3f2dcead..7ae4f628d61 100644 Binary files a/examples/Logger/Acceptor-server/server_loggerd.mdp and b/examples/Logger/Acceptor-server/server_loggerd.mdp differ diff --git a/examples/Logger/client/client.mak b/examples/Logger/client/client.mak index cd2381ce974..2dffb9bb1fd 100644 --- a/examples/Logger/client/client.mak +++ b/examples/Logger/client/client.mak @@ -29,8 +29,9 @@ NULL=nul !ENDIF ################################################################################ # Begin Project -CPP=cl.exe +# PROP Target_Last_Scanned "client - Win32 Debug" RSC=rc.exe +CPP=cl.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "Debug" @@ -72,8 +73,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/client.pdb" /debug /machine:I386 /out:"$(OUTDIR)/client.exe" @@ -117,10 +118,14 @@ CPP_SBRS=.\. SOURCE=.\logging_app.cpp DEP_CPP_LOGGI=\ + "..\..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ @@ -131,6 +136,8 @@ DEP_CPP_LOGGI=\ {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ {$(INCLUDE)}"\ace\Log_Record.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\SOCK.h"\ diff --git a/examples/Logger/client/client.mdp b/examples/Logger/client/client.mdp index b304ecea1ac..e3b2541f801 100644 Binary files a/examples/Logger/client/client.mdp and b/examples/Logger/client/client.mdp differ diff --git a/examples/Logger/simple-server/server_loggerd.mak b/examples/Logger/simple-server/server_loggerd.mak index 93ec81c11b1..dce1b5042b8 100644 --- a/examples/Logger/simple-server/server_loggerd.mak +++ b/examples/Logger/simple-server/server_loggerd.mak @@ -31,8 +31,9 @@ NULL=nul !ENDIF ################################################################################ # Begin Project -CPP=cl.exe +# PROP Target_Last_Scanned "server_loggerd - Win32 Debug" RSC=rc.exe +CPP=cl.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "Debug" @@ -76,8 +77,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/server_loggerd.pdb" /debug /machine:I386\ @@ -124,20 +125,37 @@ CPP_SBRS=.\. SOURCE=.\server_loggerd.cpp DEP_CPP_SERVE=\ + "..\..\..\ace\config-win32.h"\ ".\Logging_Acceptor.h"\ ".\Reactor_Singleton.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Asynch_IO.h"\ + {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ + {$(INCLUDE)}"\ace\Containers.cpp"\ + {$(INCLUDE)}"\ace\Containers.h"\ + {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Get_Opt.h"\ {$(INCLUDE)}"\ace\Get_Opt.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -166,6 +184,8 @@ DEP_CPP_SERVE=\ {$(INCLUDE)}"\ace\Message_Queue.cpp"\ {$(INCLUDE)}"\ace\Message_Queue.h"\ {$(INCLUDE)}"\ace\Message_Queue.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -180,9 +200,6 @@ DEP_CPP_SERVE=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -200,9 +217,6 @@ DEP_CPP_SERVE=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -223,8 +237,19 @@ DEP_CPP_SERVE=\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ + {$(INCLUDE)}"\ace\Timer_Heap.h"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ + {$(INCLUDE)}"\ace\Timer_List.h"\ + {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_List_T.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.i"\ + {$(INCLUDE)}"\ace\Timer_Wheel.h"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -240,18 +265,35 @@ DEP_CPP_SERVE=\ SOURCE=.\Logging_Handler.cpp DEP_CPP_LOGGI=\ + "..\..\..\ace\config-win32.h"\ ".\Logging_Handler.h"\ ".\Reactor_Singleton.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Asynch_IO.h"\ + {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ + {$(INCLUDE)}"\ace\Containers.cpp"\ + {$(INCLUDE)}"\ace\Containers.h"\ + {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -280,6 +322,8 @@ DEP_CPP_LOGGI=\ {$(INCLUDE)}"\ace\Message_Queue.cpp"\ {$(INCLUDE)}"\ace\Message_Queue.h"\ {$(INCLUDE)}"\ace\Message_Queue.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -294,9 +338,6 @@ DEP_CPP_LOGGI=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -312,9 +353,6 @@ DEP_CPP_LOGGI=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -335,8 +373,19 @@ DEP_CPP_LOGGI=\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ + {$(INCLUDE)}"\ace\Timer_Heap.h"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ + {$(INCLUDE)}"\ace\Timer_List.h"\ + {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_List_T.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.i"\ + {$(INCLUDE)}"\ace\Timer_Wheel.h"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -352,6 +401,7 @@ DEP_CPP_LOGGI=\ SOURCE=.\Logging_Acceptor.cpp DEP_CPP_LOGGIN=\ + "..\..\..\ace\config-win32.h"\ ".\Logging_Acceptor.h"\ ".\Logging_Handler.h"\ ".\Reactor_Singleton.h"\ @@ -359,12 +409,28 @@ DEP_CPP_LOGGIN=\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Asynch_IO.h"\ + {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ + {$(INCLUDE)}"\ace\Containers.cpp"\ + {$(INCLUDE)}"\ace\Containers.h"\ + {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -393,6 +459,8 @@ DEP_CPP_LOGGIN=\ {$(INCLUDE)}"\ace\Message_Queue.cpp"\ {$(INCLUDE)}"\ace\Message_Queue.h"\ {$(INCLUDE)}"\ace\Message_Queue.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -407,9 +475,6 @@ DEP_CPP_LOGGIN=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -427,9 +492,6 @@ DEP_CPP_LOGGIN=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -450,8 +512,19 @@ DEP_CPP_LOGGIN=\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ + {$(INCLUDE)}"\ace\Timer_Heap.h"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ + {$(INCLUDE)}"\ace\Timer_List.h"\ + {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_List_T.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.i"\ + {$(INCLUDE)}"\ace\Timer_Wheel.h"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ diff --git a/examples/Logger/simple-server/server_loggerd.mdp b/examples/Logger/simple-server/server_loggerd.mdp index 68a57289577..940375f5cf4 100644 Binary files a/examples/Logger/simple-server/server_loggerd.mdp and b/examples/Logger/simple-server/server_loggerd.mdp differ diff --git a/examples/Naming/Naming.mak b/examples/Naming/Naming.mak index b55c09c5661..c8612df69ee 100644 --- a/examples/Naming/Naming.mak +++ b/examples/Naming/Naming.mak @@ -34,8 +34,9 @@ NULL=nul !ENDIF ################################################################################ # Begin Project -CPP=cl.exe +# PROP Target_Last_Scanned "non_existent - Win32 Debug" RSC=rc.exe +CPP=cl.exe !IF "$(CFG)" == "writers - Win32 Debug" @@ -82,8 +83,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/writers.pdb" /debug /machine:I386 /out:"$(OUTDIR)/writers.exe" @@ -140,8 +141,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/multiple_contexts.pdb" /debug /machine:I386\ @@ -199,8 +200,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/non_existent.pdb" /debug /machine:I386\ @@ -245,12 +246,17 @@ CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ SOURCE=.\test_writers.cpp DEP_CPP_TEST_=\ + "..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Containers.cpp"\ @@ -258,10 +264,15 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -294,6 +305,8 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Name_Request_Reply.h"\ {$(INCLUDE)}"\ace\Name_Space.h"\ {$(INCLUDE)}"\ace\Naming_Context.h"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -375,12 +388,17 @@ DEP_CPP_TEST_=\ SOURCE=.\test_multiple_contexts.cpp DEP_CPP_TEST_M=\ + "..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Containers.cpp"\ @@ -388,10 +406,15 @@ DEP_CPP_TEST_M=\ {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -424,6 +447,8 @@ DEP_CPP_TEST_M=\ {$(INCLUDE)}"\ace\Name_Request_Reply.h"\ {$(INCLUDE)}"\ace\Name_Space.h"\ {$(INCLUDE)}"\ace\Naming_Context.h"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -506,12 +531,17 @@ DEP_CPP_TEST_M=\ SOURCE=.\test_non_existent.cpp DEP_CPP_TEST_N=\ + "..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Containers.cpp"\ @@ -519,10 +549,15 @@ DEP_CPP_TEST_N=\ {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -555,6 +590,8 @@ DEP_CPP_TEST_N=\ {$(INCLUDE)}"\ace\Name_Request_Reply.h"\ {$(INCLUDE)}"\ace\Name_Space.h"\ {$(INCLUDE)}"\ace\Naming_Context.h"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ diff --git a/examples/Naming/Naming.mdp b/examples/Naming/Naming.mdp index 6a6c1f211f5..230cd3b4f0f 100644 Binary files a/examples/Naming/Naming.mdp and b/examples/Naming/Naming.mdp differ diff --git a/examples/OS/Process/Process.mak b/examples/OS/Process/Process.mak index a24b66f9443..d787ff51cf2 100644 --- a/examples/OS/Process/Process.mak +++ b/examples/OS/Process/Process.mak @@ -32,8 +32,8 @@ NULL=nul ################################################################################ # Begin Project # PROP Target_Last_Scanned "Process - Win32 Debug" -CPP=cl.exe RSC=rc.exe +CPP=cl.exe !IF "$(CFG)" == "Process - Win32 Release" @@ -60,8 +60,8 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c -CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\ +# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c +CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/Process.pch" /YX /Fo"$(INTDIR)/" /c CPP_OBJS=.\Release/ CPP_SBRS=.\. @@ -117,8 +117,8 @@ CLEAN : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c -CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/Process.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c CPP_OBJS=.\Debug/ CPP_SBRS=.\. @@ -132,9 +132,9 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ace.lib /nologo /subsystem:console /debug /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib aced.lib /nologo /subsystem:console /debug /machine:I386 LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ - advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ace.lib /nologo\ + advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib aced.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/Process.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/Process.exe" LINK32_OBJS= \ @@ -185,18 +185,28 @@ SOURCE=.\process.cpp !IF "$(CFG)" == "Process - Win32 Release" DEP_CPP_PROCE=\ + "..\..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Get_Opt.h"\ {$(INCLUDE)}"\ace\Get_Opt.i"\ {$(INCLUDE)}"\ace\Log_Msg.h"\ + {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ + {$(INCLUDE)}"\ace\Log_Record.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Process.h"\ {$(INCLUDE)}"\ace\Process.i"\ + {$(INCLUDE)}"\ace\SString.h"\ + {$(INCLUDE)}"\ace\SString.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Trace.h"\ {$(INCLUDE)}"\ace\ws2tcpip.h"\ @@ -208,8 +218,12 @@ DEP_CPP_PROCE=\ !ELSEIF "$(CFG)" == "Process - Win32 Debug" DEP_CPP_PROCE=\ + "..\..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Get_Opt.h"\ @@ -218,6 +232,8 @@ DEP_CPP_PROCE=\ {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ {$(INCLUDE)}"\ace\Log_Record.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Process.h"\ diff --git a/examples/OS/Process/Process.mdp b/examples/OS/Process/Process.mdp index 2c2d83e2558..f42ecb286ce 100644 Binary files a/examples/OS/Process/Process.mdp and b/examples/OS/Process/Process.mdp differ diff --git a/examples/Reactor/Misc/Misc.mak b/examples/Reactor/Misc/Misc.mak index a95daad49ea..81e57af927c 100644 --- a/examples/Reactor/Misc/Misc.mak +++ b/examples/Reactor/Misc/Misc.mak @@ -71,8 +71,8 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ - /Fp"$(INTDIR)/timer_queue.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -83,8 +83,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/timer_queue.pdb" /debug /machine:I386\ @@ -130,8 +130,8 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ - /Fp"$(INTDIR)/notification.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -142,8 +142,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/notification.pdb" /debug /machine:I386\ @@ -189,8 +189,8 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ - /Fp"$(INTDIR)/reactors.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -201,8 +201,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/reactors.pdb" /debug /machine:I386\ @@ -217,8 +217,8 @@ LINK32_OBJS= \ !ENDIF -CPP_OBJS=.\Debug/ -CPP_SBRS=.\. +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ + /Fp"$(INTDIR)/timer_queue.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c .c{$(CPP_OBJS)}.obj: $(CPP) $(CPP_PROJ) $< @@ -249,6 +249,7 @@ SOURCE=.\test_timer_queue.cpp DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ {$(INCLUDE)}"\ace\Auto_Ptr.h"\ {$(INCLUDE)}"\ace\Auto_Ptr.i"\ @@ -267,8 +268,21 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ {$(INCLUDE)}"\ace\Log_Record.i"\ + {$(INCLUDE)}"\ace\Malloc.h"\ + {$(INCLUDE)}"\ace\Malloc.i"\ + {$(INCLUDE)}"\ace\Malloc_T.cpp"\ + {$(INCLUDE)}"\ace\Malloc_T.h"\ + {$(INCLUDE)}"\ace\Malloc_T.i"\ + {$(INCLUDE)}"\ace\Mem_Map.h"\ + {$(INCLUDE)}"\ace\Mem_Map.i"\ + {$(INCLUDE)}"\ace\Memory_Pool.h"\ + {$(INCLUDE)}"\ace\Memory_Pool.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ + {$(INCLUDE)}"\ace\Signal.h"\ + {$(INCLUDE)}"\ace\Signal.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ @@ -318,6 +332,7 @@ DEP_CPP_NOTIF=\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ {$(INCLUDE)}"\ace\Auto_Ptr.h"\ {$(INCLUDE)}"\ace\Auto_Ptr.i"\ @@ -366,6 +381,8 @@ DEP_CPP_NOTIF=\ {$(INCLUDE)}"\ace\Message_Queue.cpp"\ {$(INCLUDE)}"\ace\Message_Queue.h"\ {$(INCLUDE)}"\ace\Message_Queue.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -451,6 +468,7 @@ DEP_CPP_TEST_R=\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ {$(INCLUDE)}"\ace\Auto_Ptr.h"\ {$(INCLUDE)}"\ace\Auto_Ptr.i"\ @@ -502,6 +520,8 @@ DEP_CPP_TEST_R=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ diff --git a/examples/Reactor/Misc/Misc.mdp b/examples/Reactor/Misc/Misc.mdp index 7726e79a68b..779978af8ff 100644 Binary files a/examples/Reactor/Misc/Misc.mdp and b/examples/Reactor/Misc/Misc.mdp differ diff --git a/examples/Reactor/Ntalker/ntalker.mak b/examples/Reactor/Ntalker/ntalker.mak index dbf071441a3..095311ad794 100644 --- a/examples/Reactor/Ntalker/ntalker.mak +++ b/examples/Reactor/Ntalker/ntalker.mak @@ -69,8 +69,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/ntalker.pdb" /debug /machine:I386 /out:"$(OUTDIR)/ntalker.exe" @@ -115,19 +115,35 @@ CPP_SBRS=.\. SOURCE=.\ntalker.cpp DEP_CPP_NTALK=\ + "..\..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Asynch_IO.h"\ + {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ + {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ + {$(INCLUDE)}"\ace\Containers.cpp"\ + {$(INCLUDE)}"\ace\Containers.h"\ + {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Get_Opt.h"\ {$(INCLUDE)}"\ace\Get_Opt.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -156,6 +172,8 @@ DEP_CPP_NTALK=\ {$(INCLUDE)}"\ace\Message_Queue.cpp"\ {$(INCLUDE)}"\ace\Message_Queue.h"\ {$(INCLUDE)}"\ace\Message_Queue.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -170,9 +188,6 @@ DEP_CPP_NTALK=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -189,9 +204,6 @@ DEP_CPP_NTALK=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -212,8 +224,19 @@ DEP_CPP_NTALK=\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ + {$(INCLUDE)}"\ace\Timer_Heap.h"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ + {$(INCLUDE)}"\ace\Timer_List.h"\ + {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_List_T.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.i"\ + {$(INCLUDE)}"\ace\Timer_Wheel.h"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ diff --git a/examples/Reactor/Ntalker/ntalker.mdp b/examples/Reactor/Ntalker/ntalker.mdp index f901cfbb539..0e66b56d61b 100644 Binary files a/examples/Reactor/Ntalker/ntalker.mdp and b/examples/Reactor/Ntalker/ntalker.mdp differ diff --git a/examples/Reactor/Proactor/test_proactor.mak b/examples/Reactor/Proactor/test_proactor.mak index c67f678775e..e7914c12643 100644 --- a/examples/Reactor/Proactor/test_proactor.mak +++ b/examples/Reactor/Proactor/test_proactor.mak @@ -81,10 +81,10 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ - comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ - odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ +# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib\ + winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\ + uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/test_proactor.pdb" /debug /machine:I386\ /out:"$(OUTDIR)/test_proactor.exe" LINK32_OBJS= \ @@ -140,8 +140,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/test_timeout.pdb" /debug /machine:I386\ @@ -199,8 +199,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/test_multiple_loops.pdb" /debug /machine:I386\ @@ -245,6 +245,7 @@ CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ SOURCE=.\test_proactor.cpp DEP_CPP_TEST_=\ + "..\..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ @@ -254,6 +255,10 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Asynch_Acceptor.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Containers.cpp"\ @@ -270,6 +275,8 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Handle_Set.i"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -298,6 +305,8 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Message_Queue.cpp"\ {$(INCLUDE)}"\ace\Message_Queue.h"\ {$(INCLUDE)}"\ace\Message_Queue.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -348,15 +357,12 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ - {$(INCLUDE)}"\ace\Timer_Hash_T.cpp"\ - {$(INCLUDE)}"\ace\Timer_Hash_T.h"\ {$(INCLUDE)}"\ace\Timer_Heap.h"\ {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ {$(INCLUDE)}"\ace\Timer_List.h"\ {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ {$(INCLUDE)}"\ace\Timer_List_T.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.cpp"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ @@ -384,12 +390,17 @@ DEP_CPP_TEST_=\ SOURCE=.\test_timeout.cpp DEP_CPP_TEST_T=\ + "..\..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Containers.cpp"\ @@ -404,6 +415,8 @@ DEP_CPP_TEST_T=\ {$(INCLUDE)}"\ace\Handle_Set.i"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -435,6 +448,8 @@ DEP_CPP_TEST_T=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -489,15 +504,12 @@ DEP_CPP_TEST_T=\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ - {$(INCLUDE)}"\ace\Timer_Hash_T.cpp"\ - {$(INCLUDE)}"\ace\Timer_Hash_T.h"\ {$(INCLUDE)}"\ace\Timer_Heap.h"\ {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ {$(INCLUDE)}"\ace\Timer_List.h"\ {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ {$(INCLUDE)}"\ace\Timer_List_T.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.cpp"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ @@ -525,12 +537,17 @@ DEP_CPP_TEST_T=\ SOURCE=.\test_multiple_loops.cpp DEP_CPP_TEST_M=\ + "..\..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Containers.cpp"\ @@ -545,6 +562,8 @@ DEP_CPP_TEST_M=\ {$(INCLUDE)}"\ace\Handle_Set.i"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -576,6 +595,8 @@ DEP_CPP_TEST_M=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -630,15 +651,12 @@ DEP_CPP_TEST_M=\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ - {$(INCLUDE)}"\ace\Timer_Hash_T.cpp"\ - {$(INCLUDE)}"\ace\Timer_Hash_T.h"\ {$(INCLUDE)}"\ace\Timer_Heap.h"\ {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ {$(INCLUDE)}"\ace\Timer_List.h"\ {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ {$(INCLUDE)}"\ace\Timer_List_T.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.cpp"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ diff --git a/examples/Reactor/Proactor/test_proactor.mdp b/examples/Reactor/Proactor/test_proactor.mdp index 2ea9026b318..c2b21260a2f 100644 Binary files a/examples/Reactor/Proactor/test_proactor.mdp and b/examples/Reactor/Proactor/test_proactor.mdp differ diff --git a/examples/Reactor/ReactorEx/reactorex.mdp b/examples/Reactor/ReactorEx/reactorex.mdp index 402dd6a5352..f8ec0bf556e 100644 Binary files a/examples/Reactor/ReactorEx/reactorex.mdp and b/examples/Reactor/ReactorEx/reactorex.mdp differ diff --git a/examples/Reactor/WFMO_Reactor/reactorex.mdp b/examples/Reactor/WFMO_Reactor/reactorex.mdp index 402dd6a5352..f8ec0bf556e 100644 Binary files a/examples/Reactor/WFMO_Reactor/reactorex.mdp and b/examples/Reactor/WFMO_Reactor/reactorex.mdp differ diff --git a/examples/Threads/test.mak b/examples/Threads/test.mak index f2d13de07e7..e51c106575b 100644 --- a/examples/Threads/test.mak +++ b/examples/Threads/test.mak @@ -110,6 +110,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/auto_event.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -120,8 +122,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/auto_event.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/auto_event.exe" @@ -165,6 +167,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/barrier1.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -175,8 +179,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/barrier1.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/barrier1.exe" @@ -220,6 +224,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/barrier2.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -230,8 +236,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/barrier2.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/barrier2.exe" @@ -275,6 +281,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/cancel.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -285,8 +293,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/cancel.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/cancel.exe" @@ -330,6 +338,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/future1.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -340,8 +350,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/future1.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/future1.exe" @@ -385,6 +395,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/future2.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -395,8 +407,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/future2.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/future2.exe" @@ -440,6 +452,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/manual_event.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -450,8 +464,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/manual_event.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/manual_event.exe" @@ -495,6 +509,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/process_mutex.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -505,8 +521,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/process_mutex.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/process_mutex.exe" @@ -550,6 +566,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/process_semaphore.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -560,8 +578,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/process_semaphore.pdb"\ /debug /machine:I386 /out:"$(OUTDIR)/process_semaphore.exe" @@ -605,6 +623,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/reader_writer.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -615,8 +635,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/reader_writer.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/reader_writer.exe" @@ -660,6 +680,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/recursive_mutex.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -670,8 +692,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/recursive_mutex.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/recursive_mutex.exe" @@ -715,6 +737,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/task_one.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -725,8 +749,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/task_one.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/task_one.exe" @@ -770,6 +794,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/task_two.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -780,8 +806,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/task_two.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/task_two.exe" @@ -825,6 +851,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/task_three.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -835,8 +863,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/task_three.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/task_three.exe" @@ -880,6 +908,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/task_four.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -890,8 +920,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/task_four.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/task_four.exe" @@ -935,6 +965,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/thread_manager.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -945,8 +977,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/thread_manager.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/thread_manager.exe" @@ -990,6 +1022,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/thread_pool.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -1000,8 +1034,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/thread_pool.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/thread_pool.exe" @@ -1045,6 +1079,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/thread_specific.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -1055,8 +1091,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/thread_specific.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/thread_specific.exe" @@ -1100,6 +1136,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/token.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -1110,8 +1148,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/token.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/token.exe" @@ -1155,6 +1193,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/tss1.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -1165,8 +1205,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/tss1.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/tss1.exe" @@ -1210,6 +1250,8 @@ CLEAN : # ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/tss2.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -1220,8 +1262,8 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ +# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo\ /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/tss2.pdb" /debug\ /machine:I386 /out:"$(OUTDIR)/tss2.exe" @@ -1268,6 +1310,8 @@ CLEAN : # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)/context_switch_time.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c +CPP_OBJS=.\Debug/ +CPP_SBRS=.\. # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -1278,10 +1322,10 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ - comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\ - odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\ +# ADD LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib\ + winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\ + uuid.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/context_switch_time.pdb" /debug /machine:I386\ /out:"$(OUTDIR)/context_switch_time.exe" LINK32_OBJS= \ @@ -1294,9 +1338,6 @@ LINK32_OBJS= \ !ENDIF -CPP_OBJS=.\Debug/ -CPP_SBRS=.\. - .c{$(CPP_OBJS)}.obj: $(CPP) $(CPP_PROJ) $< @@ -1324,13 +1365,20 @@ CPP_SBRS=.\. SOURCE=.\auto_event.cpp DEP_CPP_AUTO_=\ + ".\ace\Dispatcher.h"\ + ".\ace\Dispatcher.i"\ + ".\ace\Set.cpp"\ + ".\ace\Set.h"\ + ".\ace\Set.i"\ + ".\ace\Stack.cpp"\ + ".\ace\Stack.h"\ + ".\ace\Stack.i"\ + ".\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ @@ -1377,9 +1425,6 @@ DEP_CPP_AUTO_=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -1395,9 +1440,6 @@ DEP_CPP_AUTO_=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -1419,7 +1461,6 @@ DEP_CPP_AUTO_=\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -1440,17 +1481,33 @@ DEP_CPP_AUTO_=\ SOURCE=.\barrier1.cpp DEP_CPP_BARRI=\ + "..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Asynch_IO.h"\ + {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ + {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ + {$(INCLUDE)}"\ace\Containers.cpp"\ + {$(INCLUDE)}"\ace\Containers.h"\ + {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -1479,6 +1536,8 @@ DEP_CPP_BARRI=\ {$(INCLUDE)}"\ace\Message_Queue.cpp"\ {$(INCLUDE)}"\ace\Message_Queue.h"\ {$(INCLUDE)}"\ace\Message_Queue.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -1493,9 +1552,6 @@ DEP_CPP_BARRI=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -1508,9 +1564,6 @@ DEP_CPP_BARRI=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -1531,8 +1584,19 @@ DEP_CPP_BARRI=\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ + {$(INCLUDE)}"\ace\Timer_Heap.h"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ + {$(INCLUDE)}"\ace\Timer_List.h"\ + {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_List_T.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.i"\ + {$(INCLUDE)}"\ace\Timer_Wheel.h"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -1553,13 +1617,20 @@ DEP_CPP_BARRI=\ SOURCE=.\barrier2.cpp DEP_CPP_BARRIE=\ + ".\ace\Dispatcher.h"\ + ".\ace\Dispatcher.i"\ + ".\ace\Set.cpp"\ + ".\ace\Set.h"\ + ".\ace\Set.i"\ + ".\ace\Stack.cpp"\ + ".\ace\Stack.h"\ + ".\ace\Stack.i"\ + ".\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ @@ -1609,9 +1680,6 @@ DEP_CPP_BARRIE=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -1624,9 +1692,6 @@ DEP_CPP_BARRIE=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -1656,7 +1721,6 @@ DEP_CPP_BARRIE=\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -1677,13 +1741,20 @@ DEP_CPP_BARRIE=\ SOURCE=.\cancel.cpp DEP_CPP_CANCE=\ + ".\ace\Dispatcher.h"\ + ".\ace\Dispatcher.i"\ + ".\ace\Set.cpp"\ + ".\ace\Set.h"\ + ".\ace\Set.i"\ + ".\ace\Stack.cpp"\ + ".\ace\Stack.h"\ + ".\ace\Stack.i"\ + ".\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ @@ -1730,9 +1801,6 @@ DEP_CPP_CANCE=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -1745,9 +1813,6 @@ DEP_CPP_CANCE=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -1769,7 +1834,6 @@ DEP_CPP_CANCE=\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -1790,6 +1854,15 @@ DEP_CPP_CANCE=\ SOURCE=.\future1.cpp DEP_CPP_FUTUR=\ + ".\ace\Dispatcher.h"\ + ".\ace\Dispatcher.i"\ + ".\ace\Set.cpp"\ + ".\ace\Set.h"\ + ".\ace\Set.i"\ + ".\ace\Stack.cpp"\ + ".\ace\Stack.h"\ + ".\ace\Stack.i"\ + ".\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Activation_Queue.h"\ @@ -1799,8 +1872,6 @@ DEP_CPP_FUTUR=\ {$(INCLUDE)}"\ace\Auto_Ptr.h"\ {$(INCLUDE)}"\ace\Auto_Ptr.i"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ {$(INCLUDE)}"\ace\Future.cpp"\ @@ -1853,9 +1924,6 @@ DEP_CPP_FUTUR=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -1868,9 +1936,6 @@ DEP_CPP_FUTUR=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -1900,7 +1965,6 @@ DEP_CPP_FUTUR=\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -1921,23 +1985,36 @@ DEP_CPP_FUTUR=\ SOURCE=.\future2.cpp DEP_CPP_FUTURE=\ + "..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Activation_Queue.h"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Asynch_IO.h"\ + {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ {$(INCLUDE)}"\ace\Auto_Ptr.h"\ {$(INCLUDE)}"\ace\Auto_Ptr.i"\ + {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ + {$(INCLUDE)}"\ace\Containers.cpp"\ + {$(INCLUDE)}"\ace\Containers.h"\ + {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Future.cpp"\ {$(INCLUDE)}"\ace\Future.h"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -1970,6 +2047,8 @@ DEP_CPP_FUTURE=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -1984,9 +2063,6 @@ DEP_CPP_FUTURE=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -1999,9 +2075,6 @@ DEP_CPP_FUTURE=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -2030,8 +2103,19 @@ DEP_CPP_FUTURE=\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ + {$(INCLUDE)}"\ace\Timer_Heap.h"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ + {$(INCLUDE)}"\ace\Timer_List.h"\ + {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_List_T.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.i"\ + {$(INCLUDE)}"\ace\Timer_Wheel.h"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -2052,17 +2136,33 @@ DEP_CPP_FUTURE=\ SOURCE=.\manual_event.cpp DEP_CPP_MANUA=\ + "..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Asynch_IO.h"\ + {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ + {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ + {$(INCLUDE)}"\ace\Containers.cpp"\ + {$(INCLUDE)}"\ace\Containers.h"\ + {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -2091,6 +2191,8 @@ DEP_CPP_MANUA=\ {$(INCLUDE)}"\ace\Message_Queue.cpp"\ {$(INCLUDE)}"\ace\Message_Queue.h"\ {$(INCLUDE)}"\ace\Message_Queue.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -2105,9 +2207,6 @@ DEP_CPP_MANUA=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -2120,9 +2219,6 @@ DEP_CPP_MANUA=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -2143,8 +2239,19 @@ DEP_CPP_MANUA=\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ + {$(INCLUDE)}"\ace\Timer_Heap.h"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ + {$(INCLUDE)}"\ace\Timer_List.h"\ + {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_List_T.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.i"\ + {$(INCLUDE)}"\ace\Timer_Wheel.h"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -2165,6 +2272,9 @@ DEP_CPP_MANUA=\ SOURCE=.\process_mutex.cpp DEP_CPP_PROCE=\ + ".\ace\Set.cpp"\ + ".\ace\Set.h"\ + ".\ace\Set.i"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\config.h"\ @@ -2176,9 +2286,6 @@ DEP_CPP_PROCE=\ {$(INCLUDE)}"\ace\Log_Record.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Signal.h"\ {$(INCLUDE)}"\ace\Signal.i"\ {$(INCLUDE)}"\ace\SString.h"\ @@ -2213,20 +2320,40 @@ DEP_CPP_PROCE=\ SOURCE=.\process_semaphore.cpp DEP_CPP_PROCES=\ + "..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ + {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ + {$(INCLUDE)}"\ace\Containers.cpp"\ + {$(INCLUDE)}"\ace\Containers.h"\ + {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Log_Msg.h"\ {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ {$(INCLUDE)}"\ace\Log_Record.i"\ + {$(INCLUDE)}"\ace\Malloc.h"\ + {$(INCLUDE)}"\ace\Malloc.i"\ + {$(INCLUDE)}"\ace\Malloc_T.cpp"\ + {$(INCLUDE)}"\ace\Malloc_T.h"\ + {$(INCLUDE)}"\ace\Malloc_T.i"\ + {$(INCLUDE)}"\ace\Mem_Map.h"\ + {$(INCLUDE)}"\ace\Mem_Map.i"\ + {$(INCLUDE)}"\ace\Memory_Pool.h"\ + {$(INCLUDE)}"\ace\Memory_Pool.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Signal.h"\ {$(INCLUDE)}"\ace\Signal.i"\ {$(INCLUDE)}"\ace\SString.h"\ @@ -2261,8 +2388,14 @@ DEP_CPP_PROCES=\ SOURCE=.\reader_writer.cpp DEP_CPP_READE=\ + "..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ + {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ @@ -2272,6 +2405,8 @@ DEP_CPP_READE=\ {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ {$(INCLUDE)}"\ace\Log_Record.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\SString.h"\ @@ -2308,13 +2443,20 @@ DEP_CPP_READE=\ SOURCE=.\recursive_mutex.cpp DEP_CPP_RECUR=\ + ".\ace\Dispatcher.h"\ + ".\ace\Dispatcher.i"\ + ".\ace\Set.cpp"\ + ".\ace\Set.h"\ + ".\ace\Set.i"\ + ".\ace\Stack.cpp"\ + ".\ace\Stack.h"\ + ".\ace\Stack.i"\ + ".\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ {$(INCLUDE)}"\ace\Get_Opt.h"\ @@ -2363,9 +2505,6 @@ DEP_CPP_RECUR=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -2378,9 +2517,6 @@ DEP_CPP_RECUR=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -2402,7 +2538,6 @@ DEP_CPP_RECUR=\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -2423,13 +2558,20 @@ DEP_CPP_RECUR=\ SOURCE=.\task_one.cpp DEP_CPP_TASK_=\ + ".\ace\Dispatcher.h"\ + ".\ace\Dispatcher.i"\ + ".\ace\Set.cpp"\ + ".\ace\Set.h"\ + ".\ace\Set.i"\ + ".\ace\Stack.cpp"\ + ".\ace\Stack.h"\ + ".\ace\Stack.i"\ + ".\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ @@ -2479,9 +2621,6 @@ DEP_CPP_TASK_=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -2494,9 +2633,6 @@ DEP_CPP_TASK_=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -2526,7 +2662,6 @@ DEP_CPP_TASK_=\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -2547,17 +2682,33 @@ DEP_CPP_TASK_=\ SOURCE=.\task_two.cpp DEP_CPP_TASK_T=\ + "..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Asynch_IO.h"\ + {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ + {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ + {$(INCLUDE)}"\ace\Containers.cpp"\ + {$(INCLUDE)}"\ace\Containers.h"\ + {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -2589,6 +2740,8 @@ DEP_CPP_TASK_T=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -2603,9 +2756,6 @@ DEP_CPP_TASK_T=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -2618,9 +2768,6 @@ DEP_CPP_TASK_T=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -2649,8 +2796,19 @@ DEP_CPP_TASK_T=\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ + {$(INCLUDE)}"\ace\Timer_Heap.h"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ + {$(INCLUDE)}"\ace\Timer_List.h"\ + {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_List_T.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.i"\ + {$(INCLUDE)}"\ace\Timer_Wheel.h"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -2671,13 +2829,20 @@ DEP_CPP_TASK_T=\ SOURCE=.\task_three.cpp DEP_CPP_TASK_TH=\ + ".\ace\Dispatcher.h"\ + ".\ace\Dispatcher.i"\ + ".\ace\Set.cpp"\ + ".\ace\Set.h"\ + ".\ace\Set.i"\ + ".\ace\Stack.cpp"\ + ".\ace\Stack.h"\ + ".\ace\Stack.i"\ + ".\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ @@ -2727,9 +2892,6 @@ DEP_CPP_TASK_TH=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -2742,9 +2904,6 @@ DEP_CPP_TASK_TH=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -2774,7 +2933,6 @@ DEP_CPP_TASK_TH=\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -2795,13 +2953,20 @@ DEP_CPP_TASK_TH=\ SOURCE=.\task_four.cpp DEP_CPP_TASK_F=\ + ".\ace\Dispatcher.h"\ + ".\ace\Dispatcher.i"\ + ".\ace\Set.cpp"\ + ".\ace\Set.h"\ + ".\ace\Set.i"\ + ".\ace\Stack.cpp"\ + ".\ace\Stack.h"\ + ".\ace\Stack.i"\ + ".\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ @@ -2851,9 +3016,6 @@ DEP_CPP_TASK_F=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -2866,9 +3028,6 @@ DEP_CPP_TASK_F=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -2898,7 +3057,6 @@ DEP_CPP_TASK_F=\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -2919,13 +3077,20 @@ DEP_CPP_TASK_F=\ SOURCE=.\thread_manager.cpp DEP_CPP_THREA=\ + ".\ace\Dispatcher.h"\ + ".\ace\Dispatcher.i"\ + ".\ace\Set.cpp"\ + ".\ace\Set.h"\ + ".\ace\Set.i"\ + ".\ace\Stack.cpp"\ + ".\ace\Stack.h"\ + ".\ace\Stack.i"\ + ".\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ @@ -2972,9 +3137,6 @@ DEP_CPP_THREA=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -2987,9 +3149,6 @@ DEP_CPP_THREA=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -3011,7 +3170,6 @@ DEP_CPP_THREA=\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -3032,17 +3190,33 @@ DEP_CPP_THREA=\ SOURCE=.\thread_pool.cpp DEP_CPP_THREAD=\ + "..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Asynch_IO.h"\ + {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ + {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ + {$(INCLUDE)}"\ace\Containers.cpp"\ + {$(INCLUDE)}"\ace\Containers.h"\ + {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -3074,6 +3248,8 @@ DEP_CPP_THREAD=\ {$(INCLUDE)}"\ace\Module.cpp"\ {$(INCLUDE)}"\ace\Module.h"\ {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -3088,9 +3264,6 @@ DEP_CPP_THREAD=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -3103,9 +3276,6 @@ DEP_CPP_THREAD=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -3134,8 +3304,19 @@ DEP_CPP_THREAD=\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ + {$(INCLUDE)}"\ace\Timer_Heap.h"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ + {$(INCLUDE)}"\ace\Timer_List.h"\ + {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_List_T.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.i"\ + {$(INCLUDE)}"\ace\Timer_Wheel.h"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -3156,17 +3337,33 @@ DEP_CPP_THREAD=\ SOURCE=.\thread_specific.cpp DEP_CPP_THREAD_=\ + "..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Asynch_IO.h"\ + {$(INCLUDE)}"\ace\Asynch_IO.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ + {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ + {$(INCLUDE)}"\ace\Containers.cpp"\ + {$(INCLUDE)}"\ace\Containers.h"\ + {$(INCLUDE)}"\ace\Containers.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ + {$(INCLUDE)}"\ace\Free_List.cpp"\ + {$(INCLUDE)}"\ace\Free_List.h"\ + {$(INCLUDE)}"\ace\Free_List.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ + {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.h"\ + {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ @@ -3195,6 +3392,8 @@ DEP_CPP_THREAD_=\ {$(INCLUDE)}"\ace\Message_Queue.cpp"\ {$(INCLUDE)}"\ace\Message_Queue.h"\ {$(INCLUDE)}"\ace\Message_Queue.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ {$(INCLUDE)}"\ace\Pipe.h"\ @@ -3209,9 +3408,6 @@ DEP_CPP_THREAD_=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -3224,9 +3420,6 @@ DEP_CPP_THREAD_=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -3247,8 +3440,19 @@ DEP_CPP_THREAD_=\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ + {$(INCLUDE)}"\ace\Timer_Heap.h"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ + {$(INCLUDE)}"\ace\Timer_List.h"\ + {$(INCLUDE)}"\ace\Timer_List_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_List_T.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.h"\ + {$(INCLUDE)}"\ace\Timer_Queue_T.i"\ + {$(INCLUDE)}"\ace\Timer_Wheel.h"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ + {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -3269,13 +3473,20 @@ DEP_CPP_THREAD_=\ SOURCE=.\token.cpp DEP_CPP_TOKEN=\ + ".\ace\Dispatcher.h"\ + ".\ace\Dispatcher.i"\ + ".\ace\Set.cpp"\ + ".\ace\Set.h"\ + ".\ace\Set.i"\ + ".\ace\Stack.cpp"\ + ".\ace\Stack.h"\ + ".\ace\Stack.i"\ + ".\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ @@ -3325,9 +3536,6 @@ DEP_CPP_TOKEN=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -3340,9 +3548,6 @@ DEP_CPP_TOKEN=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -3372,7 +3577,6 @@ DEP_CPP_TOKEN=\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -3393,13 +3597,20 @@ DEP_CPP_TOKEN=\ SOURCE=.\tss1.cpp DEP_CPP_TSS1_=\ + ".\ace\Dispatcher.h"\ + ".\ace\Dispatcher.i"\ + ".\ace\Set.cpp"\ + ".\ace\Set.h"\ + ".\ace\Set.i"\ + ".\ace\Stack.cpp"\ + ".\ace\Stack.h"\ + ".\ace\Stack.i"\ + ".\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ @@ -3449,9 +3660,6 @@ DEP_CPP_TSS1_=\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -3464,9 +3672,6 @@ DEP_CPP_TSS1_=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -3496,7 +3701,6 @@ DEP_CPP_TSS1_=\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -3517,110 +3721,45 @@ DEP_CPP_TSS1_=\ SOURCE=.\tss2.cpp DEP_CPP_TSS2_=\ + "..\..\ace\config-win32.h"\ + ".\TSS_Data.h"\ + ".\TSS_Obj.h"\ + ".\TSS_Task.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ - {$(INCLUDE)}"\ace\Addr.h"\ - {$(INCLUDE)}"\ace\Addr.i"\ + {$(INCLUDE)}"\ace\Atomic_Op.i"\ + {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\ + {$(INCLUDE)}"\ace\Auto_Ptr.h"\ + {$(INCLUDE)}"\ace\Auto_Ptr.i"\ + {$(INCLUDE)}"\ace\config-win32-common.h"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ - {$(INCLUDE)}"\ace\Handle_Set.h"\ - {$(INCLUDE)}"\ace\Handle_Set.i"\ - {$(INCLUDE)}"\ace\INET_Addr.h"\ - {$(INCLUDE)}"\ace\INET_Addr.i"\ - {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ - {$(INCLUDE)}"\ace\IPC_SAP.h"\ - {$(INCLUDE)}"\ace\IPC_SAP.i"\ - {$(INCLUDE)}"\ace\Local_Tokens.h"\ - {$(INCLUDE)}"\ace\Local_Tokens.i"\ {$(INCLUDE)}"\ace\Log_Msg.h"\ {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ {$(INCLUDE)}"\ace\Log_Record.i"\ - {$(INCLUDE)}"\ace\Malloc.h"\ - {$(INCLUDE)}"\ace\Malloc.i"\ - {$(INCLUDE)}"\ace\Malloc_T.cpp"\ - {$(INCLUDE)}"\ace\Malloc_T.h"\ - {$(INCLUDE)}"\ace\Malloc_T.i"\ - {$(INCLUDE)}"\ace\Map_Manager.cpp"\ - {$(INCLUDE)}"\ace\Map_Manager.h"\ - {$(INCLUDE)}"\ace\Map_Manager.i"\ - {$(INCLUDE)}"\ace\Mem_Map.h"\ - {$(INCLUDE)}"\ace\Mem_Map.i"\ - {$(INCLUDE)}"\ace\Memory_Pool.h"\ - {$(INCLUDE)}"\ace\Memory_Pool.i"\ - {$(INCLUDE)}"\ace\Message_Block.h"\ - {$(INCLUDE)}"\ace\Message_Block.i"\ - {$(INCLUDE)}"\ace\Message_Queue.cpp"\ - {$(INCLUDE)}"\ace\Message_Queue.h"\ - {$(INCLUDE)}"\ace\Message_Queue.i"\ - {$(INCLUDE)}"\ace\Module.cpp"\ - {$(INCLUDE)}"\ace\Module.h"\ - {$(INCLUDE)}"\ace\Module.i"\ + {$(INCLUDE)}"\ace\Object_Manager.h"\ + {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ - {$(INCLUDE)}"\ace\Pipe.h"\ - {$(INCLUDE)}"\ace\Pipe.i"\ - {$(INCLUDE)}"\ace\Proactor.h"\ - {$(INCLUDE)}"\ace\Proactor.i"\ - {$(INCLUDE)}"\ace\Reactor.h"\ - {$(INCLUDE)}"\ace\Reactor.i"\ - {$(INCLUDE)}"\ace\ReactorEx.h"\ - {$(INCLUDE)}"\ace\ReactorEx.i"\ - {$(INCLUDE)}"\ace\Service_Config.h"\ - {$(INCLUDE)}"\ace\Service_Config.i"\ - {$(INCLUDE)}"\ace\Service_Object.h"\ - {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ - {$(INCLUDE)}"\ace\Shared_Object.h"\ - {$(INCLUDE)}"\ace\Shared_Object.i"\ - {$(INCLUDE)}"\ace\Signal.h"\ - {$(INCLUDE)}"\ace\Signal.i"\ - {$(INCLUDE)}"\ace\SOCK.h"\ - {$(INCLUDE)}"\ace\SOCK.i"\ - {$(INCLUDE)}"\ace\SOCK_IO.h"\ - {$(INCLUDE)}"\ace\SOCK_IO.i"\ - {$(INCLUDE)}"\ace\SOCK_Stream.h"\ - {$(INCLUDE)}"\ace\SOCK_Stream.i"\ + {$(INCLUDE)}"\ace\Singleton.cpp"\ + {$(INCLUDE)}"\ace\Singleton.h"\ + {$(INCLUDE)}"\ace\Singleton.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ - {$(INCLUDE)}"\ace\Strategies.h"\ - {$(INCLUDE)}"\ace\Strategies_T.cpp"\ - {$(INCLUDE)}"\ace\Strategies_T.h"\ - {$(INCLUDE)}"\ace\Stream_Modules.cpp"\ - {$(INCLUDE)}"\ace\Stream_Modules.h"\ - {$(INCLUDE)}"\ace\Stream_Modules.i"\ {$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\ {$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\ {$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\ {$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\ - {$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\ {$(INCLUDE)}"\ace\Synch.h"\ {$(INCLUDE)}"\ace\Synch.i"\ - {$(INCLUDE)}"\ace\Synch_Options.h"\ {$(INCLUDE)}"\ace\Synch_T.cpp"\ {$(INCLUDE)}"\ace\Synch_T.h"\ {$(INCLUDE)}"\ace\Synch_T.i"\ - {$(INCLUDE)}"\ace\Task.h"\ - {$(INCLUDE)}"\ace\Task.i"\ - {$(INCLUDE)}"\ace\Task_T.cpp"\ - {$(INCLUDE)}"\ace\Task_T.h"\ - {$(INCLUDE)}"\ace\Task_T.i"\ {$(INCLUDE)}"\ace\Thread.h"\ {$(INCLUDE)}"\ace\Thread.i"\ - {$(INCLUDE)}"\ace\Thread_Manager.h"\ - {$(INCLUDE)}"\ace\Thread_Manager.i"\ - {$(INCLUDE)}"\ace\Time_Value.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ @@ -3641,13 +3780,24 @@ DEP_CPP_TSS2_=\ SOURCE=.\context_switch_time.cpp DEP_CPP_CONTE=\ + ".\ace\Dispatcher.h"\ + ".\ace\Dispatcher.i"\ + ".\ace\Scheduling_Params.h"\ + ".\ace\Scheduling_Params.i"\ + ".\ace\Set.cpp"\ + ".\ace\Set.h"\ + ".\ace\Set.i"\ + ".\ace\Stack.cpp"\ + ".\ace\Stack.h"\ + ".\ace\Stack.i"\ + ".\ace\Thread_Priority.h"\ + ".\ace\Thread_Priority.i"\ + ".\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ {$(INCLUDE)}"\ace\Addr.h"\ {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\config.h"\ - {$(INCLUDE)}"\ace\Dispatcher.h"\ - {$(INCLUDE)}"\ace\Dispatcher.i"\ {$(INCLUDE)}"\ace\Event_Handler.h"\ {$(INCLUDE)}"\ace\Event_Handler.i"\ {$(INCLUDE)}"\ace\Get_Opt.h"\ @@ -3697,15 +3847,10 @@ DEP_CPP_CONTE=\ {$(INCLUDE)}"\ace\Reactor.i"\ {$(INCLUDE)}"\ace\ReactorEx.h"\ {$(INCLUDE)}"\ace\ReactorEx.i"\ - {$(INCLUDE)}"\ace\Scheduling_Params.h"\ - {$(INCLUDE)}"\ace\Scheduling_Params.i"\ {$(INCLUDE)}"\ace\Service_Config.h"\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ {$(INCLUDE)}"\ace\Service_Object.i"\ - {$(INCLUDE)}"\ace\Set.cpp"\ - {$(INCLUDE)}"\ace\Set.h"\ - {$(INCLUDE)}"\ace\Set.i"\ {$(INCLUDE)}"\ace\Shared_Object.h"\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ @@ -3718,9 +3863,6 @@ DEP_CPP_CONTE=\ {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ - {$(INCLUDE)}"\ace\Stack.cpp"\ - {$(INCLUDE)}"\ace\Stack.h"\ - {$(INCLUDE)}"\ace\Stack.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ {$(INCLUDE)}"\ace\Strategies.h"\ {$(INCLUDE)}"\ace\Strategies_T.cpp"\ @@ -3748,11 +3890,8 @@ DEP_CPP_CONTE=\ {$(INCLUDE)}"\ace\Thread.i"\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ - {$(INCLUDE)}"\ace\Thread_Priority.h"\ - {$(INCLUDE)}"\ace\Thread_Priority.i"\ {$(INCLUDE)}"\ace\Time_Value.h"\ {$(INCLUDE)}"\ace\Timer_Queue.h"\ - {$(INCLUDE)}"\ace\Timer_Queue.i"\ {$(INCLUDE)}"\ace\Token.h"\ {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ diff --git a/examples/Threads/test.mdp b/examples/Threads/test.mdp index 2d7028e0d7f..8919d0d5f30 100644 Binary files a/examples/Threads/test.mdp and b/examples/Threads/test.mdp differ -- cgit v1.2.1