diff options
| author | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-23 22:30:37 +0000 |
|---|---|---|
| committer | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-23 22:30:37 +0000 |
| commit | c2d878701d263c04dfa44db05ebddef137eb0d65 (patch) | |
| tree | 8ddbea5abdfad7f7b1ae86471c015ed27dca2547 | |
| parent | c15d50265f5d44d60ba084fd4ac609f859e10de4 (diff) | |
| download | ATCD-c2d878701d263c04dfa44db05ebddef137eb0d65.tar.gz | |
ChangeLogTag: Tue Jul 23 22:23:35 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/TCP.cpp | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/TCP.h | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 87346154687..c899a52f755 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Tue Jul 23 22:23:35 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> + + * orbsvcs/orbsvcs/AV/TCP.h: + * orbsvcs/orbsvcs/AV/TCP.cpp: Change name of TAO_AV_TCP_Base_Acceptor::open() + method to acceptor_open(), to prevent hiding of ACE_Acceptor::open() + virtual method. Thanks to Steve Huston <shuston@riverace.com> and + Ossama Othman <ossama@doc.ece.uci.edu>. + Tue Jul 23 15:19:00 2002 Mayur Deshpande <mayur@ics.uci.edu> * tests/AMH_Exceptions/client.cpp (main): diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index 2cf314accea..35f5a74497e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -432,7 +432,7 @@ TAO_AV_TCP_Connector::close (void) //------------------------------------------------------------ int -TAO_AV_TCP_Base_Acceptor::open (TAO_AV_TCP_Acceptor *acceptor, +TAO_AV_TCP_Base_Acceptor::acceptor_open (TAO_AV_TCP_Acceptor *acceptor, ACE_Reactor *reactor, const ACE_INET_Addr &local_addr, TAO_FlowSpec_Entry *entry) @@ -537,7 +537,7 @@ TAO_AV_TCP_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, buf )); - int result = this->acceptor_.open (this, + int result = this->acceptor_.acceptor_open (this, av_core->reactor (), *inet_addr, entry); @@ -572,7 +572,7 @@ TAO_AV_TCP_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, ACE_INET_Addr ("0"), -1); - int result = this->acceptor_.open (this, + int result = this->acceptor_.acceptor_open (this, av_core->reactor (), *address, entry); diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.h b/TAO/orbsvcs/orbsvcs/AV/TCP.h index 2a0e9213995..f9dbc34247e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.h @@ -123,7 +123,7 @@ class TAO_AV_TCP_Acceptor; class TAO_AV_TCP_Base_Acceptor :public ACE_Acceptor <TAO_AV_TCP_Flow_Handler,ACE_SOCK_ACCEPTOR> { public: - virtual int open (TAO_AV_TCP_Acceptor *acceptor, + virtual int acceptor_open (TAO_AV_TCP_Acceptor *acceptor, ACE_Reactor *reactor, const ACE_INET_Addr &local_addr, TAO_FlowSpec_Entry *entry); |