diff options
| -rw-r--r-- | ace/FILE_Addr.cpp | 4 | ||||
| -rw-r--r-- | ace/Reactor.cpp | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/ace/FILE_Addr.cpp b/ace/FILE_Addr.cpp index 76d14fa77dc..ad9a20d2be7 100644 --- a/ace/FILE_Addr.cpp +++ b/ace/FILE_Addr.cpp @@ -42,8 +42,8 @@ ACE_FILE_Addr::set (LPCTSTR filename) this->ACE_Addr::base_set (AF_FILE, ACE_OS::strlen (filename) + 1); (void) ACE_OS::strncpy (this->filename_, - filename, - sa.get_size ()); + filename, + sizeof this->filename_); } ACE_FILE_Addr & diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp index 2cb8b58391b..e1809cda11b 100644 --- a/ace/Reactor.cpp +++ b/ace/Reactor.cpp @@ -27,26 +27,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) +#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); -#else +#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. - #if defined (ACE_USE_MSG_WFMO_REACTOR_FOR_REACTOR_IMPL) ACE_NEW (impl, ACE_Msg_WFMO_Reactor); - #else +#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; } |