diff options
Diffstat (limited to 'ace/Stream.cpp')
| -rw-r--r-- | ace/Stream.cpp | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/ace/Stream.cpp b/ace/Stream.cpp index f8af657ff6d..efdffd1cbb0 100644 --- a/ace/Stream.cpp +++ b/ace/Stream.cpp @@ -231,26 +231,10 @@ ACE_Stream<ACE_SYNCH_USE>::push_module (ACE_Module<ACE_SYNCH_USE> *new_top, return 0; } -#if 0 template <ACE_SYNCH_DECL> int ACE_Stream<ACE_SYNCH_USE>::open (void *a, - ACE_Multiplexor &muxer, - ACE_Module<ACE_SYNCH_USE> *head) -{ - ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE>::open"); - this->stream_head_ = head == 0 - ? new ACE_Module<ACE_SYNCH_USE> ("ACE_Stream_Head", - new ACE_Stream_Head<ACE_SYNCH_USE>, - new ACE_Stream_Head<ACE_SYNCH_USE>, a) : head; - this->stream_tail_ = 0; - return muxer.link_from_below (this->stream_head_); -} -#endif - -template <ACE_SYNCH_DECL> int -ACE_Stream<ACE_SYNCH_USE>::open (void *a, - ACE_Module<ACE_SYNCH_USE> *head, - ACE_Module<ACE_SYNCH_USE> *tail) + ACE_Module<ACE_SYNCH_USE> *head, + ACE_Module<ACE_SYNCH_USE> *tail) { ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE>::open"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); @@ -355,11 +339,12 @@ ACE_Stream<ACE_SYNCH_USE>::control (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd, ACE_Message_Block *db; // Try to create a data block that contains the user-supplied data. - ACE_NEW_RETURN (db, ACE_Message_Block (sizeof (int), - ACE_Message_Block::MB_IOCTL, - 0, - (char *) a), -1); - + ACE_NEW_RETURN (db, + ACE_Message_Block (sizeof (int), + ACE_Message_Block::MB_IOCTL, + 0, + (char *) a), + -1); // Try to create a control block <cb> that contains the control // field and a pointer to the data block <db> in <cb>'s continuation // field. |