ACE libraries are renamed to conform with MicroSuck's convention.

8 files changed, 103 insertions, 42 deletions

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
--- a/examples/Reactor/Misc/Misc.mdp
+++ b/examples/Reactor/Misc/Misc.mdp
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
--- a/examples/Reactor/Ntalker/ntalker.mdp
+++ b/examples/Reactor/Ntalker/ntalker.mdp
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
--- a/examples/Reactor/Proactor/test_proactor.mdp
+++ b/examples/Reactor/Proactor/test_proactor.mdp
diff --git a/examples/Reactor/ReactorEx/reactorex.mdp b/examples/Reactor/ReactorEx/reactorex.mdp
index 402dd6a5352..f8ec0bf556e 100644
--- a/examples/Reactor/ReactorEx/reactorex.mdp
+++ b/examples/Reactor/ReactorEx/reactorex.mdp
diff --git a/examples/Reactor/WFMO_Reactor/reactorex.mdp b/examples/Reactor/WFMO_Reactor/reactorex.mdp
index 402dd6a5352..f8ec0bf556e 100644
--- a/examples/Reactor/WFMO_Reactor/reactorex.mdp
+++ b/examples/Reactor/WFMO_Reactor/reactorex.mdp