diff options
-rw-r--r-- | TAO/ChangeLog | 7 | ||||
-rw-r--r-- | TAO/tao/Invocation_Adapter.cpp | 4 | ||||
-rw-r--r-- | TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ebb06b3bc66..323aef54876 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Fri Jul 9 20:32:33 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/Invocation_Adapter.cpp: + * tao/Messaging/Asynch_Invocation_Adapter.cpp: + + More warning fixes. + Fri Jul 9 07:29:57 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tao/DynamicInterface/DII_Invocation_Adapter.cpp: diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index 4e4ccdf8673..173782f5ee5 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -72,7 +72,7 @@ namespace TAO if (cpb_ != 0) { strat = - TAO_ORB_Core::collocation_strategy (effective_target + TAO_ORB_Core::collocation_strategy (effective_target.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -158,7 +158,7 @@ namespace TAO TAO::Invocation_Status status = TAO_INVOKE_START; Collocated_Invocation coll_inv (this->target_, - effective_target, + effective_target.in (), stub, details, this->type_ == TAO_TWOWAY_INVOCATION); diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp index 48ce9c7ad9e..5255a103b05 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp @@ -149,7 +149,7 @@ namespace TAO // Loose ownership of the reply dispatcher TAO::Asynch_Remote_Invocation asynch ( - effective_target, + effective_target.in (), r, op, this->safe_rd_.release ()); |