diff options
Diffstat (limited to 'ace/Reactor.cpp')
| -rw-r--r-- | ace/Reactor.cpp | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp index eff03e4ebdc..798892ef5e8 100644 --- a/ace/Reactor.cpp +++ b/ace/Reactor.cpp @@ -10,6 +10,7 @@ # include "ace/Msg_WFMO_Reactor.h" #endif /* !ACE_HAS_WINCE */ #include "ace/Select_Reactor.h" +#include "ace/TP_Reactor.h" #include "ace/Object_Manager.h" #if !defined (__ACE_INLINE__) @@ -29,22 +30,22 @@ ACE_Reactor::ACE_Reactor (ACE_Reactor_Impl *impl, if (this->implementation () == 0) { -#if !defined (ACE_WIN32) || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) - ACE_NEW (impl, - ACE_Select_Reactor); -#elif defined (ACE_USE_MSG_WFMO_REACTOR_FOR_REACTOR_IMPL) - // We are on Win32 and we have winsock and - // ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL is not defined. - ACE_NEW (impl, - ACE_Msg_WFMO_Reactor); -#else - ACE_NEW (impl, - ACE_WFMO_Reactor); -#endif /* !defined (ACE_WIN32) - || !defined (ACE_HAS_WINSOCK2) - || (ACE_HAS_WINSOCK2 == 0) - || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_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) + ACE_NEW (impl, ACE_TP_Reactor); + #else + ACE_NEW (impl, ACE_Select_Reactor); + #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, ACE_Msg_WFMO_Reactor); + #else + ACE_NEW (impl, ACE_WFMO_Reactor); + #endif /* ACE_USE_MSG_WFMO_REACTOR_FOR_REACTOR_IMPL */ +#endif /* !defined (ACE_WIN32) || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) */ this->implementation (impl); this->delete_implementation_ = 1; } |