diff options
| author | Steve Huston <shuston@riverace.com> | 2002-07-09 15:17:07 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2002-07-09 15:17:07 +0000 |
| commit | 935498facc80ab8f03057b6ba8385c6638b7e6d9 (patch) | |
| tree | 76562af0c3829c5c6733e73aef2c1d114b0b7307 | |
| parent | da905a4b5d28d074b862d6e31868af015bd911e2 (diff) | |
| download | ATCD-935498facc80ab8f03057b6ba8385c6638b7e6d9.tar.gz | |
ChangeLogTag:Tue Jul 9 11:10:38 2002 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | apps/Gateway/Peer/Peer.cpp | 6 | ||||
| -rw-r--r-- | apps/Gateway/Peer/Peer.h | 2 |
4 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 24181d3bd9a..1093dcf4508 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jul 9 11:10:38 2002 Steve Huston <shuston@riverace.com> + + * apps/Gateway/Peer/Peer.{h cpp}: Renamed the Peer_Acceptor::open() + method to Peer_Acceptor::start() to avoid conflicts with the + virtual ACE_Acceptor::open() method. + Tue Jul 9 09:01:14 2002 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/config/taolib_with_idl.mpb: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 24181d3bd9a..1093dcf4508 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Tue Jul 9 11:10:38 2002 Steve Huston <shuston@riverace.com> + + * apps/Gateway/Peer/Peer.{h cpp}: Renamed the Peer_Acceptor::open() + method to Peer_Acceptor::start() to avoid conflicts with the + virtual ACE_Acceptor::open() method. + Tue Jul 9 09:01:14 2002 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/config/taolib_with_idl.mpb: diff --git a/apps/Gateway/Peer/Peer.cpp b/apps/Gateway/Peer/Peer.cpp index 1198e4b15a7..c19790fd9bf 100644 --- a/apps/Gateway/Peer/Peer.cpp +++ b/apps/Gateway/Peer/Peer.cpp @@ -665,7 +665,7 @@ Peer_Handler::handle_close (ACE_HANDLE, } int -Peer_Acceptor::open (u_short port) +Peer_Acceptor::start (u_short port) { // This object only gets allocated once and is just recycled // forever. @@ -858,14 +858,14 @@ Peer_Factory::init (int argc, char *argv[]) -1); if (Options::instance ()->enabled (Options::SUPPLIER_ACCEPTOR) - && this->supplier_acceptor_.open + && this->supplier_acceptor_.start (Options::instance ()->supplier_acceptor_port ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Acceptor::open"), -1); else if (Options::instance ()->enabled (Options::CONSUMER_ACCEPTOR) - && this->consumer_acceptor_.open + && this->consumer_acceptor_.start (Options::instance ()->consumer_acceptor_port ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", diff --git a/apps/Gateway/Peer/Peer.h b/apps/Gateway/Peer/Peer.h index b470b897e04..4b05e36d14e 100644 --- a/apps/Gateway/Peer/Peer.h +++ b/apps/Gateway/Peer/Peer.h @@ -165,7 +165,7 @@ public: Peer_Acceptor (void); // Default initialization. - int open (u_short); + int start (u_short); // the <Peer_Acceptor>. int close (void); |