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

6 files changed, 259 insertions, 30 deletions

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
--- a/examples/Logger/Acceptor-server/server_loggerd.mdp
+++ b/examples/Logger/Acceptor-server/server_loggerd.mdp
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
--- a/examples/Logger/client/client.mdp
+++ b/examples/Logger/client/client.mdp
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
--- a/examples/Logger/simple-server/server_loggerd.mdp
+++ b/examples/Logger/simple-server/server_loggerd.mdp