*** empty log message ***

4 files changed, 168 insertions, 394 deletions

diff --git a/examples/Reactor/ReactorEx/reactorex.mak b/examples/Reactor/ReactorEx/reactorex.mak
index 150d04508d7..cf467a72f8d 100644
--- a/examples/Reactor/ReactorEx/reactorex.mak
+++ b/examples/Reactor/ReactorEx/reactorex.mak
@@ -9,21 +9,17 @@ CFG=test_remove_handler - Win32 Debug
  Debug.

 !ENDIF 

 

-!IF "$(CFG)" != "ntalk - Win32 Release" && "$(CFG)" != "ntalk - Win32 Debug" &&\

- "$(CFG)" != "test_remove_handler - Win32 Release" && "$(CFG)" !=\

+!IF "$(CFG)" != "ntalk - Win32 Debug" && "$(CFG)" !=\

  "test_remove_handler - Win32 Debug"

 !MESSAGE Invalid configuration "$(CFG)" specified.

 !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 "reactorEx.mak" CFG="test_remove_handler - Win32 Debug"

+!MESSAGE NMAKE /f "reactorex.mak" CFG="test_remove_handler - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "ntalk - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "ntalk - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "test_remove_handler - Win32 Release" (based on\

- "Win32 (x86) Console Application")

 !MESSAGE "test_remove_handler - Win32 Debug" (based on\

  "Win32 (x86) Console Application")

 !MESSAGE 

@@ -41,59 +37,7 @@ NULL=nul
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "ntalk - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "ntalk\Release"

-# PROP BASE Intermediate_Dir "ntalk\Release"

-# PROP BASE Target_Dir "ntalk"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "ntalk\Release"

-# PROP Intermediate_Dir "ntalk\Release"

-# PROP Target_Dir "ntalk"

-OUTDIR=.\ntalk\Release

-INTDIR=.\ntalk\Release

-

-ALL : "$(OUTDIR)\ntalk.exe"

-

-CLEAN : 

-	-@erase ".\ntalk\Release\ntalk.exe"

-	-@erase ".\ntalk\Release\test_reactorEx.obj"

-

-"$(OUTDIR)" :

-    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"\

- /Fp"$(INTDIR)/ntalk.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\ntalk\Release/

-CPP_SBRS=

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/ntalk.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 /machine:I386

-# ADD 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 ace.lib /nologo /subsystem:console /machine:I386

-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\

- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\

- odbccp32.lib ace.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/ntalk.pdb" /machine:I386 /out:"$(OUTDIR)/ntalk.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)/test_reactorEx.obj"

-

-"$(OUTDIR)\ntalk.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "ntalk - Win32 Debug"

+!IF  "$(CFG)" == "ntalk - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -150,59 +94,6 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

 

-!ELSEIF  "$(CFG)" == "test_remove_handler - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "test_remove_handler\Release"

-# PROP BASE Intermediate_Dir "test_remove_handler\Release"

-# PROP BASE Target_Dir "test_remove_handler"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "test_remove_handler\Release"

-# PROP Intermediate_Dir "test_remove_handler\Release"

-# PROP Target_Dir "test_remove_handler"

-OUTDIR=.\test_remove_handler\Release

-INTDIR=.\test_remove_handler\Release

-

-ALL : "$(OUTDIR)\test_remove_handler.exe"

-

-CLEAN : 

-	-@erase ".\test_remove_handler\Release\test_remove_handler.exe"

-	-@erase ".\test_remove_handler\Release\test_remove_handler.obj"

-

-"$(OUTDIR)" :

-    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"\

- /Fp"$(INTDIR)/test_remove_handler.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\test_remove_handler\Release/

-CPP_SBRS=

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/test_remove_handler.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 /machine:I386

-# ADD 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

-LINK32_FLAGS=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_remove_handler.pdb" /machine:I386\

- /out:"$(OUTDIR)/test_remove_handler.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)/test_remove_handler.obj"

-

-"$(OUTDIR)\test_remove_handler.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

 !ELSEIF  "$(CFG)" == "test_remove_handler - Win32 Debug"

 

 # PROP BASE Use_MFC 0

@@ -283,19 +174,14 @@ LINK32_OBJS= \
 ################################################################################

 # Begin Target

 

-# Name "ntalk - Win32 Release"

 # Name "ntalk - Win32 Debug"

-

-!IF  "$(CFG)" == "ntalk - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ntalk - Win32 Debug"

-

-!ENDIF 

-

 ################################################################################

 # Begin Source File

 

 SOURCE=.\test_reactorEx.cpp

+

+!IF  "$(CFG)" == "ntalk - Win32 Debug"

+

 DEP_CPP_TEST_=\

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

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

@@ -307,33 +193,29 @@ DEP_CPP_TEST_=\
 	{$(INCLUDE)}"\ace\Synch.h"\

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

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

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

+	{$(INCLUDE)}"\ace\Message_Queue.h"\

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

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

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

 	{$(INCLUDE)}"\ace\ReactorEx.i"\

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

+	{$(INCLUDE)}"\ace\Message_Block.h"\

+	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

+	{$(INCLUDE)}"\ace\Strategies.h"\

+	{$(INCLUDE)}"\ace\Message_Queue.i"\

+	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+	{$(INCLUDE)}"\ace\Message_Block.i"\

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

+	{$(INCLUDE)}"\ace\Synch_T.h"\

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

 	{$(INCLUDE)}"\ace\Malloc.i"\

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

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

+	{$(INCLUDE)}"\ace\Synch_T.i"\

+	{$(INCLUDE)}"\ace\Synch_T.cpp"\

+	{$(INCLUDE)}"\ace\Thread.h"\

+	{$(INCLUDE)}"\ace\Thread.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

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

 	{$(INCLUDE)}"\ace\Malloc_T.i"\

@@ -348,9 +230,21 @@ DEP_CPP_TEST_=\
 	{$(INCLUDE)}"\ace\Set.cpp"\

 	{$(INCLUDE)}"\ace\Mem_Map.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

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

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

+	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

+	{$(INCLUDE)}"\ace\Event_Handler.i"\

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

+	{$(INCLUDE)}"\ace\Stack.h"\

+	{$(INCLUDE)}"\ace\Synch_Options.h"\

+	{$(INCLUDE)}"\ace\Map_Manager.h"\

+	{$(INCLUDE)}"\ace\Local_Tokens.i"\

+	{$(INCLUDE)}"\ace\Stack.i"\

+	{$(INCLUDE)}"\ace\Stack.cpp"\

+	{$(INCLUDE)}"\ace\Map_Manager.i"\

+	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

+	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Proactor.i"\

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

+	{$(INCLUDE)}"\ace\Timer_Queue.i"\

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

 	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

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

@@ -376,101 +270,88 @@ DEP_CPP_TEST_=\
 	{$(INCLUDE)}"\ace\Shared_Object.h"\

 	{$(INCLUDE)}"\ace\Service_Object.i"\

 	{$(INCLUDE)}"\ace\Shared_Object.i"\

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

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

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

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

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

 	{$(INCLUDE)}"\ace\Reactor.i"\

 	{$(INCLUDE)}"\ace\Handle_Set.i"\

 	{$(INCLUDE)}"\ace\Pipe.i"\

 	{$(INCLUDE)}"\ace\Synch.i"\

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

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

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

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

 	{$(INCLUDE)}"\ace\Task.i"\

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

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

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

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

+	{$(INCLUDE)}"\ace\Task_T.h"\

+	{$(INCLUDE)}"\ace\Task_T.i"\

+	{$(INCLUDE)}"\ace\Task_T.cpp"\

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

 	{$(INCLUDE)}"\ace\Module.i"\

 	{$(INCLUDE)}"\ace\Module.cpp"\

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

 	{$(INCLUDE)}"\ace\Stream_Modules.i"\

 	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\sys\TYPES.H"\

-	{$(INCLUDE)}"\sys\STAT.H"\

-	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\ace\stdcpp.h"\

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

+	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\OS.i"\

-	

-NODEP_CPP_TEST_=\

-	".\..\..\ace\ace\Sync_T.h"\

-	".\..\..\ace\semLib.h"\

+	{$(INCLUDE)}"\ace\Log_Record.h"\

+	{$(INCLUDE)}"\ace\Log_Priority.h"\

+	{$(INCLUDE)}"\ace\Log_Record.i"\

 	

 

 "$(INTDIR)\test_reactorEx.obj" : $(SOURCE) $(DEP_CPP_TEST_) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

 ################################################################################

 # Begin Target

 

-# Name "test_remove_handler - Win32 Release"

 # Name "test_remove_handler - Win32 Debug"

-

-!IF  "$(CFG)" == "test_remove_handler - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "test_remove_handler - Win32 Debug"

-

-!ENDIF 

-

 ################################################################################

 # Begin Source File

 

 SOURCE=.\test_remove_handler.cpp

+

+!IF  "$(CFG)" == "test_remove_handler - Win32 Debug"

+

 DEP_CPP_TEST_R=\

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

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

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

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

+	{$(INCLUDE)}"\ace\Message_Queue.h"\

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

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

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

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

 	{$(INCLUDE)}"\ace\ReactorEx.i"\

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

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

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

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

+	{$(INCLUDE)}"\ace\Message_Block.h"\

+	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

+	{$(INCLUDE)}"\ace\Strategies.h"\

+	{$(INCLUDE)}"\ace\Message_Queue.i"\

+	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

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

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

+	{$(INCLUDE)}"\ace\Malloc.h"\

+	{$(INCLUDE)}"\ace\Message_Block.i"\

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

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

-	{$(INCLUDE)}"\sys\TYPES.H"\

-	{$(INCLUDE)}"\sys\STAT.H"\

-	{$(INCLUDE)}"\sys\TIMEB.H"\

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

+	{$(INCLUDE)}"\ace\stdcpp.h"\

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

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

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

+	{$(INCLUDE)}"\ace\OS.i"\

+	{$(INCLUDE)}"\ace\config.h"\

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

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

 	{$(INCLUDE)}"\ace\Log_Record.i"\

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

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

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

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

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

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

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

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

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

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

+	{$(INCLUDE)}"\ace\Synch_T.h"\

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

 	{$(INCLUDE)}"\ace\Malloc.i"\

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

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

+	{$(INCLUDE)}"\ace\Synch_T.i"\

+	{$(INCLUDE)}"\ace\Synch_T.cpp"\

+	{$(INCLUDE)}"\ace\Thread.h"\

+	{$(INCLUDE)}"\ace\Thread.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

 	{$(INCLUDE)}"\ace\Malloc_T.i"\

 	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

@@ -484,26 +365,36 @@ DEP_CPP_TEST_R=\
 	{$(INCLUDE)}"\ace\Set.cpp"\

 	{$(INCLUDE)}"\ace\Mem_Map.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

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

+	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

+	{$(INCLUDE)}"\ace\Time_Value.i"\

+	{$(INCLUDE)}"\ace\Event_Handler.i"\

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

+	{$(INCLUDE)}"\ace\Stack.h"\

+	{$(INCLUDE)}"\ace\Synch_Options.h"\

+	{$(INCLUDE)}"\ace\Map_Manager.h"\

+	{$(INCLUDE)}"\ace\Local_Tokens.i"\

+	{$(INCLUDE)}"\ace\Stack.i"\

+	{$(INCLUDE)}"\ace\Stack.cpp"\

+	{$(INCLUDE)}"\ace\Map_Manager.i"\

+	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

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

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

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

 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

+	{$(INCLUDE)}"\ace\Proactor.h"\

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

 	{$(INCLUDE)}"\ace\Service_Object.i"\

 	{$(INCLUDE)}"\ace\Shared_Object.i"\

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

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

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

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

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

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

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

+	{$(INCLUDE)}"\ace\Timer_Queue.h"\

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

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

 	{$(INCLUDE)}"\ace\Reactor.i"\

 	{$(INCLUDE)}"\ace\Handle_Set.i"\

+	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Pipe.i"\

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

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

@@ -516,19 +407,15 @@ DEP_CPP_TEST_R=\
 	{$(INCLUDE)}"\ace\Addr.i"\

 	{$(INCLUDE)}"\ace\IPC_SAP.i"\

 	{$(INCLUDE)}"\ace\INET_Addr.i"\

+	{$(INCLUDE)}"\ace\Proactor.i"\

 	{$(INCLUDE)}"\ace\Synch.i"\

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

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

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

-	

-NODEP_CPP_TEST_R=\

-	".\..\..\ace\semLib.h"\

-	".\..\..\ace\ace\Sync_T.h"\

 	

 

 "$(INTDIR)\test_remove_handler.obj" : $(SOURCE) $(DEP_CPP_TEST_R) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

 # End Project

diff --git a/examples/Reactor/ReactorEx/reactorex.mdp b/examples/Reactor/ReactorEx/reactorex.mdp
index 0135cc67b75..fe02de61203 100644
--- a/examples/Reactor/ReactorEx/reactorex.mdp
+++ b/examples/Reactor/ReactorEx/reactorex.mdp
diff --git a/examples/Reactor/WFMO_Reactor/reactorex.mak b/examples/Reactor/WFMO_Reactor/reactorex.mak
index 150d04508d7..cf467a72f8d 100644
--- a/examples/Reactor/WFMO_Reactor/reactorex.mak
+++ b/examples/Reactor/WFMO_Reactor/reactorex.mak
@@ -9,21 +9,17 @@ CFG=test_remove_handler - Win32 Debug
  Debug.

 !ENDIF 

 

-!IF "$(CFG)" != "ntalk - Win32 Release" && "$(CFG)" != "ntalk - Win32 Debug" &&\

- "$(CFG)" != "test_remove_handler - Win32 Release" && "$(CFG)" !=\

+!IF "$(CFG)" != "ntalk - Win32 Debug" && "$(CFG)" !=\

  "test_remove_handler - Win32 Debug"

 !MESSAGE Invalid configuration "$(CFG)" specified.

 !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 "reactorEx.mak" CFG="test_remove_handler - Win32 Debug"

+!MESSAGE NMAKE /f "reactorex.mak" CFG="test_remove_handler - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "ntalk - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "ntalk - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "test_remove_handler - Win32 Release" (based on\

- "Win32 (x86) Console Application")

 !MESSAGE "test_remove_handler - Win32 Debug" (based on\

  "Win32 (x86) Console Application")

 !MESSAGE 

@@ -41,59 +37,7 @@ NULL=nul
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "ntalk - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "ntalk\Release"

-# PROP BASE Intermediate_Dir "ntalk\Release"

-# PROP BASE Target_Dir "ntalk"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "ntalk\Release"

-# PROP Intermediate_Dir "ntalk\Release"

-# PROP Target_Dir "ntalk"

-OUTDIR=.\ntalk\Release

-INTDIR=.\ntalk\Release

-

-ALL : "$(OUTDIR)\ntalk.exe"

-

-CLEAN : 

-	-@erase ".\ntalk\Release\ntalk.exe"

-	-@erase ".\ntalk\Release\test_reactorEx.obj"

-

-"$(OUTDIR)" :

-    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"\

- /Fp"$(INTDIR)/ntalk.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\ntalk\Release/

-CPP_SBRS=

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/ntalk.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 /machine:I386

-# ADD 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 ace.lib /nologo /subsystem:console /machine:I386

-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\

- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\

- odbccp32.lib ace.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/ntalk.pdb" /machine:I386 /out:"$(OUTDIR)/ntalk.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)/test_reactorEx.obj"

-

-"$(OUTDIR)\ntalk.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "ntalk - Win32 Debug"

+!IF  "$(CFG)" == "ntalk - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -150,59 +94,6 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

 

-!ELSEIF  "$(CFG)" == "test_remove_handler - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "test_remove_handler\Release"

-# PROP BASE Intermediate_Dir "test_remove_handler\Release"

-# PROP BASE Target_Dir "test_remove_handler"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "test_remove_handler\Release"

-# PROP Intermediate_Dir "test_remove_handler\Release"

-# PROP Target_Dir "test_remove_handler"

-OUTDIR=.\test_remove_handler\Release

-INTDIR=.\test_remove_handler\Release

-

-ALL : "$(OUTDIR)\test_remove_handler.exe"

-

-CLEAN : 

-	-@erase ".\test_remove_handler\Release\test_remove_handler.exe"

-	-@erase ".\test_remove_handler\Release\test_remove_handler.obj"

-

-"$(OUTDIR)" :

-    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"\

- /Fp"$(INTDIR)/test_remove_handler.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\test_remove_handler\Release/

-CPP_SBRS=

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/test_remove_handler.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 /machine:I386

-# ADD 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

-LINK32_FLAGS=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_remove_handler.pdb" /machine:I386\

- /out:"$(OUTDIR)/test_remove_handler.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)/test_remove_handler.obj"

-

-"$(OUTDIR)\test_remove_handler.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

 !ELSEIF  "$(CFG)" == "test_remove_handler - Win32 Debug"

 

 # PROP BASE Use_MFC 0

@@ -283,19 +174,14 @@ LINK32_OBJS= \
 ################################################################################

 # Begin Target

 

-# Name "ntalk - Win32 Release"

 # Name "ntalk - Win32 Debug"

-

-!IF  "$(CFG)" == "ntalk - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ntalk - Win32 Debug"

-

-!ENDIF 

-

 ################################################################################

 # Begin Source File

 

 SOURCE=.\test_reactorEx.cpp

+

+!IF  "$(CFG)" == "ntalk - Win32 Debug"

+

 DEP_CPP_TEST_=\

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

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

@@ -307,33 +193,29 @@ DEP_CPP_TEST_=\
 	{$(INCLUDE)}"\ace\Synch.h"\

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

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

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

+	{$(INCLUDE)}"\ace\Message_Queue.h"\

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

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

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

 	{$(INCLUDE)}"\ace\ReactorEx.i"\

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

+	{$(INCLUDE)}"\ace\Message_Block.h"\

+	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

+	{$(INCLUDE)}"\ace\Strategies.h"\

+	{$(INCLUDE)}"\ace\Message_Queue.i"\

+	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+	{$(INCLUDE)}"\ace\Message_Block.i"\

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

+	{$(INCLUDE)}"\ace\Synch_T.h"\

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

 	{$(INCLUDE)}"\ace\Malloc.i"\

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

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

+	{$(INCLUDE)}"\ace\Synch_T.i"\

+	{$(INCLUDE)}"\ace\Synch_T.cpp"\

+	{$(INCLUDE)}"\ace\Thread.h"\

+	{$(INCLUDE)}"\ace\Thread.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

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

 	{$(INCLUDE)}"\ace\Malloc_T.i"\

@@ -348,9 +230,21 @@ DEP_CPP_TEST_=\
 	{$(INCLUDE)}"\ace\Set.cpp"\

 	{$(INCLUDE)}"\ace\Mem_Map.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

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

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

+	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

+	{$(INCLUDE)}"\ace\Event_Handler.i"\

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

+	{$(INCLUDE)}"\ace\Stack.h"\

+	{$(INCLUDE)}"\ace\Synch_Options.h"\

+	{$(INCLUDE)}"\ace\Map_Manager.h"\

+	{$(INCLUDE)}"\ace\Local_Tokens.i"\

+	{$(INCLUDE)}"\ace\Stack.i"\

+	{$(INCLUDE)}"\ace\Stack.cpp"\

+	{$(INCLUDE)}"\ace\Map_Manager.i"\

+	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

+	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Proactor.i"\

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

+	{$(INCLUDE)}"\ace\Timer_Queue.i"\

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

 	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

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

@@ -376,101 +270,88 @@ DEP_CPP_TEST_=\
 	{$(INCLUDE)}"\ace\Shared_Object.h"\

 	{$(INCLUDE)}"\ace\Service_Object.i"\

 	{$(INCLUDE)}"\ace\Shared_Object.i"\

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

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

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

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

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

 	{$(INCLUDE)}"\ace\Reactor.i"\

 	{$(INCLUDE)}"\ace\Handle_Set.i"\

 	{$(INCLUDE)}"\ace\Pipe.i"\

 	{$(INCLUDE)}"\ace\Synch.i"\

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

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

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

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

 	{$(INCLUDE)}"\ace\Task.i"\

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

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

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

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

+	{$(INCLUDE)}"\ace\Task_T.h"\

+	{$(INCLUDE)}"\ace\Task_T.i"\

+	{$(INCLUDE)}"\ace\Task_T.cpp"\

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

 	{$(INCLUDE)}"\ace\Module.i"\

 	{$(INCLUDE)}"\ace\Module.cpp"\

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

 	{$(INCLUDE)}"\ace\Stream_Modules.i"\

 	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\sys\TYPES.H"\

-	{$(INCLUDE)}"\sys\STAT.H"\

-	{$(INCLUDE)}"\sys\TIMEB.H"\

+	{$(INCLUDE)}"\ace\stdcpp.h"\

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

+	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\OS.i"\

-	

-NODEP_CPP_TEST_=\

-	".\..\..\ace\ace\Sync_T.h"\

-	".\..\..\ace\semLib.h"\

+	{$(INCLUDE)}"\ace\Log_Record.h"\

+	{$(INCLUDE)}"\ace\Log_Priority.h"\

+	{$(INCLUDE)}"\ace\Log_Record.i"\

 	

 

 "$(INTDIR)\test_reactorEx.obj" : $(SOURCE) $(DEP_CPP_TEST_) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

 ################################################################################

 # Begin Target

 

-# Name "test_remove_handler - Win32 Release"

 # Name "test_remove_handler - Win32 Debug"

-

-!IF  "$(CFG)" == "test_remove_handler - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "test_remove_handler - Win32 Debug"

-

-!ENDIF 

-

 ################################################################################

 # Begin Source File

 

 SOURCE=.\test_remove_handler.cpp

+

+!IF  "$(CFG)" == "test_remove_handler - Win32 Debug"

+

 DEP_CPP_TEST_R=\

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

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

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

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

+	{$(INCLUDE)}"\ace\Message_Queue.h"\

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

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

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

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

 	{$(INCLUDE)}"\ace\ReactorEx.i"\

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

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

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

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

+	{$(INCLUDE)}"\ace\Message_Block.h"\

+	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

+	{$(INCLUDE)}"\ace\Strategies.h"\

+	{$(INCLUDE)}"\ace\Message_Queue.i"\

+	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

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

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

+	{$(INCLUDE)}"\ace\Malloc.h"\

+	{$(INCLUDE)}"\ace\Message_Block.i"\

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

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

-	{$(INCLUDE)}"\sys\TYPES.H"\

-	{$(INCLUDE)}"\sys\STAT.H"\

-	{$(INCLUDE)}"\sys\TIMEB.H"\

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

+	{$(INCLUDE)}"\ace\stdcpp.h"\

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

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

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

+	{$(INCLUDE)}"\ace\OS.i"\

+	{$(INCLUDE)}"\ace\config.h"\

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

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

 	{$(INCLUDE)}"\ace\Log_Record.i"\

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

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

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

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

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

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

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

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

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

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

+	{$(INCLUDE)}"\ace\Synch_T.h"\

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

 	{$(INCLUDE)}"\ace\Malloc.i"\

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

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

+	{$(INCLUDE)}"\ace\Synch_T.i"\

+	{$(INCLUDE)}"\ace\Synch_T.cpp"\

+	{$(INCLUDE)}"\ace\Thread.h"\

+	{$(INCLUDE)}"\ace\Thread.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

 	{$(INCLUDE)}"\ace\Malloc_T.i"\

 	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

@@ -484,26 +365,36 @@ DEP_CPP_TEST_R=\
 	{$(INCLUDE)}"\ace\Set.cpp"\

 	{$(INCLUDE)}"\ace\Mem_Map.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

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

+	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

+	{$(INCLUDE)}"\ace\Time_Value.i"\

+	{$(INCLUDE)}"\ace\Event_Handler.i"\

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

+	{$(INCLUDE)}"\ace\Stack.h"\

+	{$(INCLUDE)}"\ace\Synch_Options.h"\

+	{$(INCLUDE)}"\ace\Map_Manager.h"\

+	{$(INCLUDE)}"\ace\Local_Tokens.i"\

+	{$(INCLUDE)}"\ace\Stack.i"\

+	{$(INCLUDE)}"\ace\Stack.cpp"\

+	{$(INCLUDE)}"\ace\Map_Manager.i"\

+	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

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

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

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

 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

+	{$(INCLUDE)}"\ace\Proactor.h"\

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

 	{$(INCLUDE)}"\ace\Service_Object.i"\

 	{$(INCLUDE)}"\ace\Shared_Object.i"\

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

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

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

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

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

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

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

+	{$(INCLUDE)}"\ace\Timer_Queue.h"\

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

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

 	{$(INCLUDE)}"\ace\Reactor.i"\

 	{$(INCLUDE)}"\ace\Handle_Set.i"\

+	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Pipe.i"\

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

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

@@ -516,19 +407,15 @@ DEP_CPP_TEST_R=\
 	{$(INCLUDE)}"\ace\Addr.i"\

 	{$(INCLUDE)}"\ace\IPC_SAP.i"\

 	{$(INCLUDE)}"\ace\INET_Addr.i"\

+	{$(INCLUDE)}"\ace\Proactor.i"\

 	{$(INCLUDE)}"\ace\Synch.i"\

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

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

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

-	

-NODEP_CPP_TEST_R=\

-	".\..\..\ace\semLib.h"\

-	".\..\..\ace\ace\Sync_T.h"\

 	

 

 "$(INTDIR)\test_remove_handler.obj" : $(SOURCE) $(DEP_CPP_TEST_R) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

 # End Project

diff --git a/examples/Reactor/WFMO_Reactor/reactorex.mdp b/examples/Reactor/WFMO_Reactor/reactorex.mdp
index 0135cc67b75..fe02de61203 100644
--- a/examples/Reactor/WFMO_Reactor/reactorex.mdp
+++ b/examples/Reactor/WFMO_Reactor/reactorex.mdp