diff options
Diffstat (limited to 'ace/SPIPE_Acceptor.cpp')
| -rw-r--r-- | ace/SPIPE_Acceptor.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/ace/SPIPE_Acceptor.cpp b/ace/SPIPE_Acceptor.cpp index deeead76ef3..0cd7dc63a9e 100644 --- a/ace/SPIPE_Acceptor.cpp +++ b/ace/SPIPE_Acceptor.cpp @@ -6,10 +6,6 @@ #include "ace/OS_NS_sys_stat.h" #include "ace/OS_NS_sys_time.h" -#if defined (ACE_HAS_STREAM_PIPES) -# include "ace/OS_NS_unistd.h" -#endif // ACE_HAS_STREAM_PIPES - ACE_RCSID(ace, SPIPE_Acceptor, "$Id$") ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (void) @@ -28,7 +24,7 @@ ACE_SPIPE_Acceptor::remove (void) int result = this->close (); // Remove the underlying file. - return ACE_OS::unlink (this->local_addr_.get_path_name ()) == -1 + return ACE_OS::unlink (this->local_addr_.get_path_name ()) == -1 || result == -1 ? -1 : 0; #else this->close (); @@ -49,7 +45,7 @@ ACE_SPIPE_Acceptor::dump (void) const // General purpose routine for performing server ACE_SPIPE creation. int -ACE_SPIPE_Acceptor::open (const ACE_SPIPE_Addr &local_sap, +ACE_SPIPE_Acceptor::open (const ACE_SPIPE_Addr &local_sap, int reuse_addr, int perms, LPSECURITY_ATTRIBUTES sa, @@ -103,7 +99,7 @@ ACE_SPIPE_Acceptor::create_new_instance (int perms) // an instance of the named pipe that is already connected to a // client process is reused with a new client process, // ::ConnectNamedPipe () would fail. - + ACE_UNUSED_ARG (perms); ACE_TRACE ("ACE_SPIPE_Acceptor::create_new_instance"); int status; @@ -151,7 +147,7 @@ ACE_SPIPE_Acceptor::create_new_instance (int perms) ACE_ASSERT (!result); status = ::GetLastError (); - switch (status) + switch (status) { case ERROR_IO_PENDING: break; @@ -196,7 +192,7 @@ ACE_SPIPE_Acceptor::close (void) return result; } -ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (const ACE_SPIPE_Addr &local_sap, +ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (const ACE_SPIPE_Addr &local_sap, int reuse_addr, int perms, LPSECURITY_ATTRIBUTES sa, @@ -213,9 +209,9 @@ ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (const ACE_SPIPE_Addr &local_sap, // General purpose routine for accepting new connections. int -ACE_SPIPE_Acceptor::accept (ACE_SPIPE_Stream &new_io, +ACE_SPIPE_Acceptor::accept (ACE_SPIPE_Stream &new_io, ACE_SPIPE_Addr *remote_addr, - ACE_Time_Value *timeout, + ACE_Time_Value *timeout, int restart, int reset_new_handle) { @@ -229,7 +225,7 @@ ACE_SPIPE_Acceptor::accept (ACE_SPIPE_Stream &new_io, // ACE_OS::ioctl (). Otherwise, we will wait for the desired number // of milli seconds using ACE_OS::poll. - if (timeout != 0 && + if (timeout != 0 && ACE::handle_timed_accept (this->get_handle (), timeout, restart) == -1) |