summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralex <alex@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-05-29 19:59:20 +0000
committeralex <alex@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-05-29 19:59:20 +0000
commit3d04202c42dab98544fe1eb9c8c7b4f174c31396 (patch)
tree428bffc60cea32804ea1ea3f04bb5e3b10b32aff
parentc4eabf97fe041f708b625d330faa12aaf7a498a1 (diff)
downloadATCD-3d04202c42dab98544fe1eb9c8c7b4f174c31396.tar.gz
Removed the old errorneous <send_request> implementation.
-rw-r--r--TAO/tao/Wait_Strategy.cpp22
-rw-r--r--TAO/tao/Wait_Strategy.h4
2 files changed, 2 insertions, 24 deletions
diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp
index 132974b5190..cb538d47ea9 100644
--- a/TAO/tao/Wait_Strategy.cpp
+++ b/TAO/tao/Wait_Strategy.cpp
@@ -215,8 +215,8 @@ TAO_Wait_On_Leader_Follower::wait (void)
// should be one per-connection. I think the first case is
// the "Right Thing"[tm]
ACE_SYNCH_CONDITION* cond =
- this->cond_response_available ();
-
+ this->cond_response_available ()
+;
// Add ourselves to the list, do it only once because we can
// wake up multiple times from the CV loop
if (orb_core->add_follower (cond) == -1)
@@ -361,8 +361,6 @@ TAO_Wait_On_Leader_Follower::handle_input (void)
return 0;
}
-// ****************************************************************
-
// Register the handler.
int
TAO_Wait_On_Leader_Follower::register_handler (void)
@@ -377,22 +375,6 @@ TAO_Wait_On_Leader_Follower::resume_handler (ACE_Reactor *reactor)
return this->transport_->resume_handler ();
}
-// Send the request in <stream>.
-// @@ Why do I need <orb_core> here, when I have <transport>.
-int
-TAO_Wait_On_Leader_Follower::send_request (TAO_ORB_Core* /* orb_core */,
- TAO_OutputCDR &stream)
-{
- // Send the request.
- int success = (int) TAO_GIOP::send_request (this->transport_,
- stream,
- this->transport_->orb_core ());
- if (!success)
- return -1;
- else
- return 0;
-}
-
ACE_SYNCH_CONDITION *
TAO_Wait_On_Leader_Follower::cond_response_available (void)
{
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
index 2fdd88b80d6..14e02c4edde 100644
--- a/TAO/tao/Wait_Strategy.h
+++ b/TAO/tao/Wait_Strategy.h
@@ -157,10 +157,6 @@ public:
virtual int resume_handler (ACE_Reactor *reactor);
// Resume the connection handler.
- virtual int send_request (TAO_ORB_Core* orb_core,
- TAO_OutputCDR &stream);
- // Send the request in <stream>.
-
protected:
ACE_SYNCH_CONDITION* cond_response_available (void);
// Return the cond_response_available, initializing it if necessary.