diff options
30 files changed, 629 insertions, 917 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b index b500a19fd4a..c275967f86c 100644 --- a/ChangeLog-97b +++ b/ChangeLog-97b @@ -1,3 +1,11 @@ +Thu Oct 02 15:38:34 1997 <irfan@TWOSTEP> + + * Reactor: Renamed reset_new_handle to uses_event_associations. + + * ace/FIFO_Recv.cpp (ACE_FIFO_Recv): aux_handle_ must correctly be + initialized to ACE_INVALID_HANDLE. Thanks to Sandro Doro + <doros@aureus> for reporting this. + Thu Oct 02 11:21:37 1997 Steve Huston <shuston@riverace.com> * include/makeinclude/platform_{aix aix4.2}.GNU: added the @@ -35,7 +43,9 @@ Wed Oct 01 12:45:51 1997 David L. Levine <levine@cs.wustl.edu> "__unix" because DEC CXX doesn't #define "unix". Thanks to Billy Quinn <bquinn@lads.com> for reporting this. - * ace/High_Res_Timer.h: added comment from Gabe <begeddov@proaxis.com> about ACE_OS::gethrtime () drift on MP machines. + * ace/High_Res_Timer.h: added comment from Gabe + <begeddov@proaxis.com> about ACE_OS::gethrtime () drift on MP + machines. * ace/OS.i (gethrtime, Solaris only): removed ACE_OSCALL_RETURN wrapper around ::gethrtime () because it was broken (the type diff --git a/ace/ACE_Library.mak b/ace/ACE_Library.mak index 3ad4924c503..6222c05865b 100644 --- a/ace/ACE_Library.mak +++ b/ace/ACE_Library.mak @@ -2797,6 +2797,8 @@ DEP_CPP_UPIPE=\ {$(INCLUDE)}"\.\UPIPE_Addr.h"\
{$(INCLUDE)}"\.\UPIPE_Stream.h"\
{$(INCLUDE)}"\.\UPIPE_Stream.i"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -2948,6 +2950,8 @@ DEP_CPP_UPIPE_=\ {$(INCLUDE)}"\.\UPIPE_Connector.i"\
{$(INCLUDE)}"\.\UPIPE_Stream.h"\
{$(INCLUDE)}"\.\UPIPE_Stream.i"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -3100,6 +3104,8 @@ DEP_CPP_UPIPE_A=\ {$(INCLUDE)}"\.\UPIPE_Addr.h"\
{$(INCLUDE)}"\.\UPIPE_Stream.h"\
{$(INCLUDE)}"\.\UPIPE_Stream.i"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -4515,6 +4521,8 @@ DEP_CPP_TASK_=\ {$(INCLUDE)}"\.\Timer_Queue_T.h"\
{$(INCLUDE)}"\.\Timer_Queue_T.i"\
{$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -4895,6 +4903,8 @@ DEP_CPP_SVC_C=\ {$(INCLUDE)}"\.\Timer_Queue_T.h"\
{$(INCLUDE)}"\.\Timer_Queue_T.i"\
{$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -5366,6 +5376,7 @@ DEP_CPP_STRAT=\ {$(INCLUDE)}"\.\Handle_Set.i"\
{$(INCLUDE)}"\.\Hash_Map_Manager.cpp"\
{$(INCLUDE)}"\.\Hash_Map_Manager.h"\
+ {$(INCLUDE)}"\.\IO_Cntl_Msg.h"\
{$(INCLUDE)}"\.\Log_Msg.h"\
{$(INCLUDE)}"\.\Log_Priority.h"\
{$(INCLUDE)}"\.\Log_Record.h"\
@@ -5382,6 +5393,11 @@ DEP_CPP_STRAT=\ {$(INCLUDE)}"\.\Mem_Map.i"\
{$(INCLUDE)}"\.\Memory_Pool.h"\
{$(INCLUDE)}"\.\Memory_Pool.i"\
+ {$(INCLUDE)}"\.\Message_Block.h"\
+ {$(INCLUDE)}"\.\Message_Block.i"\
+ {$(INCLUDE)}"\.\Message_Queue.cpp"\
+ {$(INCLUDE)}"\.\Message_Queue.h"\
+ {$(INCLUDE)}"\.\Message_Queue.i"\
{$(INCLUDE)}"\.\Object_Manager.h"\
{$(INCLUDE)}"\.\Object_Manager.i"\
{$(INCLUDE)}"\.\OS.h"\
@@ -5423,6 +5439,8 @@ DEP_CPP_STRAT=\ {$(INCLUDE)}"\.\Timer_Queue_T.h"\
{$(INCLUDE)}"\.\Timer_Queue_T.i"\
{$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -7006,8 +7024,11 @@ DEP_CPP_SERVICE=\ {$(INCLUDE)}"\.\Get_Opt.i"\
{$(INCLUDE)}"\.\Handle_Set.h"\
{$(INCLUDE)}"\.\Handle_Set.i"\
+ {$(INCLUDE)}"\.\Hash_Map_Manager.cpp"\
+ {$(INCLUDE)}"\.\Hash_Map_Manager.h"\
{$(INCLUDE)}"\.\INET_Addr.h"\
{$(INCLUDE)}"\.\INET_Addr.i"\
+ {$(INCLUDE)}"\.\IO_Cntl_Msg.h"\
{$(INCLUDE)}"\.\IPC_SAP.h"\
{$(INCLUDE)}"\.\IPC_SAP.i"\
{$(INCLUDE)}"\.\Log_Msg.h"\
@@ -7026,6 +7047,11 @@ DEP_CPP_SERVICE=\ {$(INCLUDE)}"\.\Mem_Map.i"\
{$(INCLUDE)}"\.\Memory_Pool.h"\
{$(INCLUDE)}"\.\Memory_Pool.i"\
+ {$(INCLUDE)}"\.\Message_Block.h"\
+ {$(INCLUDE)}"\.\Message_Block.i"\
+ {$(INCLUDE)}"\.\Message_Queue.cpp"\
+ {$(INCLUDE)}"\.\Message_Queue.h"\
+ {$(INCLUDE)}"\.\Message_Queue.i"\
{$(INCLUDE)}"\.\Object_Manager.h"\
{$(INCLUDE)}"\.\Object_Manager.i"\
{$(INCLUDE)}"\.\OS.h"\
@@ -7058,6 +7084,9 @@ DEP_CPP_SERVICE=\ {$(INCLUDE)}"\.\SString.h"\
{$(INCLUDE)}"\.\SString.i"\
{$(INCLUDE)}"\.\stdcpp.h"\
+ {$(INCLUDE)}"\.\Strategies.h"\
+ {$(INCLUDE)}"\.\Strategies_T.cpp"\
+ {$(INCLUDE)}"\.\Strategies_T.h"\
{$(INCLUDE)}"\.\SV_Semaphore_Complex.h"\
{$(INCLUDE)}"\.\SV_Semaphore_Complex.i"\
{$(INCLUDE)}"\.\SV_Semaphore_Simple.h"\
@@ -7065,6 +7094,7 @@ DEP_CPP_SERVICE=\ {$(INCLUDE)}"\.\Svc_Conf_Tokens.h"\
{$(INCLUDE)}"\.\Synch.h"\
{$(INCLUDE)}"\.\Synch.i"\
+ {$(INCLUDE)}"\.\Synch_Options.h"\
{$(INCLUDE)}"\.\Synch_T.cpp"\
{$(INCLUDE)}"\.\Synch_T.h"\
{$(INCLUDE)}"\.\Synch_T.i"\
@@ -7076,6 +7106,8 @@ DEP_CPP_SERVICE=\ {$(INCLUDE)}"\.\Timer_Queue_T.h"\
{$(INCLUDE)}"\.\Timer_Queue_T.i"\
{$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -8472,6 +8504,8 @@ DEP_CPP_PROAC=\ {$(INCLUDE)}"\.\Timer_Wheel_T.cpp"\
{$(INCLUDE)}"\.\Timer_Wheel_T.h"\
{$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -8685,6 +8719,8 @@ DEP_CPP_PARSE=\ {$(INCLUDE)}"\.\Timer_Queue_T.h"\
{$(INCLUDE)}"\.\Timer_Queue_T.i"\
{$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -8886,14 +8922,11 @@ DEP_CPP_OBJEC=\ {$(INCLUDE)}"\.\Containers.i"\
{$(INCLUDE)}"\.\Event_Handler.h"\
{$(INCLUDE)}"\.\Event_Handler.i"\
- {$(INCLUDE)}"\.\Filecache.h"\
{$(INCLUDE)}"\.\Free_List.cpp"\
{$(INCLUDE)}"\.\Free_List.h"\
{$(INCLUDE)}"\.\Free_List.i"\
{$(INCLUDE)}"\.\Handle_Set.h"\
{$(INCLUDE)}"\.\Handle_Set.i"\
- {$(INCLUDE)}"\.\Hash_Map_Manager.cpp"\
- {$(INCLUDE)}"\.\Hash_Map_Manager.h"\
{$(INCLUDE)}"\.\Local_Tokens.h"\
{$(INCLUDE)}"\.\Local_Tokens.i"\
{$(INCLUDE)}"\.\Log_Msg.h"\
@@ -9544,6 +9577,8 @@ DEP_CPP_MULTI=\ {$(INCLUDE)}"\.\Timer_Queue_T.h"\
{$(INCLUDE)}"\.\Timer_Queue_T.i"\
{$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -10112,6 +10147,9 @@ DEP_CPP_LSOCK_=\ # Begin Source File
SOURCE=.\LSOCK_Connector.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
DEP_CPP_LSOCK_C=\
{$(INCLUDE)}"\.\ACE.h"\
{$(INCLUDE)}"\.\ACE.i"\
@@ -10162,26 +10200,167 @@ DEP_CPP_LSOCK_C=\ {$(INCLUDE)}"\.\ws2tcpip.h"\
-!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
-
-
"$(INTDIR)\LSOCK_Connector.obj" : $(SOURCE) $(DEP_CPP_LSOCK_C) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+DEP_CPP_LSOCK_C=\
+ {$(INCLUDE)}"\.\ACE.h"\
+ {$(INCLUDE)}"\.\ACE.i"\
+ {$(INCLUDE)}"\.\Addr.h"\
+ {$(INCLUDE)}"\.\Addr.i"\
+ {$(INCLUDE)}"\.\Auto_Ptr.cpp"\
+ {$(INCLUDE)}"\.\Auto_Ptr.h"\
+ {$(INCLUDE)}"\.\Auto_Ptr.i"\
+ {$(INCLUDE)}"\.\config-win32-common.h"\
+ {$(INCLUDE)}"\.\config-win32.h"\
+ {$(INCLUDE)}"\.\config.h"\
+ {$(INCLUDE)}"\.\INET_Addr.h"\
+ {$(INCLUDE)}"\.\INET_Addr.i"\
+ {$(INCLUDE)}"\.\IPC_SAP.h"\
+ {$(INCLUDE)}"\.\IPC_SAP.i"\
+ {$(INCLUDE)}"\.\Log_Msg.h"\
+ {$(INCLUDE)}"\.\Log_Priority.h"\
+ {$(INCLUDE)}"\.\Log_Record.h"\
+ {$(INCLUDE)}"\.\Log_Record.i"\
+ {$(INCLUDE)}"\.\LSOCK.h"\
+ {$(INCLUDE)}"\.\LSOCK.i"\
+ {$(INCLUDE)}"\.\LSOCK_Connector.h"\
+ {$(INCLUDE)}"\.\LSOCK_Connector.i"\
+ {$(INCLUDE)}"\.\LSOCK_Stream.h"\
+ {$(INCLUDE)}"\.\LSOCK_Stream.i"\
+ {$(INCLUDE)}"\.\Managed_Object.cpp"\
+ {$(INCLUDE)}"\.\Managed_Object.h"\
+ {$(INCLUDE)}"\.\Managed_Object.i"\
+ {$(INCLUDE)}"\.\Object_Manager.h"\
+ {$(INCLUDE)}"\.\Object_Manager.i"\
+ {$(INCLUDE)}"\.\OS.h"\
+ {$(INCLUDE)}"\.\OS.i"\
+ {$(INCLUDE)}"\.\SOCK.h"\
+ {$(INCLUDE)}"\.\SOCK.i"\
+ {$(INCLUDE)}"\.\SOCK_Connector.h"\
+ {$(INCLUDE)}"\.\SOCK_Connector.i"\
+ {$(INCLUDE)}"\.\SOCK_IO.h"\
+ {$(INCLUDE)}"\.\SOCK_IO.i"\
+ {$(INCLUDE)}"\.\SOCK_Stream.h"\
+ {$(INCLUDE)}"\.\SOCK_Stream.i"\
+ {$(INCLUDE)}"\.\SString.h"\
+ {$(INCLUDE)}"\.\SString.i"\
+ {$(INCLUDE)}"\.\stdcpp.h"\
+ {$(INCLUDE)}"\.\Time_Value.h"\
+ {$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\UNIX_Addr.h"\
+ {$(INCLUDE)}"\.\UNIX_Addr.i"\
+ {$(INCLUDE)}"\.\ws2tcpip.h"\
+
"$(INTDIR)\LSOCK_Connector.obj" : $(SOURCE) $(DEP_CPP_LSOCK_C) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+DEP_CPP_LSOCK_C=\
+ {$(INCLUDE)}"\.\ACE.h"\
+ {$(INCLUDE)}"\.\ACE.i"\
+ {$(INCLUDE)}"\.\Addr.h"\
+ {$(INCLUDE)}"\.\Addr.i"\
+ {$(INCLUDE)}"\.\Auto_Ptr.cpp"\
+ {$(INCLUDE)}"\.\Auto_Ptr.h"\
+ {$(INCLUDE)}"\.\Auto_Ptr.i"\
+ {$(INCLUDE)}"\.\config-win32-common.h"\
+ {$(INCLUDE)}"\.\config-win32.h"\
+ {$(INCLUDE)}"\.\config.h"\
+ {$(INCLUDE)}"\.\INET_Addr.h"\
+ {$(INCLUDE)}"\.\INET_Addr.i"\
+ {$(INCLUDE)}"\.\IPC_SAP.h"\
+ {$(INCLUDE)}"\.\IPC_SAP.i"\
+ {$(INCLUDE)}"\.\Log_Msg.h"\
+ {$(INCLUDE)}"\.\Log_Priority.h"\
+ {$(INCLUDE)}"\.\Log_Record.h"\
+ {$(INCLUDE)}"\.\Log_Record.i"\
+ {$(INCLUDE)}"\.\LSOCK.h"\
+ {$(INCLUDE)}"\.\LSOCK.i"\
+ {$(INCLUDE)}"\.\LSOCK_Connector.h"\
+ {$(INCLUDE)}"\.\LSOCK_Connector.i"\
+ {$(INCLUDE)}"\.\LSOCK_Stream.h"\
+ {$(INCLUDE)}"\.\LSOCK_Stream.i"\
+ {$(INCLUDE)}"\.\Managed_Object.cpp"\
+ {$(INCLUDE)}"\.\Managed_Object.h"\
+ {$(INCLUDE)}"\.\Managed_Object.i"\
+ {$(INCLUDE)}"\.\Object_Manager.h"\
+ {$(INCLUDE)}"\.\Object_Manager.i"\
+ {$(INCLUDE)}"\.\OS.h"\
+ {$(INCLUDE)}"\.\OS.i"\
+ {$(INCLUDE)}"\.\SOCK.h"\
+ {$(INCLUDE)}"\.\SOCK.i"\
+ {$(INCLUDE)}"\.\SOCK_Connector.h"\
+ {$(INCLUDE)}"\.\SOCK_Connector.i"\
+ {$(INCLUDE)}"\.\SOCK_IO.h"\
+ {$(INCLUDE)}"\.\SOCK_IO.i"\
+ {$(INCLUDE)}"\.\SOCK_Stream.h"\
+ {$(INCLUDE)}"\.\SOCK_Stream.i"\
+ {$(INCLUDE)}"\.\SString.h"\
+ {$(INCLUDE)}"\.\SString.i"\
+ {$(INCLUDE)}"\.\stdcpp.h"\
+ {$(INCLUDE)}"\.\Time_Value.h"\
+ {$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\UNIX_Addr.h"\
+ {$(INCLUDE)}"\.\UNIX_Addr.i"\
+ {$(INCLUDE)}"\.\ws2tcpip.h"\
+
"$(INTDIR)\LSOCK_Connector.obj" : $(SOURCE) $(DEP_CPP_LSOCK_C) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+DEP_CPP_LSOCK_C=\
+ {$(INCLUDE)}"\.\ACE.h"\
+ {$(INCLUDE)}"\.\ACE.i"\
+ {$(INCLUDE)}"\.\Addr.h"\
+ {$(INCLUDE)}"\.\Addr.i"\
+ {$(INCLUDE)}"\.\Auto_Ptr.cpp"\
+ {$(INCLUDE)}"\.\Auto_Ptr.h"\
+ {$(INCLUDE)}"\.\Auto_Ptr.i"\
+ {$(INCLUDE)}"\.\config-win32-common.h"\
+ {$(INCLUDE)}"\.\config-win32.h"\
+ {$(INCLUDE)}"\.\config.h"\
+ {$(INCLUDE)}"\.\INET_Addr.h"\
+ {$(INCLUDE)}"\.\INET_Addr.i"\
+ {$(INCLUDE)}"\.\IPC_SAP.h"\
+ {$(INCLUDE)}"\.\IPC_SAP.i"\
+ {$(INCLUDE)}"\.\Log_Msg.h"\
+ {$(INCLUDE)}"\.\Log_Priority.h"\
+ {$(INCLUDE)}"\.\Log_Record.h"\
+ {$(INCLUDE)}"\.\Log_Record.i"\
+ {$(INCLUDE)}"\.\LSOCK_Connector.h"\
+ {$(INCLUDE)}"\.\LSOCK_Connector.i"\
+ {$(INCLUDE)}"\.\LSOCK_Stream.h"\
+ {$(INCLUDE)}"\.\Managed_Object.cpp"\
+ {$(INCLUDE)}"\.\Managed_Object.h"\
+ {$(INCLUDE)}"\.\Managed_Object.i"\
+ {$(INCLUDE)}"\.\Object_Manager.h"\
+ {$(INCLUDE)}"\.\Object_Manager.i"\
+ {$(INCLUDE)}"\.\OS.h"\
+ {$(INCLUDE)}"\.\OS.i"\
+ {$(INCLUDE)}"\.\SOCK.h"\
+ {$(INCLUDE)}"\.\SOCK.i"\
+ {$(INCLUDE)}"\.\SOCK_Connector.h"\
+ {$(INCLUDE)}"\.\SOCK_Connector.i"\
+ {$(INCLUDE)}"\.\SOCK_IO.h"\
+ {$(INCLUDE)}"\.\SOCK_IO.i"\
+ {$(INCLUDE)}"\.\SOCK_Stream.h"\
+ {$(INCLUDE)}"\.\SOCK_Stream.i"\
+ {$(INCLUDE)}"\.\SString.h"\
+ {$(INCLUDE)}"\.\SString.i"\
+ {$(INCLUDE)}"\.\stdcpp.h"\
+ {$(INCLUDE)}"\.\Time_Value.h"\
+ {$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\UNIX_Addr.h"\
+ {$(INCLUDE)}"\.\UNIX_Addr.i"\
+ {$(INCLUDE)}"\.\ws2tcpip.h"\
+
"$(INTDIR)\LSOCK_Connector.obj" : $(SOURCE) $(DEP_CPP_LSOCK_C) "$(INTDIR)"
@@ -10265,6 +10444,9 @@ DEP_CPP_LSOCK_CO=\ # Begin Source File
SOURCE=.\LSOCK_Acceptor.cpp
+
+!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
+
DEP_CPP_LSOCK_A=\
{$(INCLUDE)}"\.\ACE.h"\
{$(INCLUDE)}"\.\ACE.i"\
@@ -10315,26 +10497,167 @@ DEP_CPP_LSOCK_A=\ {$(INCLUDE)}"\.\ws2tcpip.h"\
-!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
-
-
"$(INTDIR)\LSOCK_Acceptor.obj" : $(SOURCE) $(DEP_CPP_LSOCK_A) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"
+DEP_CPP_LSOCK_A=\
+ {$(INCLUDE)}"\.\ACE.h"\
+ {$(INCLUDE)}"\.\ACE.i"\
+ {$(INCLUDE)}"\.\Addr.h"\
+ {$(INCLUDE)}"\.\Addr.i"\
+ {$(INCLUDE)}"\.\Auto_Ptr.cpp"\
+ {$(INCLUDE)}"\.\Auto_Ptr.h"\
+ {$(INCLUDE)}"\.\Auto_Ptr.i"\
+ {$(INCLUDE)}"\.\config-win32-common.h"\
+ {$(INCLUDE)}"\.\config-win32.h"\
+ {$(INCLUDE)}"\.\config.h"\
+ {$(INCLUDE)}"\.\INET_Addr.h"\
+ {$(INCLUDE)}"\.\INET_Addr.i"\
+ {$(INCLUDE)}"\.\IPC_SAP.h"\
+ {$(INCLUDE)}"\.\IPC_SAP.i"\
+ {$(INCLUDE)}"\.\Log_Msg.h"\
+ {$(INCLUDE)}"\.\Log_Priority.h"\
+ {$(INCLUDE)}"\.\Log_Record.h"\
+ {$(INCLUDE)}"\.\Log_Record.i"\
+ {$(INCLUDE)}"\.\LSOCK.h"\
+ {$(INCLUDE)}"\.\LSOCK.i"\
+ {$(INCLUDE)}"\.\LSOCK_Acceptor.h"\
+ {$(INCLUDE)}"\.\LSOCK_Acceptor.i"\
+ {$(INCLUDE)}"\.\LSOCK_Stream.h"\
+ {$(INCLUDE)}"\.\LSOCK_Stream.i"\
+ {$(INCLUDE)}"\.\Managed_Object.cpp"\
+ {$(INCLUDE)}"\.\Managed_Object.h"\
+ {$(INCLUDE)}"\.\Managed_Object.i"\
+ {$(INCLUDE)}"\.\Object_Manager.h"\
+ {$(INCLUDE)}"\.\Object_Manager.i"\
+ {$(INCLUDE)}"\.\OS.h"\
+ {$(INCLUDE)}"\.\OS.i"\
+ {$(INCLUDE)}"\.\SOCK.h"\
+ {$(INCLUDE)}"\.\SOCK.i"\
+ {$(INCLUDE)}"\.\SOCK_Acceptor.h"\
+ {$(INCLUDE)}"\.\SOCK_Acceptor.i"\
+ {$(INCLUDE)}"\.\SOCK_IO.h"\
+ {$(INCLUDE)}"\.\SOCK_IO.i"\
+ {$(INCLUDE)}"\.\SOCK_Stream.h"\
+ {$(INCLUDE)}"\.\SOCK_Stream.i"\
+ {$(INCLUDE)}"\.\SString.h"\
+ {$(INCLUDE)}"\.\SString.i"\
+ {$(INCLUDE)}"\.\stdcpp.h"\
+ {$(INCLUDE)}"\.\Time_Value.h"\
+ {$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\UNIX_Addr.h"\
+ {$(INCLUDE)}"\.\UNIX_Addr.i"\
+ {$(INCLUDE)}"\.\ws2tcpip.h"\
+
"$(INTDIR)\LSOCK_Acceptor.obj" : $(SOURCE) $(DEP_CPP_LSOCK_A) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"
+DEP_CPP_LSOCK_A=\
+ {$(INCLUDE)}"\.\ACE.h"\
+ {$(INCLUDE)}"\.\ACE.i"\
+ {$(INCLUDE)}"\.\Addr.h"\
+ {$(INCLUDE)}"\.\Addr.i"\
+ {$(INCLUDE)}"\.\Auto_Ptr.cpp"\
+ {$(INCLUDE)}"\.\Auto_Ptr.h"\
+ {$(INCLUDE)}"\.\Auto_Ptr.i"\
+ {$(INCLUDE)}"\.\config-win32-common.h"\
+ {$(INCLUDE)}"\.\config-win32.h"\
+ {$(INCLUDE)}"\.\config.h"\
+ {$(INCLUDE)}"\.\INET_Addr.h"\
+ {$(INCLUDE)}"\.\INET_Addr.i"\
+ {$(INCLUDE)}"\.\IPC_SAP.h"\
+ {$(INCLUDE)}"\.\IPC_SAP.i"\
+ {$(INCLUDE)}"\.\Log_Msg.h"\
+ {$(INCLUDE)}"\.\Log_Priority.h"\
+ {$(INCLUDE)}"\.\Log_Record.h"\
+ {$(INCLUDE)}"\.\Log_Record.i"\
+ {$(INCLUDE)}"\.\LSOCK.h"\
+ {$(INCLUDE)}"\.\LSOCK.i"\
+ {$(INCLUDE)}"\.\LSOCK_Acceptor.h"\
+ {$(INCLUDE)}"\.\LSOCK_Acceptor.i"\
+ {$(INCLUDE)}"\.\LSOCK_Stream.h"\
+ {$(INCLUDE)}"\.\LSOCK_Stream.i"\
+ {$(INCLUDE)}"\.\Managed_Object.cpp"\
+ {$(INCLUDE)}"\.\Managed_Object.h"\
+ {$(INCLUDE)}"\.\Managed_Object.i"\
+ {$(INCLUDE)}"\.\Object_Manager.h"\
+ {$(INCLUDE)}"\.\Object_Manager.i"\
+ {$(INCLUDE)}"\.\OS.h"\
+ {$(INCLUDE)}"\.\OS.i"\
+ {$(INCLUDE)}"\.\SOCK.h"\
+ {$(INCLUDE)}"\.\SOCK.i"\
+ {$(INCLUDE)}"\.\SOCK_Acceptor.h"\
+ {$(INCLUDE)}"\.\SOCK_Acceptor.i"\
+ {$(INCLUDE)}"\.\SOCK_IO.h"\
+ {$(INCLUDE)}"\.\SOCK_IO.i"\
+ {$(INCLUDE)}"\.\SOCK_Stream.h"\
+ {$(INCLUDE)}"\.\SOCK_Stream.i"\
+ {$(INCLUDE)}"\.\SString.h"\
+ {$(INCLUDE)}"\.\SString.i"\
+ {$(INCLUDE)}"\.\stdcpp.h"\
+ {$(INCLUDE)}"\.\Time_Value.h"\
+ {$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\UNIX_Addr.h"\
+ {$(INCLUDE)}"\.\UNIX_Addr.i"\
+ {$(INCLUDE)}"\.\ws2tcpip.h"\
+
"$(INTDIR)\LSOCK_Acceptor.obj" : $(SOURCE) $(DEP_CPP_LSOCK_A) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ACE dynamic library - Win32 Release"
+DEP_CPP_LSOCK_A=\
+ {$(INCLUDE)}"\.\ACE.h"\
+ {$(INCLUDE)}"\.\ACE.i"\
+ {$(INCLUDE)}"\.\Addr.h"\
+ {$(INCLUDE)}"\.\Addr.i"\
+ {$(INCLUDE)}"\.\Auto_Ptr.cpp"\
+ {$(INCLUDE)}"\.\Auto_Ptr.h"\
+ {$(INCLUDE)}"\.\Auto_Ptr.i"\
+ {$(INCLUDE)}"\.\config-win32-common.h"\
+ {$(INCLUDE)}"\.\config-win32.h"\
+ {$(INCLUDE)}"\.\config.h"\
+ {$(INCLUDE)}"\.\INET_Addr.h"\
+ {$(INCLUDE)}"\.\INET_Addr.i"\
+ {$(INCLUDE)}"\.\IPC_SAP.h"\
+ {$(INCLUDE)}"\.\IPC_SAP.i"\
+ {$(INCLUDE)}"\.\Log_Msg.h"\
+ {$(INCLUDE)}"\.\Log_Priority.h"\
+ {$(INCLUDE)}"\.\Log_Record.h"\
+ {$(INCLUDE)}"\.\Log_Record.i"\
+ {$(INCLUDE)}"\.\LSOCK_Acceptor.h"\
+ {$(INCLUDE)}"\.\LSOCK_Acceptor.i"\
+ {$(INCLUDE)}"\.\LSOCK_Stream.h"\
+ {$(INCLUDE)}"\.\Managed_Object.cpp"\
+ {$(INCLUDE)}"\.\Managed_Object.h"\
+ {$(INCLUDE)}"\.\Managed_Object.i"\
+ {$(INCLUDE)}"\.\Object_Manager.h"\
+ {$(INCLUDE)}"\.\Object_Manager.i"\
+ {$(INCLUDE)}"\.\OS.h"\
+ {$(INCLUDE)}"\.\OS.i"\
+ {$(INCLUDE)}"\.\SOCK.h"\
+ {$(INCLUDE)}"\.\SOCK.i"\
+ {$(INCLUDE)}"\.\SOCK_Acceptor.h"\
+ {$(INCLUDE)}"\.\SOCK_Acceptor.i"\
+ {$(INCLUDE)}"\.\SOCK_IO.h"\
+ {$(INCLUDE)}"\.\SOCK_IO.i"\
+ {$(INCLUDE)}"\.\SOCK_Stream.h"\
+ {$(INCLUDE)}"\.\SOCK_Stream.i"\
+ {$(INCLUDE)}"\.\SString.h"\
+ {$(INCLUDE)}"\.\SString.i"\
+ {$(INCLUDE)}"\.\stdcpp.h"\
+ {$(INCLUDE)}"\.\Time_Value.h"\
+ {$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\UNIX_Addr.h"\
+ {$(INCLUDE)}"\.\UNIX_Addr.i"\
+ {$(INCLUDE)}"\.\ws2tcpip.h"\
+
"$(INTDIR)\LSOCK_Acceptor.obj" : $(SOURCE) $(DEP_CPP_LSOCK_A) "$(INTDIR)"
@@ -10903,7 +11226,6 @@ DEP_CPP_IOSTR=\ {$(INCLUDE)}"\.\Handle_Set.i"\
{$(INCLUDE)}"\.\INET_Addr.h"\
{$(INCLUDE)}"\.\INET_Addr.i"\
- {$(INCLUDE)}"\.\IOStream.h"\
{$(INCLUDE)}"\.\IOStream_T.cpp"\
{$(INCLUDE)}"\.\IOStream_T.h"\
{$(INCLUDE)}"\.\IOStream_T.i"\
@@ -10923,6 +11245,7 @@ DEP_CPP_IOSTR=\ {$(INCLUDE)}"\.\stdcpp.h"\
{$(INCLUDE)}"\.\Trace.h"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
+ {$(INCLUDE)}"\IOSTREAM.H"\
!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
@@ -12608,6 +12931,8 @@ DEP_CPP_CORBA=\ {$(INCLUDE)}"\.\Synch_T.i"\
{$(INCLUDE)}"\.\Thread.h"\
{$(INCLUDE)}"\.\Thread.i"\
+ {$(INCLUDE)}"\.\Thread_Manager.h"\
+ {$(INCLUDE)}"\.\Thread_Manager.i"\
{$(INCLUDE)}"\.\Timer_Queue.h"\
{$(INCLUDE)}"\.\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\.\Timer_Queue_T.h"\
@@ -13013,6 +13338,8 @@ DEP_CPP_ACTIV=\ {$(INCLUDE)}"\.\Timer_Queue_T.h"\
{$(INCLUDE)}"\.\Timer_Queue_T.i"\
{$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -13257,6 +13584,8 @@ DEP_CPP_SERVICE_T=\ {$(INCLUDE)}"\.\Timer_Queue_T.h"\
{$(INCLUDE)}"\.\Timer_Queue_T.i"\
{$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -13684,6 +14013,8 @@ DEP_CPP_UPIPE=\ {$(INCLUDE)}"\.\UPIPE_Addr.h"\
{$(INCLUDE)}"\.\UPIPE_Stream.h"\
{$(INCLUDE)}"\.\UPIPE_Stream.i"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -13835,6 +14166,8 @@ DEP_CPP_UPIPE_=\ {$(INCLUDE)}"\.\UPIPE_Connector.i"\
{$(INCLUDE)}"\.\UPIPE_Stream.h"\
{$(INCLUDE)}"\.\UPIPE_Stream.i"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -13987,6 +14320,8 @@ DEP_CPP_UPIPE_A=\ {$(INCLUDE)}"\.\UPIPE_Addr.h"\
{$(INCLUDE)}"\.\UPIPE_Stream.h"\
{$(INCLUDE)}"\.\UPIPE_Stream.i"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -15402,6 +15737,8 @@ DEP_CPP_TASK_=\ {$(INCLUDE)}"\.\Timer_Queue_T.h"\
{$(INCLUDE)}"\.\Timer_Queue_T.i"\
{$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -15782,6 +16119,8 @@ DEP_CPP_SVC_C=\ {$(INCLUDE)}"\.\Timer_Queue_T.h"\
{$(INCLUDE)}"\.\Timer_Queue_T.i"\
{$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -16253,6 +16592,7 @@ DEP_CPP_STRAT=\ {$(INCLUDE)}"\.\Handle_Set.i"\
{$(INCLUDE)}"\.\Hash_Map_Manager.cpp"\
{$(INCLUDE)}"\.\Hash_Map_Manager.h"\
+ {$(INCLUDE)}"\.\IO_Cntl_Msg.h"\
{$(INCLUDE)}"\.\Log_Msg.h"\
{$(INCLUDE)}"\.\Log_Priority.h"\
{$(INCLUDE)}"\.\Log_Record.h"\
@@ -16269,6 +16609,11 @@ DEP_CPP_STRAT=\ {$(INCLUDE)}"\.\Mem_Map.i"\
{$(INCLUDE)}"\.\Memory_Pool.h"\
{$(INCLUDE)}"\.\Memory_Pool.i"\
+ {$(INCLUDE)}"\.\Message_Block.h"\
+ {$(INCLUDE)}"\.\Message_Block.i"\
+ {$(INCLUDE)}"\.\Message_Queue.cpp"\
+ {$(INCLUDE)}"\.\Message_Queue.h"\
+ {$(INCLUDE)}"\.\Message_Queue.i"\
{$(INCLUDE)}"\.\Object_Manager.h"\
{$(INCLUDE)}"\.\Object_Manager.i"\
{$(INCLUDE)}"\.\OS.h"\
@@ -16310,6 +16655,8 @@ DEP_CPP_STRAT=\ {$(INCLUDE)}"\.\Timer_Queue_T.h"\
{$(INCLUDE)}"\.\Timer_Queue_T.i"\
{$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -17893,8 +18240,11 @@ DEP_CPP_SERVICE=\ {$(INCLUDE)}"\.\Get_Opt.i"\
{$(INCLUDE)}"\.\Handle_Set.h"\
{$(INCLUDE)}"\.\Handle_Set.i"\
+ {$(INCLUDE)}"\.\Hash_Map_Manager.cpp"\
+ {$(INCLUDE)}"\.\Hash_Map_Manager.h"\
{$(INCLUDE)}"\.\INET_Addr.h"\
{$(INCLUDE)}"\.\INET_Addr.i"\
+ {$(INCLUDE)}"\.\IO_Cntl_Msg.h"\
{$(INCLUDE)}"\.\IPC_SAP.h"\
{$(INCLUDE)}"\.\IPC_SAP.i"\
{$(INCLUDE)}"\.\Log_Msg.h"\
@@ -17913,6 +18263,11 @@ DEP_CPP_SERVICE=\ {$(INCLUDE)}"\.\Mem_Map.i"\
{$(INCLUDE)}"\.\Memory_Pool.h"\
{$(INCLUDE)}"\.\Memory_Pool.i"\
+ {$(INCLUDE)}"\.\Message_Block.h"\
+ {$(INCLUDE)}"\.\Message_Block.i"\
+ {$(INCLUDE)}"\.\Message_Queue.cpp"\
+ {$(INCLUDE)}"\.\Message_Queue.h"\
+ {$(INCLUDE)}"\.\Message_Queue.i"\
{$(INCLUDE)}"\.\Object_Manager.h"\
{$(INCLUDE)}"\.\Object_Manager.i"\
{$(INCLUDE)}"\.\OS.h"\
@@ -17945,6 +18300,9 @@ DEP_CPP_SERVICE=\ {$(INCLUDE)}"\.\SString.h"\
{$(INCLUDE)}"\.\SString.i"\
{$(INCLUDE)}"\.\stdcpp.h"\
+ {$(INCLUDE)}"\.\Strategies.h"\
+ {$(INCLUDE)}"\.\Strategies_T.cpp"\
+ {$(INCLUDE)}"\.\Strategies_T.h"\
{$(INCLUDE)}"\.\SV_Semaphore_Complex.h"\
{$(INCLUDE)}"\.\SV_Semaphore_Complex.i"\
{$(INCLUDE)}"\.\SV_Semaphore_Simple.h"\
@@ -17952,6 +18310,7 @@ DEP_CPP_SERVICE=\ {$(INCLUDE)}"\.\Svc_Conf_Tokens.h"\
{$(INCLUDE)}"\.\Synch.h"\
{$(INCLUDE)}"\.\Synch.i"\
+ {$(INCLUDE)}"\.\Synch_Options.h"\
{$(INCLUDE)}"\.\Synch_T.cpp"\
{$(INCLUDE)}"\.\Synch_T.h"\
{$(INCLUDE)}"\.\Synch_T.i"\
@@ -17963,6 +18322,8 @@ DEP_CPP_SERVICE=\ {$(INCLUDE)}"\.\Timer_Queue_T.h"\
{$(INCLUDE)}"\.\Timer_Queue_T.i"\
{$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -19359,6 +19720,8 @@ DEP_CPP_PROAC=\ {$(INCLUDE)}"\.\Timer_Wheel_T.cpp"\
{$(INCLUDE)}"\.\Timer_Wheel_T.h"\
{$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -19572,6 +19935,8 @@ DEP_CPP_PARSE=\ {$(INCLUDE)}"\.\Timer_Queue_T.h"\
{$(INCLUDE)}"\.\Timer_Queue_T.i"\
{$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -19773,14 +20138,11 @@ DEP_CPP_OBJEC=\ {$(INCLUDE)}"\.\Containers.i"\
{$(INCLUDE)}"\.\Event_Handler.h"\
{$(INCLUDE)}"\.\Event_Handler.i"\
- {$(INCLUDE)}"\.\Filecache.h"\
{$(INCLUDE)}"\.\Free_List.cpp"\
{$(INCLUDE)}"\.\Free_List.h"\
{$(INCLUDE)}"\.\Free_List.i"\
{$(INCLUDE)}"\.\Handle_Set.h"\
{$(INCLUDE)}"\.\Handle_Set.i"\
- {$(INCLUDE)}"\.\Hash_Map_Manager.cpp"\
- {$(INCLUDE)}"\.\Hash_Map_Manager.h"\
{$(INCLUDE)}"\.\Local_Tokens.h"\
{$(INCLUDE)}"\.\Local_Tokens.i"\
{$(INCLUDE)}"\.\Log_Msg.h"\
@@ -20431,6 +20793,8 @@ DEP_CPP_MULTI=\ {$(INCLUDE)}"\.\Timer_Queue_T.h"\
{$(INCLUDE)}"\.\Timer_Queue_T.i"\
{$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -21790,7 +22154,6 @@ DEP_CPP_IOSTR=\ {$(INCLUDE)}"\.\Handle_Set.i"\
{$(INCLUDE)}"\.\INET_Addr.h"\
{$(INCLUDE)}"\.\INET_Addr.i"\
- {$(INCLUDE)}"\.\IOStream.h"\
{$(INCLUDE)}"\.\IOStream_T.cpp"\
{$(INCLUDE)}"\.\IOStream_T.h"\
{$(INCLUDE)}"\.\IOStream_T.i"\
@@ -21810,6 +22173,7 @@ DEP_CPP_IOSTR=\ {$(INCLUDE)}"\.\stdcpp.h"\
{$(INCLUDE)}"\.\Trace.h"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
+ {$(INCLUDE)}"\IOSTREAM.H"\
!IF "$(CFG)" == "ACE static library - Win32 Release"
@@ -23495,6 +23859,8 @@ DEP_CPP_CORBA=\ {$(INCLUDE)}"\.\Synch_T.i"\
{$(INCLUDE)}"\.\Thread.h"\
{$(INCLUDE)}"\.\Thread.i"\
+ {$(INCLUDE)}"\.\Thread_Manager.h"\
+ {$(INCLUDE)}"\.\Thread_Manager.i"\
{$(INCLUDE)}"\.\Timer_Queue.h"\
{$(INCLUDE)}"\.\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\.\Timer_Queue_T.h"\
@@ -23900,6 +24266,8 @@ DEP_CPP_ACTIV=\ {$(INCLUDE)}"\.\Timer_Queue_T.h"\
{$(INCLUDE)}"\.\Timer_Queue_T.i"\
{$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
@@ -24144,6 +24512,8 @@ DEP_CPP_SERVICE_T=\ {$(INCLUDE)}"\.\Timer_Queue_T.h"\
{$(INCLUDE)}"\.\Timer_Queue_T.i"\
{$(INCLUDE)}"\.\Trace.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\.\WFMO_Reactor.i"\
{$(INCLUDE)}"\.\ws2tcpip.h"\
diff --git a/ace/ACE_Library.mdp b/ace/ACE_Library.mdp Binary files differindex 0882cc1970e..c88cdb00eb5 100644 --- a/ace/ACE_Library.mdp +++ b/ace/ACE_Library.mdp diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp index 137886ead72..1b03f190cc5 100644 --- a/ace/Acceptor.cpp +++ b/ace/Acceptor.cpp @@ -223,16 +223,13 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler { ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler"); - int reset_new_handle = 0; -#if defined (ACE_WIN32) // Try to find out if the implementation of the reactor that we are // 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. - reset_new_handle = this->reactor ()->reset_new_handle (); -#endif /* ACE_WIN32 */ - + int reset_new_handle = this->reactor ()->uses_event_associations (); + if (this->peer_acceptor_.accept (svc_handler->peer (), // stream 0, // remote address 0, // timeout @@ -931,16 +928,13 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE // Cancel any timer that might be pending. this->cancel (); - int reset_new_handle = 0; -#if defined (ACE_WIN32) // Try to find out if the implementation of the reactor that we are // 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. - reset_new_handle = this->reactor ()->reset_new_handle (); -#endif /* ACE_WIN32 */ - + int reset_new_handle = this->reactor ()->uses_event_associations (); + if (this->shared_accept (this->svc_handler_, // stream 0, // remote address 0, // timeout diff --git a/ace/FIFO_Recv.cpp b/ace/FIFO_Recv.cpp index acf85b81058..c30cdcab937 100644 --- a/ace/FIFO_Recv.cpp +++ b/ace/FIFO_Recv.cpp @@ -63,6 +63,7 @@ ACE_FIFO_Recv::ACE_FIFO_Recv (const char *fifo_name, int flags, int perms, int persistent) + : aux_handle_ (ACE_INVALID_HANDLE) { ACE_TRACE ("ACE_FIFO_Recv::ACE_FIFO_Recv"); diff --git a/ace/Reactor.h b/ace/Reactor.h index d981d8aa19a..af956ca19cf 100644 --- a/ace/Reactor.h +++ b/ace/Reactor.h @@ -402,8 +402,9 @@ public: virtual ACE_Reactor_Impl *implementation (void); // Get the implementation class - virtual int reset_new_handle (void); - // Return 1 if we need to reset the handle after accept/connect, 0 otherwise. + virtual int uses_event_associations (void); + // Return 1 if we any event associations were made by the reactor + // for the handles that it waits on, 0 otherwise. ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. diff --git a/ace/Reactor.i b/ace/Reactor.i index d9708d23634..eec9b628ddb 100644 --- a/ace/Reactor.i +++ b/ace/Reactor.i @@ -448,7 +448,7 @@ ACE_Reactor::implementation (ACE_Reactor_Impl *impl) } ACE_INLINE int -ACE_Reactor::reset_new_handle (void) +ACE_Reactor::uses_event_associations (void) { - return this->implementation ()->reset_new_handle (); + return this->implementation ()->uses_event_associations (); } diff --git a/ace/Reactor_Impl.h b/ace/Reactor_Impl.h index d3c941e5472..08805671dc2 100644 --- a/ace/Reactor_Impl.h +++ b/ace/Reactor_Impl.h @@ -205,7 +205,10 @@ public: virtual int resume_handlers (void) = 0; // Resume all <handles>. - virtual int reset_new_handle (void) = 0; + virtual int uses_event_associations (void) = 0; + // Return 1 if we any event associations were made by the reactor + // for the handles that it waits on, 0 otherwise. + // If we need to reset handles returned from accept/connect. // Timer management. diff --git a/ace/Select_Reactor.h b/ace/Select_Reactor.h index 7f66b6c03f1..ae350a4fcc0 100644 --- a/ace/Select_Reactor.h +++ b/ace/Select_Reactor.h @@ -486,8 +486,11 @@ public: virtual int resume_handlers (void); // Resume all the <Event_Handlers> in the Select_Reactor. - virtual int reset_new_handle (void); - // If we need to reset handles returned from accept/connect. + virtual int uses_event_associations (void); + // Return 1 if we any event associations were made by the reactor + // for the handles that it waits on, 0 otherwise. Since the + // Select_Reactor does not do any event associations, this function + // always return 0. // = Timer management. virtual long schedule_timer (ACE_Event_Handler *, diff --git a/ace/Select_Reactor.i b/ace/Select_Reactor.i index f87a09c32b9..6b8f992b50c 100644 --- a/ace/Select_Reactor.i +++ b/ace/Select_Reactor.i @@ -108,9 +108,11 @@ ACE_Select_Reactor::remove_handler (int signum, } ACE_INLINE int -ACE_Select_Reactor::reset_new_handle (void) +ACE_Select_Reactor::uses_event_associations (void) { - return 0; // Select Reactor doesn't need to reset new handles. + // Since the Select_Reactor does not do any event associations, this + // function always return 0. + return 0; } // = The remaining methods in this file must be called with locks diff --git a/ace/Service_Manager.cpp b/ace/Service_Manager.cpp index cf8654ee294..fb34800eee9 100644 --- a/ace/Service_Manager.cpp +++ b/ace/Service_Manager.cpp @@ -206,16 +206,13 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) { ACE_TRACE ("ACE_Service_Manager::handle_input"); - int reset_new_handle = 0; -#if defined (ACE_WIN32) // Try to find out if the implementation of the reactor that we are // 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. - reset_new_handle = ACE_Reactor::instance ()->reset_new_handle (); -#endif /* ACE_WIN32 */ - + int reset_new_handle = ACE_Reactor::instance ()->uses_event_associations (); + if (this->acceptor_.accept (this->client_stream_, // stream 0, // remote address 0, // timeout diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp index c5233d8f0c1..1ad1a082621 100644 --- a/ace/Strategies_T.cpp +++ b/ace/Strategies_T.cpp @@ -431,16 +431,13 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler { ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler"); - int reset_new_handle = 0; -#if defined (ACE_WIN32) // Try to find out if the implementation of the reactor that we are // 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. - reset_new_handle = this->reactor_->reset_new_handle (); -#endif /* ACE_WIN32 */ - + int reset_new_handle = this->reactor_->uses_event_associations (); + if (this->acceptor_.accept (svc_handler->peer (), // stream 0, // remote address 0, // timeout diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h index b22788bec63..480942e9c26 100644 --- a/ace/WFMO_Reactor.h +++ b/ace/WFMO_Reactor.h @@ -643,8 +643,11 @@ public: virtual int resume_handlers (void); // Resume all <handles>. - virtual int reset_new_handle (void); - // If we need to reset handles returned from accept/connect. + virtual int uses_event_associations (void); + // Return 1 if we any event associations were made by the reactor + // for the handles that it waits on, 0 otherwise. Since the + // WFMO_Reactor does use event associations, this function always + // return 1. // Timer management. diff --git a/ace/WFMO_Reactor.i b/ace/WFMO_Reactor.i index e1be3fd536c..ca350500ac5 100644 --- a/ace/WFMO_Reactor.i +++ b/ace/WFMO_Reactor.i @@ -643,9 +643,11 @@ ACE_WFMO_Reactor::handle_events (ACE_Time_Value &how_long) } ACE_INLINE int -ACE_WFMO_Reactor::reset_new_handle (void) +ACE_WFMO_Reactor::uses_event_associations (void) { - return 1; // WFMO Reactor needs to reset handles. + // Since the WFMO_Reactor does use event associations, this function + // always return 1. + return 1; } ACE_INLINE int 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 Binary files differindex 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 diff --git a/netsvcs/clients/Logger/Logger.mdp b/netsvcs/clients/Logger/Logger.mdp Binary files differindex ebce5cf14f3..e00a77fc84f 100644 --- a/netsvcs/clients/Logger/Logger.mdp +++ b/netsvcs/clients/Logger/Logger.mdp diff --git a/netsvcs/lib/netsvcs.mak b/netsvcs/lib/netsvcs.mak index 4806eee2fd4..2a038811924 100644 --- a/netsvcs/lib/netsvcs.mak +++ b/netsvcs/lib/netsvcs.mak @@ -219,9 +219,6 @@ LINK32_OBJS= \ # Begin Source File
SOURCE=.\Token_Handler.cpp
-
-!IF "$(CFG)" == "netsvcs - Win32 Release"
-
DEP_CPP_TOKEN=\
"..\..\ace\config-win32.h"\
".\Token_Handler.h"\
@@ -355,74 +352,19 @@ DEP_CPP_TOKEN=\ {$(INCLUDE)}"\ace\Token_Request_Reply.h"\
{$(INCLUDE)}"\ace\Token_Request_Reply.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
"$(INTDIR)\Token_Handler.obj" : $(SOURCE) $(DEP_CPP_TOKEN) "$(INTDIR)"
-!ELSEIF "$(CFG)" == "netsvcs - Win32 Debug"
-
-DEP_CPP_TOKEN=\
- "..\..\ace\config-win32.h"\
- ".\Token_Handler.h"\
- {$(INCLUDE)}"\ace\Acceptor.h"\
- {$(INCLUDE)}"\ace\ACE.h"\
- {$(INCLUDE)}"\ace\ACE.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\Event_Handler.h"\
- {$(INCLUDE)}"\ace\Event_Handler.i"\
- {$(INCLUDE)}"\ace\Get_Opt.h"\
- {$(INCLUDE)}"\ace\Get_Opt.i"\
- {$(INCLUDE)}"\ace\Log_Msg.h"\
- {$(INCLUDE)}"\ace\Log_Priority.h"\
- {$(INCLUDE)}"\ace\Log_Record.h"\
- {$(INCLUDE)}"\ace\Log_Record.i"\
- {$(INCLUDE)}"\ace\Managed_Object.cpp"\
- {$(INCLUDE)}"\ace\Managed_Object.h"\
- {$(INCLUDE)}"\ace\Managed_Object.i"\
- {$(INCLUDE)}"\ace\Object_Manager.h"\
- {$(INCLUDE)}"\ace\Object_Manager.i"\
- {$(INCLUDE)}"\ace\OS.h"\
- {$(INCLUDE)}"\ace\OS.i"\
- {$(INCLUDE)}"\ace\Service_Config.h"\
- {$(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\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.h"\
- {$(INCLUDE)}"\ace\Synch_T.i"\
- {$(INCLUDE)}"\ace\Trace.h"\
- {$(INCLUDE)}"\ace\ws2tcpip.h"\
-
-
-"$(INTDIR)\Token_Handler.obj" : $(SOURCE) $(DEP_CPP_TOKEN) "$(INTDIR)"
-
-
-!ENDIF
-
# End Source File
################################################################################
# Begin Source File
SOURCE=.\TS_Clerk_Handler.cpp
-
-!IF "$(CFG)" == "netsvcs - Win32 Release"
-
DEP_CPP_TS_CL=\
"..\..\ace\config-win32.h"\
".\TS_Clerk_Handler.h"\
@@ -551,141 +493,19 @@ DEP_CPP_TS_CL=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
"$(INTDIR)\TS_Clerk_Handler.obj" : $(SOURCE) $(DEP_CPP_TS_CL) "$(INTDIR)"
-!ELSEIF "$(CFG)" == "netsvcs - Win32 Debug"
-
-DEP_CPP_TS_CL=\
- "..\..\ace\config-win32.h"\
- ".\TS_Clerk_Handler.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\Connector.cpp"\
- {$(INCLUDE)}"\ace\Connector.h"\
- {$(INCLUDE)}"\ace\Connector.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\Hash_Map_Manager.cpp"\
- {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\
- {$(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\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\Managed_Object.cpp"\
- {$(INCLUDE)}"\ace\Managed_Object.h"\
- {$(INCLUDE)}"\ace\Managed_Object.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\Service_Config.h"\
- {$(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"\
- {$(INCLUDE)}"\ace\SOCK.h"\
- {$(INCLUDE)}"\ace\SOCK.i"\
- {$(INCLUDE)}"\ace\SOCK_Connector.h"\
- {$(INCLUDE)}"\ace\SOCK_Connector.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_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.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_Request_Reply.h"\
- {$(INCLUDE)}"\ace\Time_Value.h"\
- {$(INCLUDE)}"\ace\Trace.h"\
- {$(INCLUDE)}"\ace\ws2tcpip.h"\
-
-
-"$(INTDIR)\TS_Clerk_Handler.obj" : $(SOURCE) $(DEP_CPP_TS_CL) "$(INTDIR)"
-
-
-!ENDIF
-
# End Source File
################################################################################
# Begin Source File
SOURCE=.\TS_Server_Handler.cpp
-
-!IF "$(CFG)" == "netsvcs - Win32 Release"
-
DEP_CPP_TS_SE=\
"..\..\ace\config-win32.h"\
".\TS_Server_Handler.h"\
@@ -811,105 +631,19 @@ DEP_CPP_TS_SE=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
"$(INTDIR)\TS_Server_Handler.obj" : $(SOURCE) $(DEP_CPP_TS_SE) "$(INTDIR)"
-!ELSEIF "$(CFG)" == "netsvcs - Win32 Debug"
-
-DEP_CPP_TS_SE=\
- "..\..\ace\config-win32.h"\
- ".\TS_Server_Handler.h"\
- {$(INCLUDE)}"\ace\Acceptor.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\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\INET_Addr.h"\
- {$(INCLUDE)}"\ace\INET_Addr.i"\
- {$(INCLUDE)}"\ace\IPC_SAP.h"\
- {$(INCLUDE)}"\ace\IPC_SAP.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\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\Object_Manager.h"\
- {$(INCLUDE)}"\ace\Object_Manager.i"\
- {$(INCLUDE)}"\ace\OS.h"\
- {$(INCLUDE)}"\ace\OS.i"\
- {$(INCLUDE)}"\ace\Service_Config.h"\
- {$(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\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\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.h"\
- {$(INCLUDE)}"\ace\Synch_T.i"\
- {$(INCLUDE)}"\ace\Time_Request_Reply.h"\
- {$(INCLUDE)}"\ace\Time_Value.h"\
- {$(INCLUDE)}"\ace\Trace.h"\
- {$(INCLUDE)}"\ace\ws2tcpip.h"\
-
-
-"$(INTDIR)\TS_Server_Handler.obj" : $(SOURCE) $(DEP_CPP_TS_SE) "$(INTDIR)"
-
-
-!ENDIF
-
# End Source File
################################################################################
# Begin Source File
SOURCE=.\Server_Logging_Handler.cpp
-
-!IF "$(CFG)" == "netsvcs - Win32 Release"
-
DEP_CPP_SERVE=\
"..\..\ace\config-win32.h"\
".\Base_Optimizer.h"\
@@ -1045,100 +779,19 @@ DEP_CPP_SERVE=\ {$(INCLUDE)}"\ace\TLI_Stream.h"\
{$(INCLUDE)}"\ace\TLI_Stream.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
"$(INTDIR)\Server_Logging_Handler.obj" : $(SOURCE) $(DEP_CPP_SERVE) "$(INTDIR)"
-!ELSEIF "$(CFG)" == "netsvcs - Win32 Debug"
-
-DEP_CPP_SERVE=\
- "..\..\ace\config-win32.h"\
- ".\Base_Optimizer.h"\
- ".\Log_Message_Receiver.cpp"\
- ".\Log_Message_Receiver.h"\
- ".\Server_Logging_Handler.h"\
- ".\Server_Logging_Handler_T.cpp"\
- ".\Server_Logging_Handler_T.h"\
- {$(INCLUDE)}"\ace\Acceptor.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\Event_Handler.h"\
- {$(INCLUDE)}"\ace\Event_Handler.i"\
- {$(INCLUDE)}"\ace\Get_Opt.h"\
- {$(INCLUDE)}"\ace\Get_Opt.i"\
- {$(INCLUDE)}"\ace\INET_Addr.h"\
- {$(INCLUDE)}"\ace\INET_Addr.i"\
- {$(INCLUDE)}"\ace\IPC_SAP.h"\
- {$(INCLUDE)}"\ace\IPC_SAP.i"\
- {$(INCLUDE)}"\ace\Log_Msg.h"\
- {$(INCLUDE)}"\ace\Log_Priority.h"\
- {$(INCLUDE)}"\ace\Log_Record.h"\
- {$(INCLUDE)}"\ace\Log_Record.i"\
- {$(INCLUDE)}"\ace\Managed_Object.cpp"\
- {$(INCLUDE)}"\ace\Managed_Object.h"\
- {$(INCLUDE)}"\ace\Managed_Object.i"\
- {$(INCLUDE)}"\ace\Object_Manager.h"\
- {$(INCLUDE)}"\ace\Object_Manager.i"\
- {$(INCLUDE)}"\ace\OS.h"\
- {$(INCLUDE)}"\ace\OS.i"\
- {$(INCLUDE)}"\ace\Service_Config.h"\
- {$(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\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\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.h"\
- {$(INCLUDE)}"\ace\Synch_T.i"\
- {$(INCLUDE)}"\ace\Time_Value.h"\
- {$(INCLUDE)}"\ace\TLI.h"\
- {$(INCLUDE)}"\ace\TLI.i"\
- {$(INCLUDE)}"\ace\TLI_Acceptor.h"\
- {$(INCLUDE)}"\ace\TLI_Acceptor.i"\
- {$(INCLUDE)}"\ace\TLI_Stream.h"\
- {$(INCLUDE)}"\ace\TLI_Stream.i"\
- {$(INCLUDE)}"\ace\Trace.h"\
- {$(INCLUDE)}"\ace\ws2tcpip.h"\
-
-
-"$(INTDIR)\Server_Logging_Handler.obj" : $(SOURCE) $(DEP_CPP_SERVE) "$(INTDIR)"
-
-
-!ENDIF
-
# End Source File
################################################################################
# Begin Source File
SOURCE=.\Name_Handler.cpp
-
-!IF "$(CFG)" == "netsvcs - Win32 Release"
-
DEP_CPP_NAME_=\
"..\..\ace\config-win32.h"\
".\Name_Handler.h"\
@@ -1269,111 +922,19 @@ DEP_CPP_NAME_=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
"$(INTDIR)\Name_Handler.obj" : $(SOURCE) $(DEP_CPP_NAME_) "$(INTDIR)"
-!ELSEIF "$(CFG)" == "netsvcs - Win32 Debug"
-
-DEP_CPP_NAME_=\
- "..\..\ace\config-win32.h"\
- ".\Name_Handler.h"\
- {$(INCLUDE)}"\ace\Acceptor.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\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\INET_Addr.h"\
- {$(INCLUDE)}"\ace\INET_Addr.i"\
- {$(INCLUDE)}"\ace\IPC_SAP.h"\
- {$(INCLUDE)}"\ace\IPC_SAP.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\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\Name_Proxy.h"\
- {$(INCLUDE)}"\ace\Name_Request_Reply.h"\
- {$(INCLUDE)}"\ace\Name_Space.h"\
- {$(INCLUDE)}"\ace\Naming_Context.h"\
- {$(INCLUDE)}"\ace\Object_Manager.h"\
- {$(INCLUDE)}"\ace\Object_Manager.i"\
- {$(INCLUDE)}"\ace\OS.h"\
- {$(INCLUDE)}"\ace\OS.i"\
- {$(INCLUDE)}"\ace\Service_Config.h"\
- {$(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\SOCK.h"\
- {$(INCLUDE)}"\ace\SOCK.i"\
- {$(INCLUDE)}"\ace\SOCK_Acceptor.h"\
- {$(INCLUDE)}"\ace\SOCK_Acceptor.i"\
- {$(INCLUDE)}"\ace\SOCK_Connector.h"\
- {$(INCLUDE)}"\ace\SOCK_Connector.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\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_Options.h"\
- {$(INCLUDE)}"\ace\Synch_T.h"\
- {$(INCLUDE)}"\ace\Synch_T.i"\
- {$(INCLUDE)}"\ace\Time_Value.h"\
- {$(INCLUDE)}"\ace\Trace.h"\
- {$(INCLUDE)}"\ace\ws2tcpip.h"\
-
-
-"$(INTDIR)\Name_Handler.obj" : $(SOURCE) $(DEP_CPP_NAME_) "$(INTDIR)"
-
-
-!ENDIF
-
# End Source File
################################################################################
# Begin Source File
SOURCE=.\Client_Logging_Handler.cpp
-
-!IF "$(CFG)" == "netsvcs - Win32 Release"
-
DEP_CPP_CLIEN=\
"..\..\ace\config-win32.h"\
".\Client_Logging_Handler.h"\
@@ -1507,136 +1068,14 @@ DEP_CPP_CLIEN=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
"$(INTDIR)\Client_Logging_Handler.obj" : $(SOURCE) $(DEP_CPP_CLIEN) "$(INTDIR)"
-!ELSEIF "$(CFG)" == "netsvcs - Win32 Debug"
-
-DEP_CPP_CLIEN=\
- "..\..\ace\config-win32.h"\
- ".\Client_Logging_Handler.h"\
- {$(INCLUDE)}"\ace\Acceptor.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\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\Hash_Map_Manager.cpp"\
- {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\
- {$(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\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\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\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\Service_Config.h"\
- {$(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"\
- {$(INCLUDE)}"\ace\SOCK.h"\
- {$(INCLUDE)}"\ace\SOCK.i"\
- {$(INCLUDE)}"\ace\SOCK_Acceptor.h"\
- {$(INCLUDE)}"\ace\SOCK_Acceptor.i"\
- {$(INCLUDE)}"\ace\SOCK_Connector.h"\
- {$(INCLUDE)}"\ace\SOCK_Connector.i"\
- {$(INCLUDE)}"\ace\SOCK_IO.h"\
- {$(INCLUDE)}"\ace\SOCK_IO.i"\
- {$(INCLUDE)}"\ace\SOCK_Stream.h"\
- {$(INCLUDE)}"\ace\SOCK_Stream.i"\
- {$(INCLUDE)}"\ace\SPIPE.h"\
- {$(INCLUDE)}"\ace\SPIPE.i"\
- {$(INCLUDE)}"\ace\SPIPE_Acceptor.h"\
- {$(INCLUDE)}"\ace\SPIPE_Addr.h"\
- {$(INCLUDE)}"\ace\SPIPE_Addr.i"\
- {$(INCLUDE)}"\ace\SPIPE_Stream.h"\
- {$(INCLUDE)}"\ace\SPIPE_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_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.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\Trace.h"\
- {$(INCLUDE)}"\ace\ws2tcpip.h"\
-
-
-"$(INTDIR)\Client_Logging_Handler.obj" : $(SOURCE) $(DEP_CPP_CLIEN) "$(INTDIR)"
-
-
-!ENDIF
-
# End Source File
################################################################################
# Begin Source File
diff --git a/netsvcs/lib/netsvcs.mdp b/netsvcs/lib/netsvcs.mdp Binary files differindex cabb762d55f..690a85c0c55 100644 --- a/netsvcs/lib/netsvcs.mdp +++ b/netsvcs/lib/netsvcs.mdp diff --git a/netsvcs/servers/servers.mak b/netsvcs/servers/servers.mak index da0d38dbc9e..6664ef73dc8 100644 --- a/netsvcs/servers/servers.mak +++ b/netsvcs/servers/servers.mak @@ -60,8 +60,8 @@ CLEAN : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MD /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\
+# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\
/Fp"$(INTDIR)/servers.pch" /YX /Fo"$(INTDIR)/" /c
CPP_OBJS=.\Release/
CPP_SBRS=.\.
@@ -117,10 +117,9 @@ 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 /GR /GX /Zi /Od /I "..\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\lib" /D "WIN32" /D\
- "_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/servers.pch" /YX /Fo"$(INTDIR)/"\
- /Fd"$(INTDIR)/" /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\lib" /D "WIN32" /D "_DEBUG" /D\
+ "_CONSOLE" /Fp"$(INTDIR)/servers.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -439,6 +438,8 @@ DEP_CPP_MAIN_=\ {$(INCLUDE)}"\ace\Token_Request_Reply.h"\
{$(INCLUDE)}"\ace\Token_Request_Reply.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
diff --git a/netsvcs/servers/servers.mdp b/netsvcs/servers/servers.mdp Binary files differindex bf1d8afcbab..ade5d91da84 100644 --- a/netsvcs/servers/servers.mdp +++ b/netsvcs/servers/servers.mdp diff --git a/tests/tests.mak b/tests/tests.mak index 3c55dfb9f30..20a7fa6bb49 100644 --- a/tests/tests.mak +++ b/tests/tests.mak @@ -2873,6 +2873,7 @@ DEP_CPP_HANDL=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -2921,21 +2922,19 @@ 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"\
{$(INCLUDE)}"\ace\Log_Record.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\Object_Manager.h"\
@@ -2945,17 +2944,6 @@ 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"\
@@ -2992,6 +2980,7 @@ DEP_CPP_MUTEX=\ {$(INCLUDE)}"\ace\Log_Record.i"\
{$(INCLUDE)}"\ace\Managed_Object.cpp"\
{$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
{$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
@@ -3069,6 +3058,7 @@ DEP_CPP_NAMIN=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -3172,6 +3162,7 @@ DEP_CPP_REACT=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -3255,6 +3246,7 @@ DEP_CPP_REACTO=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -3318,6 +3310,8 @@ DEP_CPP_REACTO=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -3338,21 +3332,19 @@ 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"\
{$(INCLUDE)}"\ace\Log_Record.i"\
{$(INCLUDE)}"\ace\Managed_Object.cpp"\
{$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
{$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
@@ -3360,17 +3352,6 @@ 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"\
@@ -3392,21 +3373,19 @@ 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"\
{$(INCLUDE)}"\ace\Log_Record.i"\
{$(INCLUDE)}"\ace\Managed_Object.cpp"\
{$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
{$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
@@ -3414,17 +3393,6 @@ 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"\
@@ -3474,6 +3442,7 @@ DEP_CPP_TIMER=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -3505,6 +3474,7 @@ 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"\
@@ -3572,6 +3542,7 @@ DEP_CPP_UPIPE=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -3653,6 +3624,8 @@ DEP_CPP_UPIPE=\ {$(INCLUDE)}"\ace\UPIPE_Connector.i"\
{$(INCLUDE)}"\ace\UPIPE_Stream.h"\
{$(INCLUDE)}"\ace\UPIPE_Stream.i"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -3704,6 +3677,7 @@ DEP_CPP_PRIOR=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -3756,6 +3730,8 @@ DEP_CPP_PRIOR=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -3776,21 +3752,19 @@ 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"\
{$(INCLUDE)}"\ace\Log_Record.i"\
{$(INCLUDE)}"\ace\Managed_Object.cpp"\
{$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
{$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
@@ -3800,17 +3774,6 @@ 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"\
@@ -3851,6 +3814,7 @@ DEP_CPP_SPIPE=\ {$(INCLUDE)}"\ace\Log_Record.i"\
{$(INCLUDE)}"\ace\Managed_Object.cpp"\
{$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
{$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
@@ -3932,6 +3896,7 @@ DEP_CPP_BUFFE=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -3999,6 +3964,8 @@ DEP_CPP_BUFFE=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -4018,6 +3985,7 @@ 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"\
@@ -4033,6 +4001,7 @@ DEP_CPP_BARRI=\ {$(INCLUDE)}"\ace\Log_Record.i"\
{$(INCLUDE)}"\ace\Managed_Object.cpp"\
{$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
{$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
@@ -4050,6 +4019,7 @@ 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"\
@@ -4090,6 +4060,7 @@ DEP_CPP_READE=\ {$(INCLUDE)}"\ace\Log_Record.i"\
{$(INCLUDE)}"\ace\Managed_Object.cpp"\
{$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
{$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
@@ -4148,6 +4119,7 @@ DEP_CPP_RECUR=\ {$(INCLUDE)}"\ace\Log_Record.i"\
{$(INCLUDE)}"\ace\Managed_Object.cpp"\
{$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
{$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
@@ -4220,6 +4192,7 @@ DEP_CPP_TASK_=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -4283,6 +4256,8 @@ DEP_CPP_TASK_=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -4329,6 +4304,7 @@ DEP_CPP_THREA=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -4403,6 +4379,7 @@ DEP_CPP_TSS_T=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -4481,6 +4458,7 @@ DEP_CPP_THREAD=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -4544,6 +4522,8 @@ DEP_CPP_THREAD=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -4598,6 +4578,7 @@ DEP_CPP_FUTUR=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -4662,6 +4643,8 @@ DEP_CPP_FUTUR=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -4681,6 +4664,7 @@ 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"\
@@ -4719,6 +4703,7 @@ DEP_CPP_TOKEN=\ {$(INCLUDE)}"\ace\Malloc_T.i"\
{$(INCLUDE)}"\ace\Managed_Object.cpp"\
{$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Map_Manager.cpp"\
{$(INCLUDE)}"\ace\Map_Manager.h"\
{$(INCLUDE)}"\ace\Map_Manager.i"\
@@ -4834,6 +4819,7 @@ DEP_CPP_MESSA=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -4884,6 +4870,8 @@ DEP_CPP_MESSA=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -4936,6 +4924,7 @@ DEP_CPP_MAP_M=\ {$(INCLUDE)}"\ace\Malloc_T.i"\
{$(INCLUDE)}"\ace\Managed_Object.cpp"\
{$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Map_Manager.cpp"\
{$(INCLUDE)}"\ace\Map_Manager.h"\
{$(INCLUDE)}"\ace\Map_Manager.i"\
@@ -5001,15 +4990,12 @@ 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"\
@@ -5018,6 +5004,7 @@ DEP_CPP_PIPE_=\ {$(INCLUDE)}"\ace\Log_Record.i"\
{$(INCLUDE)}"\ace\Managed_Object.cpp"\
{$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
{$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
@@ -5029,17 +5016,6 @@ 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"\
@@ -5078,6 +5054,7 @@ DEP_CPP_PROCE=\ {$(INCLUDE)}"\ace\Log_Record.i"\
{$(INCLUDE)}"\ace\Managed_Object.cpp"\
{$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
{$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
@@ -5145,6 +5122,7 @@ DEP_CPP_SV_SH=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -5205,6 +5183,7 @@ DEP_CPP_MM_SH=\ {$(INCLUDE)}"\ace\Log_Record.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\Object_Manager.h"\
@@ -5250,6 +5229,7 @@ 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"\
@@ -5268,7 +5248,9 @@ 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"\
@@ -5276,6 +5258,7 @@ DEP_CPP_SERVI=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -5358,6 +5341,7 @@ DEP_CPP_SOCK_=\ {$(INCLUDE)}"\ace\Log_Record.i"\
{$(INCLUDE)}"\ace\Managed_Object.cpp"\
{$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
{$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
@@ -5443,6 +5427,7 @@ DEP_CPP_MESSAG=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -5509,6 +5494,8 @@ DEP_CPP_MESSAG=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -5560,6 +5547,7 @@ DEP_CPP_REACTOR=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -5625,6 +5613,8 @@ DEP_CPP_REACTOR=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -5691,6 +5681,7 @@ DEP_CPP_IOSTR=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -5768,6 +5759,8 @@ DEP_CPP_IOSTR=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -5833,6 +5826,7 @@ DEP_CPP_PROCES=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -5913,6 +5907,8 @@ DEP_CPP_PROCES=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -5979,6 +5975,7 @@ DEP_CPP_CONN_=\ {$(INCLUDE)}"\ace\Malloc_T.i"\
{$(INCLUDE)}"\ace\Managed_Object.cpp"\
{$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Map_Manager.cpp"\
{$(INCLUDE)}"\ace\Map_Manager.h"\
{$(INCLUDE)}"\ace\Map_Manager.i"\
@@ -6059,6 +6056,8 @@ DEP_CPP_CONN_=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -6105,6 +6104,7 @@ DEP_CPP_SIMPL=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -6187,6 +6187,7 @@ DEP_CPP_REACTOR_=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -6277,6 +6278,7 @@ DEP_CPP_PRIORI=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -6342,6 +6344,8 @@ DEP_CPP_PRIORI=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -6362,21 +6366,19 @@ 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"\
{$(INCLUDE)}"\ace\Log_Record.i"\
{$(INCLUDE)}"\ace\Managed_Object.cpp"\
{$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
{$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
@@ -6384,17 +6386,6 @@ 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"\
@@ -6445,6 +6436,9 @@ 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\Managed_Object.i"\
{$(INCLUDE)}"\ace\Mem_Map.h"\
{$(INCLUDE)}"\ace\Mem_Map.i"\
{$(INCLUDE)}"\ace\Memory_Pool.h"\
@@ -6458,6 +6452,7 @@ 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"\
@@ -6507,6 +6502,8 @@ DEP_CPP_MESSAGE=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -6530,15 +6527,12 @@ 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"\
@@ -6547,6 +6541,7 @@ DEP_CPP_ENUM_=\ {$(INCLUDE)}"\ace\Log_Record.i"\
{$(INCLUDE)}"\ace\Managed_Object.cpp"\
{$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
{$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
@@ -6554,17 +6549,6 @@ 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"\
@@ -6586,10 +6570,13 @@ 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"\
@@ -6604,7 +6591,9 @@ 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"\
@@ -6612,6 +6601,7 @@ DEP_CPP_HASH_=\ {$(INCLUDE)}"\ace\Malloc_T.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"\
@@ -6688,6 +6678,7 @@ DEP_CPP_SEMAP=\ {$(INCLUDE)}"\ace\Log_Record.i"\
{$(INCLUDE)}"\ace\Managed_Object.cpp"\
{$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
{$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
@@ -6744,6 +6735,7 @@ DEP_CPP_ATOMI=\ {$(INCLUDE)}"\ace\Log_Record.i"\
{$(INCLUDE)}"\ace\Managed_Object.cpp"\
{$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
{$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
diff --git a/tests/tests.mdp b/tests/tests.mdp Binary files differindex 636c1150b68..2ed4ba4cbc7 100644 --- a/tests/tests.mdp +++ b/tests/tests.mdp |