*** empty log message ***

2 files changed, 5 insertions, 62 deletions

diff --git a/examples/Reactor/Proactor/test_proactor.mak b/examples/Reactor/Proactor/test_proactor.mak
index de94bf7b52c..807a4131dde 100644
--- a/examples/Reactor/Proactor/test_proactor.mak
+++ b/examples/Reactor/Proactor/test_proactor.mak
@@ -69,8 +69,6 @@ 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)/test_proactor.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

 CPP_OBJS=.\debug/

 CPP_SBRS=.\.

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,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 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\

  /pdb:"$(OUTDIR)/test_proactor.pdb" /debug /machine:I386\

@@ -130,8 +128,6 @@ 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)/test_timeout.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

 CPP_OBJS=.\Debug/

 CPP_SBRS=.\.

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -191,8 +187,6 @@ 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)/test_multiple_loops.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

 CPP_OBJS=.\Debug/

 CPP_SBRS=.\.

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -221,6 +215,9 @@ LINK32_OBJS= \
 

 !ENDIF 

 

+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\

+ /Fp"$(INTDIR)/test_proactor.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

+

 .c{$(CPP_OBJS)}.obj:

    $(CPP) $(CPP_PROJ) $<  

 

@@ -249,29 +246,18 @@ LINK32_OBJS= \
 SOURCE=.\test_proactor.cpp

 DEP_CPP_TEST_=\

 	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

 	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Asynch_Acceptor.cpp"\

 	{$(INCLUDE)}"\ace\Asynch_Acceptor.h"\

-	{$(INCLUDE)}"\ace\Asynch_Acceptor.i"\

 	{$(INCLUDE)}"\ace\Asynch_IO.h"\

-	{$(INCLUDE)}"\ace\Asynch_IO.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\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"\

@@ -281,37 +267,21 @@ DEP_CPP_TEST_=\
 	{$(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\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"\

@@ -326,46 +296,19 @@ DEP_CPP_TEST_=\
 	{$(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"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

 	{$(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\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\Timers.h"\

-	{$(INCLUDE)}"\ace\Timers.i"\

-	{$(INCLUDE)}"\ace\Token.h"\

-	{$(INCLUDE)}"\ace\Token.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

diff --git a/examples/Reactor/Proactor/test_proactor.mdp b/examples/Reactor/Proactor/test_proactor.mdp
index aa0c14c2c18..879990b5a8f 100644
--- a/examples/Reactor/Proactor/test_proactor.mdp
+++ b/examples/Reactor/Proactor/test_proactor.mdp