diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-09-01 18:29:02 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-09-01 18:29:02 +0000 |
| commit | ffc8fd21a0822f6464df8df43adddc46af412eda (patch) | |
| tree | 4a1c005bd8c1895b21b01476b375bc2f5b9ed8af | |
| parent | 1092c26bfebae1586c91a15ff990c0ed709b4e7b (diff) | |
| download | ATCD-ffc8fd21a0822f6464df8df43adddc46af412eda.tar.gz | |
ChangeLogTag:Mon Sep 1 13:26:03 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog_ref | 11 | ||||
| -rw-r--r-- | TAO/tao/Asynch_Reply_Dispatcher_Base.cpp | 13 | ||||
| -rw-r--r-- | TAO/tao/Asynch_Reply_Dispatcher_Base.h | 4 | ||||
| -rw-r--r-- | TAO/tao/Asynch_Reply_Dispatcher_Base.i | 12 | ||||
| -rw-r--r-- | TAO/tao/Sync_Strategies.h | 1 |
5 files changed, 26 insertions, 15 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref index 85958a90846..4465981ee45 100644 --- a/TAO/ChangeLog_ref +++ b/TAO/ChangeLog_ref @@ -1,3 +1,14 @@ +Mon Sep 1 13:26:03 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/Sync_Strategies.h: Removed Transport.h inclusion + + * tao/Asynch_Reply_Dispatcher_Base.h: + * tao/Asynch_Reply_Dispatcher_Base.cpp: + * tao/Asynch_Reply_Dispatcher_Base.i: Removed inclusion of + Transport.h from the header file. Moved the method transport () + from the inlined file to the cpp file which helped us to get rid + of the Transport.h onclusion. + Mon Sep 1 11:08:43 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tao/CurrentC.h: Removed inclusion of Object_T.h. diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp index d0064880652..71aca530a55 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp @@ -41,6 +41,18 @@ TAO_Asynch_Reply_Dispatcher_Base::~TAO_Asynch_Reply_Dispatcher_Base (void) this->transport_->remove_reference (); } +void +TAO_Asynch_Reply_Dispatcher_Base::transport (TAO_Transport *t) +{ + if (this->transport_ != 0) + { + this->transport_->remove_reference (); + } + + this->transport_ = t; + this->transport_->add_reference (); +} + // Must override pure virtual method in TAO_Reply_Dispatcher. int TAO_Asynch_Reply_Dispatcher_Base::dispatch_reply ( @@ -50,7 +62,6 @@ TAO_Asynch_Reply_Dispatcher_Base::dispatch_reply ( return 0; } - void TAO_Asynch_Reply_Dispatcher_Base::connection_closed (void) { diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h index 312199535c5..ca7e6459cc8 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h @@ -20,11 +20,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Transport.h" #include "tao/Reply_Dispatcher.h" +#include "tao/IOP_IORC.h" class TAO_Pluggable_Reply_Params; class TAO_ORB_Core ; +class ACE_Time_Value; +class TAO_Transport; /// Base class for TAO_Asynch_Reply_Dispatcher and /// TAO_DII_Deferred_Reply_Dispatcher diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.i b/TAO/tao/Asynch_Reply_Dispatcher_Base.i index aadeeebfe29..cfa1da318d3 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.i +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.i @@ -1,13 +1 @@ // $Id$ - -ACE_INLINE void -TAO_Asynch_Reply_Dispatcher_Base::transport (TAO_Transport *t) -{ - if (this->transport_ != 0) - { - this->transport_->remove_reference (); - } - - this->transport_ = t; - this->transport_->add_reference (); -} diff --git a/TAO/tao/Sync_Strategies.h b/TAO/tao/Sync_Strategies.h index 974e301a5c2..8feb13dc6cc 100644 --- a/TAO/tao/Sync_Strategies.h +++ b/TAO/tao/Sync_Strategies.h @@ -24,7 +24,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Transport.h" #include "tao/TAOC.h" /// Define the interface for the Queueing Strategy |