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

4 files changed, 220 insertions, 40 deletions

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
--- a/examples/Connection/blocking/SPIPE.mdp
+++ b/examples/Connection/blocking/SPIPE.mdp
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
--- a/examples/Connection/non_blocking/non_blocking.mdp
+++ b/examples/Connection/non_blocking/non_blocking.mdp