diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-23 10:26:31 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-23 10:26:31 +0000 |
| commit | 048380738c99418a0d88c02f5d5a1071277c67c8 (patch) | |
| tree | 2b7eed101349e236d89cab7ec08ddcec4414d0b0 | |
| parent | f514fcaa4045a73ef07eae1ac3c40792ddbf5393 (diff) | |
| download | ATCD-048380738c99418a0d88c02f5d5a1071277c67c8.tar.gz | |
ChangeLogTag: Tue Aug 23 10:03:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/tao/DynamicInterface/Request.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index 5e57536a687..f51f0d9f126 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -145,8 +145,6 @@ CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL) const CORBA::Boolean argument_flag = this->args_->_lazy_has_arguments (); - size_t number_args = 0; - TAO::NamedValue_Argument _tao_retval (this->result_); @@ -158,6 +156,8 @@ CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL) &_tao_in_list }; + int number_args = 0; + if (argument_flag) number_args = 2; else @@ -167,7 +167,7 @@ CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL) this->target_, _tao_arg_list, number_args, - const_cast<char *> (this->opname_), + this->opname_, static_cast<CORBA::ULong> (ACE_OS::strlen (this->opname_)), this->exceptions_.in (), this); @@ -190,8 +190,6 @@ CORBA::Request::send_oneway (ACE_ENV_SINGLE_ARG_DECL) const CORBA::Boolean argument_flag = this->args_->_lazy_has_arguments (); - size_t number_args = 0; - TAO::NamedValue_Argument _tao_retval (this->result_); @@ -203,6 +201,8 @@ CORBA::Request::send_oneway (ACE_ENV_SINGLE_ARG_DECL) &_tao_in_list }; + int number_args = 0; + if (argument_flag) number_args = 2; else @@ -212,7 +212,7 @@ CORBA::Request::send_oneway (ACE_ENV_SINGLE_ARG_DECL) this->target_, _tao_arg_list, number_args, - const_cast<char *> (this->opname_), + this->opname_, static_cast<CORBA::ULong> (ACE_OS::strlen (this->opname_)), 0, TAO::TAO_ONEWAY_INVOCATION); @@ -246,7 +246,7 @@ CORBA::Request::send_deferred (ACE_ENV_SINGLE_ARG_DECL) &_tao_in_list }; - size_t number_args = 0; + int number_args = 0; if (argument_flag) number_args = 2; @@ -257,7 +257,7 @@ CORBA::Request::send_deferred (ACE_ENV_SINGLE_ARG_DECL) this->target_, _tao_arg_list, number_args, - const_cast<char *> (this->opname_), + this->opname_, static_cast<CORBA::ULong> (ACE_OS::strlen (this->opname_)), 0, this->orb_->orb_core (), |