*** empty log message ***

9 files changed, 89 insertions, 192 deletions

diff --git a/examples/Logger/simple-server/Logging_Acceptor.cpp b/examples/Logger/simple-server/Logging_Acceptor.cpp
index ae34a2da71c..64a17340bdd 100644
--- a/examples/Logger/simple-server/Logging_Acceptor.cpp
+++ b/examples/Logger/simple-server/Logging_Acceptor.cpp
@@ -57,16 +57,13 @@ Logging_Acceptor::handle_input (ACE_HANDLE)
 
   // Accept the connection from a client client daemon.
 
-  int reset_new_handle = 0;
-#if defined (ACE_WIN32)
   // Try to find out if the implementation of the reactor that we are
-  // using is the WFMO_Reactor. If so we need to reset the event
-  // association for the newly created handle. This is because the
-  // newly created handle will inherit the properties of the listen
-  // handle, including its event associations.
-  reset_new_handle = this->reactor ()->reset_new_handle ();
-#endif /* ACE_WIN32 */
-  
+  // using requires us to reset the event association for the newly
+  // created handle. This is because the newly created handle will
+  // inherit the properties of the listen handle, including its event
+  // associations.
+  int reset_new_handle = this->reactor ()->uses_event_associations ();
+
   if (this->peer_acceptor_.accept (svc_handler->peer (), // stream
                                    0, // remote address
                                    0, // timeout
diff --git a/examples/Naming/Naming.mak b/examples/Naming/Naming.mak
index c8612df69ee..d7ff3a62181 100644
--- a/examples/Naming/Naming.mak
+++ b/examples/Naming/Naming.mak
@@ -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 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\

+# ADD LINK32 aceu.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=aceu.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)/writers.pdb" /debug /machine:I386 /out:"$(OUTDIR)/writers.exe" 

@@ -141,8 +141,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 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\

+# ADD LINK32 aceu.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=aceu.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)/multiple_contexts.pdb" /debug /machine:I386\

@@ -200,8 +200,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 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\

+# ADD LINK32 aceu.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=aceu.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)/non_existent.pdb" /debug /machine:I386\

@@ -251,8 +251,6 @@ DEP_CPP_TEST_=\
 	{$(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"\

@@ -269,17 +267,10 @@ DEP_CPP_TEST_=\
 	{$(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"\

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

@@ -289,18 +280,13 @@ DEP_CPP_TEST_=\
 	{$(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\Managed_Object.cpp"\

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

+	{$(INCLUDE)}"\ace\Managed_Object.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\Name_Proxy.h"\

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

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

@@ -309,14 +295,9 @@ DEP_CPP_TEST_=\
 	{$(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\Reactor_Impl.h"\

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

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

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

@@ -336,9 +317,6 @@ DEP_CPP_TEST_=\
 	{$(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\SV_Semaphore_Complex.h"\

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

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

@@ -352,24 +330,11 @@ DEP_CPP_TEST_=\
 	{$(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\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"\

 	

@@ -387,14 +352,15 @@ DEP_CPP_TEST_=\
 # Begin Source File

 

 SOURCE=.\test_multiple_contexts.cpp

+

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

+

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

@@ -411,17 +377,10 @@ DEP_CPP_TEST_M=\
 	{$(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"\

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

@@ -431,18 +390,13 @@ DEP_CPP_TEST_M=\
 	{$(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\Managed_Object.cpp"\

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

+	{$(INCLUDE)}"\ace\Managed_Object.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\Name_Proxy.h"\

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

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

@@ -451,14 +405,9 @@ DEP_CPP_TEST_M=\
 	{$(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\Reactor_Impl.h"\

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

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

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

@@ -478,9 +427,6 @@ DEP_CPP_TEST_M=\
 	{$(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\SV_Semaphore_Complex.h"\

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

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

@@ -494,24 +440,11 @@ DEP_CPP_TEST_M=\
 	{$(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\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"\

 	

@@ -520,6 +453,8 @@ DEP_CPP_TEST_M=\
  "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -536,8 +471,6 @@ DEP_CPP_TEST_N=\
 	{$(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"\

@@ -554,17 +487,10 @@ DEP_CPP_TEST_N=\
 	{$(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"\

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

@@ -574,18 +500,13 @@ DEP_CPP_TEST_N=\
 	{$(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\Managed_Object.cpp"\

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

+	{$(INCLUDE)}"\ace\Managed_Object.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\Name_Proxy.h"\

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

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

@@ -594,14 +515,9 @@ DEP_CPP_TEST_N=\
 	{$(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\Reactor_Impl.h"\

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

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

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

@@ -621,9 +537,6 @@ DEP_CPP_TEST_N=\
 	{$(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\SV_Semaphore_Complex.h"\

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

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

@@ -637,24 +550,11 @@ DEP_CPP_TEST_N=\
 	{$(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\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"\

 	

diff --git a/examples/Naming/Naming.mdp b/examples/Naming/Naming.mdp
index 230cd3b4f0f..92fa24ffd20 100644
--- a/examples/Naming/Naming.mdp
+++ b/examples/Naming/Naming.mdp
diff --git a/examples/Naming/test_multiple_contexts.cpp b/examples/Naming/test_multiple_contexts.cpp
index 36618406627..7abed212808 100644
--- a/examples/Naming/test_multiple_contexts.cpp
+++ b/examples/Naming/test_multiple_contexts.cpp
@@ -8,10 +8,10 @@ int main (int, char *[])
 
   int i;
     
-  ACE_Naming_Context * ns_ptr = new ACE_Naming_Context();
+  ACE_Naming_Context * ns_ptr = new ACE_Naming_Context ();
   ACE_Name_Options *name_options = ns_ptr->name_options ();
      
-  ACE_Naming_Context * ns_ptr1 = new ACE_Naming_Context();
+  ACE_Naming_Context * ns_ptr1 = new ACE_Naming_Context ();
   ACE_Name_Options *name_options1 = ns_ptr1->name_options ();
      
   char address_arg1[BUFSIZ];
@@ -19,27 +19,27 @@ int main (int, char *[])
   ACE_OS::sprintf (address_arg1, "-b%d", ACE_DEFAULT_BASE_ADDR_1);
 
   char * m_argv[] = {"MyName1",
-		     "-cNODE_LOCAL" ,
+		     "-cNODE_LOCAL",
 		     address_arg1, 
 		     NULL};
-  int m_argc = sizeof ( m_argv ) / sizeof ( char * ) -1;
+  int m_argc = sizeof (m_argv) / sizeof (char *) -1;
 
   ACE_OS::sprintf (address_arg2, "-b%d", ACE_DEFAULT_BASE_ADDR_2);
   char * n_argv[] = {"MyName2",
-		     "-cNODE_LOCAL" ,
+		     "-cNODE_LOCAL",
 		     address_arg2, 
 		     NULL};
-  int n_argc = sizeof ( n_argv ) / sizeof ( char * ) -1;
+  int n_argc = sizeof (n_argv) / sizeof (char *) -1;
 
-  name_options->parse_args(m_argc,m_argv);
+  name_options->parse_args (m_argc, m_argv);
   i = ns_ptr->open (ACE_Naming_Context::NODE_LOCAL); 
-  cout << ::getpid() << ": opened with " << i << endl;
-  if ( i != 0 ) return -1;
+  cout << ACE_OS::getpid () << ": opened with " << i << endl;
+  if (i != 0) return -1;
 		
-  name_options1->parse_args(n_argc,n_argv);
+  name_options1->parse_args (n_argc, n_argv);
   i = ns_ptr1->open (ACE_Naming_Context::NODE_LOCAL);  
-  cout << ::getpid() << ": 1 opened with " << i << endl;
-  if ( i != 0 ) return -1;		
+  cout << ACE_OS::getpid () << ": 1 opened with " << i << endl;
+  if (i != 0) return -1;		
 
   return 0;
 }
diff --git a/examples/Naming/test_non_existent.cpp b/examples/Naming/test_non_existent.cpp
index 6f9b4f3dd3c..a78bc26ab20 100644
--- a/examples/Naming/test_non_existent.cpp
+++ b/examples/Naming/test_non_existent.cpp
@@ -4,24 +4,30 @@ int main (int, char *[])
 {
   int i;
     
-  ACE_Naming_Context * ns_ptr = new ACE_Naming_Context();
+  ACE_Naming_Context * ns_ptr = new ACE_Naming_Context ();
   ACE_Name_Options *name_options = ns_ptr->name_options ();
      
 #if defined (ACE_WIN32)
-  char * m_argv[] = {"MyName","-cNODE_LOCAL" ,"-lC:\\tmp\\namespacedir\\MyName",NULL};
+  char * m_argv[] = {"MyName",
+                     "-cNODE_LOCAL" ,
+                     "-lC:\\temp\\non_existent",
+                     NULL};
 #else
-  char * m_argv[] = {"MyName","-cNODE_LOCAL" ,"-l/tmp/foobar.mine",NULL};
+  char * m_argv[] = {"MyName",
+                     "-cNODE_LOCAL" ,
+                     "-l/tmp/foobar.mine",
+                     NULL};
 #endif
-  int m_argc = sizeof ( m_argv ) / sizeof ( char * ) -1;
+  int m_argc = sizeof (m_argv) / sizeof (char *) -1;
 
-  name_options->parse_args(m_argc,m_argv);
+  name_options->parse_args (m_argc,m_argv);
   i = ns_ptr->open (ACE_Naming_Context::NODE_LOCAL); 
-  cout << ::getpid() << ": opened with " << i << endl;
-  if ( i != 0 ) return -1;
+  cout << ACE_OS::getpid () << ": opened with " << i << endl;
+  if (i != 0) return -1;
 		
-  i = ns_ptr->bind("Key_Value","Val_Value","-");  
+  i = ns_ptr->bind ("Key_Value","Val_Value","-");  
 
-  cout << ::getpid() << ": bound with " << i << endl;
+  cout << ACE_OS::getpid () << ": bound with " << i << endl;
 		
   return 0;
 
diff --git a/examples/Naming/test_writers.cpp b/examples/Naming/test_writers.cpp
index c8ed315cf1e..9ed87d4959f 100644
--- a/examples/Naming/test_writers.cpp
+++ b/examples/Naming/test_writers.cpp
@@ -4,16 +4,19 @@ int main (int, char *[])
 {
   int i;
     
-  ACE_Naming_Context * ns_ptr = new ACE_Naming_Context();
+  ACE_Naming_Context * ns_ptr = new ACE_Naming_Context ();
   ACE_Name_Options *name_options = ns_ptr->name_options ();
      
-  char * m_argv[] = {"MyName","-cNODE_LOCAL",NULL};
-  int m_argc = sizeof ( m_argv ) / sizeof ( char * ) -1;
+  char * m_argv[] = {"MyName", 
+                     "-cNODE_LOCAL", 
+                     NULL};
 
-  name_options->parse_args(m_argc,m_argv);
+  int m_argc = sizeof (m_argv) / sizeof (char *) -1;
+
+  name_options->parse_args (m_argc,m_argv);
   i = ns_ptr->open (ACE_Naming_Context::NODE_LOCAL); 
-  cout << ::getpid() << ": opened with " << i << endl;
-  if ( i != 0 ) return -1;
+  cout << ACE_OS::getpid () << ": opened with " << i << endl;
+  if (i != 0) return -1;
 
   char Key[128];
   char Val[32];
@@ -22,12 +25,12 @@ int main (int, char *[])
   Type[0] = '-';
   Type[1] = '\0';
   
-  for ( int l = 1; l <= 1000 ; l++) {
-    ::sprintf(Key,"K_%05d_%05d",::getpid(),l);
-    ::sprintf(Val,"Val%05d",l);
-    i = ns_ptr->bind(Key,Val,Type);  
-    cout << ::getpid() << ": bind of " << Key << " :" << i << endl;
-    if ( i != 0 ) {
+  for (int l = 1; l <= 1000 ; l++) {
+    ACE_OS::sprintf (Key, "K_%05d_%05d", ACE_OS::getpid(), l);
+    ACE_OS::sprintf (Val, "Val%05d", l);
+    i = ns_ptr->bind (Key, Val, Type);  
+    cout << ACE_OS::getpid() << ": bind of " << Key << " :" << i << endl;
+    if (i != 0) {
       return -1;
     }
     
diff --git a/examples/Reactor/ReactorEx/test_network_events.cpp b/examples/Reactor/ReactorEx/test_network_events.cpp
index a139cff7d7f..c9089044ace 100644
--- a/examples/Reactor/ReactorEx/test_network_events.cpp
+++ b/examples/Reactor/ReactorEx/test_network_events.cpp
@@ -150,16 +150,13 @@ Network_Listener::handle_input (ACE_HANDLE handle)
   ACE_INET_Addr remote_address;
   ACE_SOCK_Stream stream;
 
-  int reset_new_handle = 0;
-#if defined (ACE_WIN32)
   // Try to find out if the implementation of the reactor that we are
-  // using is the WFMO_Reactor. If so we need to reset the event
-  // association for the newly created handle. This is because the
-  // newly created handle will inherit the properties of the listen
-  // handle, including its event associations.
-  reset_new_handle = this->reactor ()->reset_new_handle ();
-#endif /* ACE_WIN32 */
-  
+  // using requires us to reset the event association for the newly
+  // created handle. This is because the newly created handle will
+  // inherit the properties of the listen handle, including its event
+  // associations.
+  int reset_new_handle = this->reactor ()->uses_event_associations ();
+
   ACE_ASSERT (this->acceptor_.accept (stream, // stream
                                       &remote_address, // remote address
                                       0, // timeout
diff --git a/examples/Reactor/WFMO_Reactor/test_network_events.cpp b/examples/Reactor/WFMO_Reactor/test_network_events.cpp
index a139cff7d7f..c9089044ace 100644
--- a/examples/Reactor/WFMO_Reactor/test_network_events.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_network_events.cpp
@@ -150,16 +150,13 @@ Network_Listener::handle_input (ACE_HANDLE handle)
   ACE_INET_Addr remote_address;
   ACE_SOCK_Stream stream;
 
-  int reset_new_handle = 0;
-#if defined (ACE_WIN32)
   // Try to find out if the implementation of the reactor that we are
-  // using is the WFMO_Reactor. If so we need to reset the event
-  // association for the newly created handle. This is because the
-  // newly created handle will inherit the properties of the listen
-  // handle, including its event associations.
-  reset_new_handle = this->reactor ()->reset_new_handle ();
-#endif /* ACE_WIN32 */
-  
+  // using requires us to reset the event association for the newly
+  // created handle. This is because the newly created handle will
+  // inherit the properties of the listen handle, including its event
+  // associations.
+  int reset_new_handle = this->reactor ()->uses_event_associations ();
+
   ACE_ASSERT (this->acceptor_.accept (stream, // stream
                                       &remote_address, // remote address
                                       0, // timeout
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
index b4f2fee0115..5b3cc84e1c3 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
@@ -84,16 +84,13 @@ Handle_R_Stream::handle_input (int)
   char buf[BUFSIZ];
   int  bytes;
 
-  int reset_new_handle = 0;
-#if defined (ACE_WIN32)
   // Try to find out if the implementation of the reactor that we are
-  // using is the WFMO_Reactor. If so we need to reset the event
-  // association for the newly created handle. This is because the
-  // newly created handle will inherit the properties of the listen
-  // handle, including its event associations.
-  reset_new_handle = ACE_Reactor::instance ()->reset_new_handle ();
-#endif /* ACE_WIN32 */
-  
+  // using requires us to reset the event association for the newly
+  // created handle. This is because the newly created handle will
+  // inherit the properties of the listen handle, including its event
+  // associations.
+  int reset_new_handle = ACE_Reactor::instance ()->uses_event_associations ();
+
   if (this->accept (this->new_remote_stream, // stream
                     0, // remote address
                     0, // timeout