diff options
| author | Steve Huston <shuston@riverace.com> | 2005-02-15 23:07:37 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2005-02-15 23:07:37 +0000 |
| commit | 34104cf059eeafbd1382ac7f9315e0c9a4afac2e (patch) | |
| tree | 929cad045679537bffe42e0311c7d1ac90539359 /ace/Reactor.cpp | |
| parent | 2cf1b9573c6f58e31ad17124620d11875cf8dab9 (diff) | |
| download | ATCD-PROACTOR_FIXES_STEVE_JAN05.tar.gz | |
Commit merged-in changes from mainlinePROACTOR_FIXES_STEVE_JAN05
Diffstat (limited to 'ace/Reactor.cpp')
| -rw-r--r-- | ace/Reactor.cpp | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp index eec9855a892..c1287d30ae5 100644 --- a/ace/Reactor.cpp +++ b/ace/Reactor.cpp @@ -11,11 +11,16 @@ #if !defined (ACE_WIN32) \ || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) \ || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) \ - || defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL) + || defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL) \ + || defined (ACE_USE_DEV_POLL_REACTOR_FOR_REACTOR_IMPL) # if defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL) # include "ace/TP_Reactor.h" # else -# include "ace/Select_Reactor.h" +# if defined (ACE_USE_DEV_POLL_REACTOR_FOR_REACTOR_IMPL) +# include "ace/Dev_Poll_Reactor.h" +# else +# include "ace/Select_Reactor.h" +# endif /* ACE_USE_DEV_POLL_REACTOR_FOR_REACTOR_IMPL */ # endif /* ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL */ #else /* We are on Win32 and we have winsock and ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL is not defined */ # if defined (ACE_USE_MSG_WFMO_REACTOR_FOR_REACTOR_IMPL) @@ -50,14 +55,20 @@ ACE_Reactor::ACE_Reactor (ACE_Reactor_Impl *impl, #if !defined (ACE_WIN32) \ || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) \ || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) \ - || defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL) - #if defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL) + || defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL) \ + || defined (ACE_USE_DEV_POLL_REACTOR_FOR_REACTOR_IMPL) +# if defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL) ACE_NEW (impl, ACE_TP_Reactor); - #else +# else +# if defined (ACE_USE_DEV_POLL_REACTOR_FOR_REACTOR_IMPL) + ACE_NEW (impl, + ACE_Dev_Poll_Reactor); +# else ACE_NEW (impl, ACE_Select_Reactor); - #endif /* ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL */ +# endif /* ACE_USE_DEV_POLL_REACTOR_FOR_REACTOR_IMPL */ +# endif /* ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL */ #else /* We are on Win32 and we have winsock and ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL is not defined */ #if defined (ACE_USE_MSG_WFMO_REACTOR_FOR_REACTOR_IMPL) ACE_NEW (impl, |