diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-03-22 01:21:09 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-03-22 01:21:09 +0000 |
| commit | 6c25f029cf482be1d6d66a21385f77d324fbe6a6 (patch) | |
| tree | 79a12811ead82a8063f342b135735e0c1d66ef5d | |
| parent | 8e803e4938266b816c2b572345a930b2c0918291 (diff) | |
| download | ATCD-6c25f029cf482be1d6d66a21385f77d324fbe6a6.tar.gz | |
ChangeLogTag: Wed Mar 21 19:20:02 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 | ||||
| -rw-r--r-- | apps/Gateway/Peer/Peer.cpp | 21 |
4 files changed, 26 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 9aa48e55afc..08a1f909d61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 21 19:20:02 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * apps/Gateway/Peer/Peer.cpp (nonblk_put): Fixed a compile error + in g++. + Wed Mar 21 17:28:26 2001 Steve Huston <shuston@riverace.com> * ace/Message_Queue.h: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 9aa48e55afc..08a1f909d61 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Wed Mar 21 19:20:02 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * apps/Gateway/Peer/Peer.cpp (nonblk_put): Fixed a compile error + in g++. + Wed Mar 21 17:28:26 2001 Steve Huston <shuston@riverace.com> * ace/Message_Queue.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 9aa48e55afc..08a1f909d61 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Wed Mar 21 19:20:02 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * apps/Gateway/Peer/Peer.cpp (nonblk_put): Fixed a compile error + in g++. + Wed Mar 21 17:28:26 2001 Steve Huston <shuston@riverace.com> * ace/Message_Queue.h: diff --git a/apps/Gateway/Peer/Peer.cpp b/apps/Gateway/Peer/Peer.cpp index e8fd5adca98..7596a7a0a97 100644 --- a/apps/Gateway/Peer/Peer.cpp +++ b/apps/Gateway/Peer/Peer.cpp @@ -30,15 +30,15 @@ Peer_Handler::open (void *a) // Call down to the base class to activate and register this handler // with an <ACE_Reactor>. if (this->inherited::open (a) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "open"), + ACE_ERROR_RETURN ((LM_ERROR, + "%p\n", + "open"), -1); if (this->peer ().enable (ACE_NONBLOCK) == -1) ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "enable"), + "%p\n", + "enable"), -1); ACE_Time_Value timeout (Options::instance ()->timeout ()); @@ -167,7 +167,8 @@ Peer_Handler::transmit_stdin (void) // reset first_time_ to 1, which will register_stdin_handler again. if (result == -1) first_time_ = 1; - return ret; + + return result; } // Perform a non-blocking <put> of event MB. If we are unable to send @@ -469,7 +470,7 @@ int Peer_Handler::handle_input (ACE_HANDLE sd) { ACE_DEBUG ((LM_DEBUG, - "in handle_input, sd = %d\n", + "in handle_input, sd = %d\n", sd)); if (sd == ACE_STDIN) // Handle event from stdin. return this->transmit_stdin (); @@ -538,7 +539,7 @@ Peer_Handler::await_connection_id (void) // Next time in await_connection_id(), I'll don't call // register_stdin_handler(). first_time_ = 0; - } + } return 0; } @@ -637,7 +638,7 @@ Peer_Handler::handle_close (ACE_HANDLE, "shutting down Peer on handle %d\n", this->get_handle ())); - ACE_Reactor_Mask mask = + ACE_Reactor_Mask mask = ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::READ_MASK; // Explicitly remove ourselves for ACE_STDIN (the <ACE_Reactor> @@ -851,7 +852,7 @@ Peer_Factory::init (int argc, char *argv[]) this) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", - "register_handler"), + "register_handler"), -1); if (Options::instance ()->enabled (Options::SUPPLIER_ACCEPTOR) |