*** empty log message ***

7 files changed, 147 insertions, 15 deletions

diff --git a/examples/Reactor/ReactorEx/reactorex.mak b/examples/Reactor/ReactorEx/reactorex.mak
index f8425100d05..65b22bb39ea 100644
--- a/examples/Reactor/ReactorEx/reactorex.mak
+++ b/examples/Reactor/ReactorEx/reactorex.mak
@@ -730,6 +730,8 @@ DEP_CPP_TEST_=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -835,6 +837,8 @@ DEP_CPP_TEST_M=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -1221,6 +1225,8 @@ DEP_CPP_TEST_T=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

diff --git a/examples/Reactor/ReactorEx/reactorex.mdp b/examples/Reactor/ReactorEx/reactorex.mdp
index cf058b17b54..ff80c4f25ae 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 f8425100d05..65b22bb39ea 100644
--- a/examples/Reactor/WFMO_Reactor/reactorex.mak
+++ b/examples/Reactor/WFMO_Reactor/reactorex.mak
@@ -730,6 +730,8 @@ DEP_CPP_TEST_=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -835,6 +837,8 @@ DEP_CPP_TEST_M=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -1221,6 +1225,8 @@ DEP_CPP_TEST_T=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

diff --git a/examples/Reactor/WFMO_Reactor/reactorex.mdp b/examples/Reactor/WFMO_Reactor/reactorex.mdp
index cf058b17b54..ff80c4f25ae 100644
--- a/examples/Reactor/WFMO_Reactor/reactorex.mdp
+++ b/examples/Reactor/WFMO_Reactor/reactorex.mdp
diff --git a/tests/Priority_Task_Test.cpp b/tests/Priority_Task_Test.cpp
index c711f9dc7a0..a06391c0799 100644
--- a/tests/Priority_Task_Test.cpp
+++ b/tests/Priority_Task_Test.cpp
@@ -21,6 +21,8 @@
 #include "ace/Sched_Params.h"
 #include "test_config.h"
 
+#if defined (ACE_HAS_THREADS)
+
 class Priority_Task : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
diff --git a/tests/tests.mak b/tests/tests.mak
index 9b9e555cbd0..3c55dfb9f30 100644
--- a/tests/tests.mak
+++ b/tests/tests.mak
@@ -2921,12 +2921,15 @@ DEP_CPP_MEM_M=\
 	{$(INCLUDE)}"\.\test_config.h"\

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

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

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

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

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

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

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

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

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

@@ -2942,6 +2945,17 @@ DEP_CPP_MEM_M=\
 	{$(INCLUDE)}"\ace\SString.h"\

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 	

@@ -3264,6 +3278,8 @@ DEP_CPP_REACTO=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -3322,12 +3338,15 @@ DEP_CPP_SSTRI=\
 	{$(INCLUDE)}"\.\test_config.h"\

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

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

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

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

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

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

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

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

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

@@ -3341,6 +3360,17 @@ DEP_CPP_SSTRI=\
 	{$(INCLUDE)}"\ace\SString.h"\

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 	

@@ -3362,12 +3392,15 @@ DEP_CPP_TIME_=\
 	{$(INCLUDE)}"\.\test_config.h"\

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

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

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

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

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

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

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

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

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

@@ -3381,6 +3414,17 @@ DEP_CPP_TIME_=\
 	{$(INCLUDE)}"\ace\SString.h"\

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 	

@@ -3461,7 +3505,6 @@ DEP_CPP_TIMER=\
 	{$(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"\

@@ -3552,6 +3595,8 @@ DEP_CPP_UPIPE=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -3679,6 +3724,8 @@ DEP_CPP_PRIOR=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -3729,12 +3776,15 @@ DEP_CPP_TIME_S=\
 	{$(INCLUDE)}"\.\test_config.h"\

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

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

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

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

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

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

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

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

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

@@ -3750,6 +3800,17 @@ DEP_CPP_TIME_S=\
 	{$(INCLUDE)}"\ace\SString.h"\

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 	

@@ -3894,6 +3955,8 @@ DEP_CPP_BUFFE=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -3955,7 +4018,6 @@ SOURCE=.\Barrier_Test.cpp
 DEP_CPP_BARRI=\

 	{$(INCLUDE)}"\.\test_config.h"\

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

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

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

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

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

@@ -3988,7 +4050,6 @@ DEP_CPP_BARRI=\
 	{$(INCLUDE)}"\ace\Synch_T.h"\

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

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

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

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

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

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

@@ -4182,6 +4243,8 @@ DEP_CPP_TASK_=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -4266,11 +4329,16 @@ DEP_CPP_THREA=\
 	{$(INCLUDE)}"\ace\Malloc_T.i"\

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

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

+	{$(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"\

@@ -4436,6 +4504,8 @@ DEP_CPP_THREAD=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -4552,6 +4622,8 @@ DEP_CPP_FUTUR=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -4609,7 +4681,6 @@ SOURCE=.\Tokens_Test.cpp
 DEP_CPP_TOKEN=\

 	{$(INCLUDE)}"\.\test_config.h"\

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

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

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

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

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

@@ -4783,6 +4854,8 @@ DEP_CPP_MESSA=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -4928,12 +5001,15 @@ DEP_CPP_PIPE_=\
 	{$(INCLUDE)}"\.\test_config.h"\

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

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

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

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

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

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

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

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

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

@@ -4953,6 +5029,17 @@ DEP_CPP_PIPE_=\
 	{$(INCLUDE)}"\ace\SString.h"\

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 	

@@ -5163,7 +5250,6 @@ SOURCE=.\Service_Config_Test.cpp
 DEP_CPP_SERVI=\

 	{$(INCLUDE)}"\.\test_config.h"\

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

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

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

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

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

@@ -5182,9 +5268,7 @@ DEP_CPP_SERVI=\
 	{$(INCLUDE)}"\ace\Handle_Set.h"\

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

@@ -5384,6 +5468,8 @@ DEP_CPP_MESSAG=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -5499,6 +5585,8 @@ DEP_CPP_REACTOR=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -5626,6 +5714,8 @@ DEP_CPP_IOSTR=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -5766,6 +5856,8 @@ DEP_CPP_PROCES=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -5913,6 +6005,8 @@ DEP_CPP_CONN_=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -6208,6 +6302,8 @@ DEP_CPP_PRIORI=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -6266,12 +6362,15 @@ DEP_CPP_SIGSE=\
 	{$(INCLUDE)}"\.\test_config.h"\

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

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

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

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

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

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

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

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

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

@@ -6285,6 +6384,17 @@ DEP_CPP_SIGSE=\
 	{$(INCLUDE)}"\ace\SString.h"\

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 	

@@ -6335,8 +6445,6 @@ DEP_CPP_MESSAGE=\
 	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

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

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

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

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

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

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

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

@@ -6350,7 +6458,6 @@ DEP_CPP_MESSAGE=\
 	{$(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\Reactor.h"\

@@ -6360,6 +6467,8 @@ DEP_CPP_MESSAGE=\
 	{$(INCLUDE)}"\ace\Service_Config.i"\

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

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

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

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

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

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

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

@@ -6421,12 +6530,15 @@ DEP_CPP_ENUM_=\
 	{$(INCLUDE)}"\ace\ACE.i"\

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

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

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

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

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

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

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

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

@@ -6442,6 +6554,17 @@ DEP_CPP_ENUM_=\
 	{$(INCLUDE)}"\ace\SString.h"\

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 	

@@ -6463,13 +6586,10 @@ DEP_CPP_HASH_=\
 	".\Hash_Map_Manager_Test.h"\

 	{$(INCLUDE)}"\.\test_config.h"\

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

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

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

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

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

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

@@ -6484,9 +6604,7 @@ DEP_CPP_HASH_=\
 	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

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

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

diff --git a/tests/tests.mdp b/tests/tests.mdp
index ad0bb89a95d..636c1150b68 100644
--- a/tests/tests.mdp
+++ b/tests/tests.mdp