summaryrefslogtreecommitdiff
path: root/TAO/tests/Param_Test
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/Param_Test')
-rw-r--r--TAO/tests/Param_Test/any.cpp13
-rw-r--r--TAO/tests/Param_Test/anyop.cpp18
-rw-r--r--TAO/tests/Param_Test/bd_array_seq.cpp10
-rw-r--r--TAO/tests/Param_Test/bd_long_seq.cpp10
-rw-r--r--TAO/tests/Param_Test/bd_short_seq.cpp10
-rw-r--r--TAO/tests/Param_Test/bd_str_seq.cpp10
-rw-r--r--TAO/tests/Param_Test/bd_string.cpp10
-rw-r--r--TAO/tests/Param_Test/bd_struct_seq.cpp10
-rw-r--r--TAO/tests/Param_Test/bd_wstr_seq.cpp10
-rw-r--r--TAO/tests/Param_Test/bd_wstring.cpp10
-rw-r--r--TAO/tests/Param_Test/big_union.cpp21
-rw-r--r--TAO/tests/Param_Test/client.cpp5
-rw-r--r--TAO/tests/Param_Test/complex_any.cpp10
-rw-r--r--TAO/tests/Param_Test/driver.cpp7
-rw-r--r--TAO/tests/Param_Test/except.cpp7
-rw-r--r--TAO/tests/Param_Test/fixed_array.cpp10
-rw-r--r--TAO/tests/Param_Test/fixed_struct.cpp10
-rw-r--r--TAO/tests/Param_Test/multdim_array.cpp10
-rw-r--r--TAO/tests/Param_Test/nested_struct.cpp8
-rw-r--r--TAO/tests/Param_Test/objref.cpp38
-rw-r--r--TAO/tests/Param_Test/objref_struct.cpp39
-rw-r--r--TAO/tests/Param_Test/param_test_i.cpp18
-rw-r--r--TAO/tests/Param_Test/param_test_i.h8
-rw-r--r--TAO/tests/Param_Test/recursive_struct.cpp8
-rw-r--r--TAO/tests/Param_Test/recursive_union.cpp8
-rw-r--r--TAO/tests/Param_Test/server.cpp21
-rw-r--r--TAO/tests/Param_Test/short.cpp10
-rw-r--r--TAO/tests/Param_Test/small_union.cpp11
-rw-r--r--TAO/tests/Param_Test/typecode.cpp12
-rw-r--r--TAO/tests/Param_Test/ub_any_seq.cpp11
-rw-r--r--TAO/tests/Param_Test/ub_array_seq.cpp10
-rw-r--r--TAO/tests/Param_Test/ub_long_seq.cpp8
-rw-r--r--TAO/tests/Param_Test/ub_objref_seq.cpp21
-rw-r--r--TAO/tests/Param_Test/ub_short_seq.cpp8
-rw-r--r--TAO/tests/Param_Test/ub_str_seq.cpp8
-rw-r--r--TAO/tests/Param_Test/ub_string.cpp8
-rw-r--r--TAO/tests/Param_Test/ub_struct_seq.cpp14
-rw-r--r--TAO/tests/Param_Test/ub_wstr_seq.cpp8
-rw-r--r--TAO/tests/Param_Test/ub_wstring.cpp8
-rw-r--r--TAO/tests/Param_Test/ulonglong.cpp8
-rw-r--r--TAO/tests/Param_Test/var_array.cpp8
-rw-r--r--TAO/tests/Param_Test/var_struct.cpp8
42 files changed, 138 insertions, 362 deletions
diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp
index 42d992cd65a..3ec22426a14 100644
--- a/TAO/tests/Param_Test/any.cpp
+++ b/TAO/tests/Param_Test/any.cpp
@@ -20,8 +20,8 @@
#include "any.h"
#include "tao/debug.h"
-ACE_RCSID (Param_Test,
- any,
+ACE_RCSID (Param_Test,
+ any,
"$Id$")
// ************************************************************************
@@ -58,8 +58,7 @@ Test_Any::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL)
req->set_return_type (CORBA::_tc_any);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
const CORBA::Any *tmp;
req->return_value () >>= tmp;
@@ -67,13 +66,11 @@ Test_Any::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL)
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = CORBA::Any (*tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = new CORBA::Any (*tmp);
}
@@ -100,8 +97,7 @@ Test_Any::init_parameters (Param_Test_ptr objref
ACE_TRY
{
// get access to a Coffee Object
- this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->cobj_ = objref->make_coffee ();
this->reset_parameters ();
return 0;
@@ -280,7 +276,6 @@ Test_Any::run_sii_test (Param_Test_ptr objref
this->inout_,
this->out_.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/tests/Param_Test/anyop.cpp b/TAO/tests/Param_Test/anyop.cpp
index c15ba6afd10..80c2e892030 100644
--- a/TAO/tests/Param_Test/anyop.cpp
+++ b/TAO/tests/Param_Test/anyop.cpp
@@ -26,8 +26,8 @@
#include "ace/Get_Opt.h"
-ACE_RCSID (Param_Test,
- anyop,
+ACE_RCSID (Param_Test,
+ anyop,
"$Id$")
int
@@ -41,7 +41,6 @@ main (int argc, char *argv[])
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_Get_Opt get_opt (argc, argv, "dn:");
int opt;
@@ -98,14 +97,12 @@ main (int argc, char *argv[])
CORBA::Object_var obj =
orb->string_to_object ("corbaloc:iiop:localhost:1234/Foo/Bar"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- Param_Test_var param_test =
+ Param_Test_var param_test =
TAO::Narrow_Utils<Param_Test>::unchecked_narrow (
obj.in (),
_TAO_Param_Test_Proxy_Broker_Factory_function_pointer
);
- ACE_TRY_CHECK;
TAO_Stub *stub = param_test->_stubobj ();
stub->type_id = CORBA::string_dup ("IDL:Param_Test:1.0");
@@ -120,7 +117,6 @@ main (int argc, char *argv[])
}
CORBA::Boolean equiv =
param_test->_is_equivalent (o ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!equiv)
{
@@ -272,7 +268,7 @@ main (int argc, char *argv[])
any <<= *i;
Param_Test::Fixed_Struct *o;
-
+
if (!(any >>= o)
|| o->l != i->l
|| o->c != i->c
@@ -288,7 +284,7 @@ main (int argc, char *argv[])
}
any <<= i;
-
+
if (!(any >>= o)
|| o->l != i->l
|| o->c != i->c
@@ -312,7 +308,7 @@ main (int argc, char *argv[])
CORBA::LongSeq (len),
-1);
i->length (len);
-
+
for (CORBA::ULong k = 0; k < len; ++k)
{
(*i)[k] = k;
@@ -347,7 +343,7 @@ main (int argc, char *argv[])
}
ACE_CATCHANY
{
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+ ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
"IDL Types");
return 1;
}
diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp
index 9c2b6ea098e..e2c78db7621 100644
--- a/TAO/tests/Param_Test/bd_array_seq.cpp
+++ b/TAO/tests/Param_Test/bd_array_seq.cpp
@@ -19,8 +19,8 @@
#include "helper.h"
#include "bd_array_seq.h"
-ACE_RCSID (Param_Test,
- bd_array_seq,
+ACE_RCSID (Param_Test,
+ bd_array_seq,
"$Id$")
const CORBA::ULong MAX_ARRAYSEQ_LEN = 1;
@@ -60,8 +60,7 @@ Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req
req->add_out_arg ("s3") <<= this->out_.in ();
req->set_return_type (Param_Test::_tc_Bounded_ArraySeq);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Param_Test::Bounded_ArraySeq *tmp;
req->return_value () >>= tmp;
@@ -69,13 +68,11 @@ Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr arg2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg2->value () >>= tmp;
this->inout_ = new Param_Test::Bounded_ArraySeq (*tmp);
CORBA::NamedValue_ptr arg3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg3->value () >>= tmp;
this->out_ = new Param_Test::Bounded_ArraySeq (*tmp);
}
@@ -139,7 +136,6 @@ Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp
index 44be6ed3932..ab5e6b1675c 100644
--- a/TAO/tests/Param_Test/bd_long_seq.cpp
+++ b/TAO/tests/Param_Test/bd_long_seq.cpp
@@ -19,8 +19,8 @@
#include "helper.h"
#include "bd_long_seq.h"
-ACE_RCSID (Param_Test,
- bd_long_seq,
+ACE_RCSID (Param_Test,
+ bd_long_seq,
"$Id$")
// ************************************************************************
@@ -57,8 +57,7 @@ Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req
req->add_out_arg ("s3") <<= this->out_.in ();
req->set_return_type (Param_Test::_tc_Bounded_Long_Seq);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
const Param_Test::Bounded_Long_Seq *tmp;
req->return_value () >>= tmp;
@@ -66,13 +65,11 @@ Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr arg2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg2->value () >>= tmp;
this->inout_ = new Param_Test::Bounded_Long_Seq (*tmp);
CORBA::NamedValue_ptr arg3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg3->value () >>= tmp;
this->out_ = new Param_Test::Bounded_Long_Seq (*tmp);
}
@@ -126,7 +123,6 @@ Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp
index 0faa3656552..0a286d8d2db 100644
--- a/TAO/tests/Param_Test/bd_short_seq.cpp
+++ b/TAO/tests/Param_Test/bd_short_seq.cpp
@@ -19,8 +19,8 @@
#include "helper.h"
#include "bd_short_seq.h"
-ACE_RCSID (Param_Test,
- bd_short_seq,
+ACE_RCSID (Param_Test,
+ bd_short_seq,
"$Id$")
// ************************************************************************
@@ -57,8 +57,7 @@ Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req
req->add_out_arg ("s3") <<= this->out_.in ();
req->set_return_type (Param_Test::_tc_Bounded_Short_Seq);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Param_Test::Bounded_Short_Seq *tmp;
req->return_value () >>= tmp;
@@ -66,13 +65,11 @@ Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr arg2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg2->value () >>= tmp;
this->inout_ = new Param_Test::Bounded_Short_Seq (*tmp);
CORBA::NamedValue_ptr arg3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg3->value () >>= tmp;
this->out_ = new Param_Test::Bounded_Short_Seq (*tmp);
}
@@ -131,7 +128,6 @@ Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp
index 5d542556fa8..b41de5b6c4f 100644
--- a/TAO/tests/Param_Test/bd_str_seq.cpp
+++ b/TAO/tests/Param_Test/bd_str_seq.cpp
@@ -19,8 +19,8 @@
#include "helper.h"
#include "bd_str_seq.h"
-ACE_RCSID (Param_Test,
- bd_str_seq,
+ACE_RCSID (Param_Test,
+ bd_str_seq,
"$Id$")
// ************************************************************************
@@ -58,8 +58,7 @@ Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req
req->set_return_type (Param_Test::_tc_Bounded_StrSeq);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
const Param_Test::Bounded_StrSeq *tmp;
req->return_value () >>= tmp;
@@ -67,13 +66,11 @@ Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr arg2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg2->value () >>= tmp;
this->inout_ = new Param_Test::Bounded_StrSeq (*tmp);
CORBA::NamedValue_ptr arg3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg3->value () >>= tmp;
this->out_ = new Param_Test::Bounded_StrSeq (*tmp);
}
@@ -124,7 +121,6 @@ Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp
index 149ac604a6a..5eacc3e879f 100644
--- a/TAO/tests/Param_Test/bd_string.cpp
+++ b/TAO/tests/Param_Test/bd_string.cpp
@@ -19,8 +19,8 @@
#include "helper.h"
#include "bd_string.h"
-ACE_RCSID (Param_Test,
- bd_string,
+ACE_RCSID (Param_Test,
+ bd_string,
"$Id$")
// ************************************************************************
@@ -69,8 +69,7 @@ Test_Bounded_String::dii_req_invoke (CORBA::Request *req
req->set_return_type (Param_Test::_tc_short_string);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
char *tmp;
req->return_value () >>= CORBA::Any::to_string (tmp, 128);
@@ -78,13 +77,11 @@ Test_Bounded_String::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr arg2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg2->value () >>= CORBA::Any::to_string (tmp, 128);
this->inout_ = CORBA::string_dup (tmp);
CORBA::NamedValue_ptr arg3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg3->value () >>= CORBA::Any::to_string (tmp, 128);
this->out_ = CORBA::string_dup (tmp);
}
@@ -137,7 +134,6 @@ Test_Bounded_String::run_sii_test (Param_Test_ptr objref
this->inout_,
str_out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp
index 1c2593b9f40..40dc7e39d00 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.cpp
+++ b/TAO/tests/Param_Test/bd_struct_seq.cpp
@@ -19,8 +19,8 @@
#include "helper.h"
#include "bd_struct_seq.h"
-ACE_RCSID (Param_Test,
- bd_struct_seq,
+ACE_RCSID (Param_Test,
+ bd_struct_seq,
"$Id$")
const CORBA::ULong MAX_STRUCTSEQ_LEN = 1;
@@ -60,8 +60,7 @@ Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req
req->add_out_arg ("s3") <<= this->out_.in ();
req->set_return_type (Param_Test::_tc_Bounded_StructSeq);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Param_Test::Bounded_StructSeq *tmp;
req->return_value () >>= tmp;
@@ -69,13 +68,11 @@ Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr arg2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg2->value () >>= tmp;
this->inout_ = new Param_Test::Bounded_StructSeq (*tmp);
CORBA::NamedValue_ptr arg3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg3->value () >>= tmp;
this->out_ = new Param_Test::Bounded_StructSeq (*tmp);
}
@@ -129,7 +126,6 @@ Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/bd_wstr_seq.cpp b/TAO/tests/Param_Test/bd_wstr_seq.cpp
index 16d32473b03..1dccf92056f 100644
--- a/TAO/tests/Param_Test/bd_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp
@@ -20,8 +20,8 @@
#include "bd_wstr_seq.h"
#include "ace/OS_NS_wchar.h"
-ACE_RCSID (Param_Test,
- bd_wstr_seq,
+ACE_RCSID (Param_Test,
+ bd_wstr_seq,
"$Id$")
// ************************************************************************
@@ -59,8 +59,7 @@ Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req
req->set_return_type (Param_Test::_tc_Bounded_WStrSeq);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
const Param_Test::Bounded_WStrSeq *tmp;
req->return_value () >>= tmp;
@@ -68,13 +67,11 @@ Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr arg2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg2->value () >>= tmp;
this->inout_ = new Param_Test::Bounded_WStrSeq (*tmp);
CORBA::NamedValue_ptr arg3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg3->value () >>= tmp;
this->out_ = new Param_Test::Bounded_WStrSeq (*tmp);
}
@@ -124,7 +121,6 @@ Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/bd_wstring.cpp b/TAO/tests/Param_Test/bd_wstring.cpp
index 30689ff028c..fea2cc669c6 100644
--- a/TAO/tests/Param_Test/bd_wstring.cpp
+++ b/TAO/tests/Param_Test/bd_wstring.cpp
@@ -20,8 +20,8 @@
#include "bd_wstring.h"
#include "ace/OS_NS_wchar.h"
-ACE_RCSID (Param_Test,
- bd_wstring,
+ACE_RCSID (Param_Test,
+ bd_wstring,
"$Id$")
// ************************************************************************
@@ -70,8 +70,7 @@ Test_Bounded_WString::dii_req_invoke (CORBA::Request *req
req->set_return_type (Param_Test::_tc_short_wstring);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
CORBA::WChar *tmp;
req->return_value () >>= CORBA::Any::to_wstring (tmp, 128);
@@ -79,13 +78,11 @@ Test_Bounded_WString::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr arg2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg2->value () >>= CORBA::Any::to_wstring (tmp, 128);
this->inout_ = CORBA::wstring_dup (tmp);
CORBA::NamedValue_ptr arg3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg3->value () >>= CORBA::Any::to_wstring (tmp, 128);
this->out_ = CORBA::wstring_dup (tmp);
}
@@ -138,7 +135,6 @@ Test_Bounded_WString::run_sii_test (Param_Test_ptr objref
this->inout_,
str_out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp
index ee1737e545f..358628f74a8 100644
--- a/TAO/tests/Param_Test/big_union.cpp
+++ b/TAO/tests/Param_Test/big_union.cpp
@@ -56,8 +56,7 @@ Test_Big_Union::dii_req_invoke (CORBA::Request *req
req->set_return_type (Param_Test::_tc_Big_Union);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Param_Test::Big_Union *tmp;
req->return_value () >>= tmp;
@@ -65,13 +64,11 @@ Test_Big_Union::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = *tmp;
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = new Param_Test::Big_Union (*tmp);
}
@@ -83,8 +80,7 @@ Test_Big_Union::init_parameters (Param_Test_ptr objref
ACE_TRY
{
// get access to a Coffee Object
- this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->cobj_ = objref->make_coffee ();
this->reset_parameters ();
return 0;
@@ -239,7 +235,6 @@ Test_Big_Union::run_sii_test (Param_Test_ptr objref
this->inout_,
this->out_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
@@ -303,17 +298,13 @@ Test_Big_Union::check_validity (void)
return 0;
Coffee::Desc_var in_desc =
- in->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ in->description ();
Coffee::Desc_var inout_desc =
- inout->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ inout->description ();
Coffee::Desc_var out_desc =
- out->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ out->description ();
Coffee::Desc_var ret_desc =
- ret->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ret->description ();
if (ACE_OS::strcmp (in_desc->name.in (),
inout_desc->name.in ())
diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp
index 33f7f961f40..281b11ae2e0 100644
--- a/TAO/tests/Param_Test/client.cpp
+++ b/TAO/tests/Param_Test/client.cpp
@@ -69,7 +69,6 @@ Param_Test_Client<T>::run_sii_test (void)
// Initialize parameters for the test.
int check = this->test_object_->init_parameters (this->param_test_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (check == -1)
{
@@ -99,7 +98,6 @@ Param_Test_Client<T>::run_sii_test (void)
// make the call
this->test_object_->run_sii_test (this->param_test_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// stop the timer.
this->results_.stop_timer ();
@@ -182,7 +180,6 @@ Param_Test_Client<T>::run_dii_test (void)
// initialize parameters for the test
int check = this->test_object_->init_parameters (this->param_test_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (check == -1)
{
@@ -209,7 +206,6 @@ Param_Test_Client<T>::run_dii_test (void)
{
req = this->param_test_->_request (opname
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (opt->debug ())
{
@@ -220,7 +216,6 @@ Param_Test_Client<T>::run_dii_test (void)
// Make the invocation, verify the result.
this->test_object_->dii_req_invoke (req.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp
index 0dd6c1199fe..4632ba15471 100644
--- a/TAO/tests/Param_Test/complex_any.cpp
+++ b/TAO/tests/Param_Test/complex_any.cpp
@@ -20,8 +20,8 @@
#include "complex_any.h"
#include "tao/debug.h"
-ACE_RCSID (Param_Test,
- complex_any,
+ACE_RCSID (Param_Test,
+ complex_any,
"$Id$")
const int LEVEL_2_LENGTH = 5;
@@ -62,8 +62,7 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req
req->set_return_type (CORBA::_tc_any);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
const CORBA::Any *tmp;
req->return_value () >>= tmp;
@@ -71,13 +70,11 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = CORBA::Any (*tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = new CORBA::Any (*tmp);
}
@@ -178,7 +175,6 @@ Test_Complex_Any::run_sii_test (Param_Test_ptr objref
this->inout_,
this->out_.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp
index 45a45f49b38..728caf2c685 100644
--- a/TAO/tests/Param_Test/driver.cpp
+++ b/TAO/tests/Param_Test/driver.cpp
@@ -79,7 +79,6 @@ Driver::init (int argc, char **argv)
argv,
"internet"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Parse command line and verify parameters.
if (opt->parse_args (argc, argv) == -1)
@@ -93,7 +92,6 @@ Driver::init (int argc, char **argv)
CORBA::Object_var temp =
this->orb_->string_to_object (opt->param_test_ior () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (temp.in()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -106,7 +104,6 @@ Driver::init (int argc, char **argv)
this->objref_ = Param_Test::_narrow (temp.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -114,7 +111,6 @@ Driver::init (int argc, char **argv)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -620,8 +616,7 @@ Driver::run (void)
{
if (opt->shutdown ())
{
- this->objref_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->objref_->shutdown ();
}
}
ACE_CATCHANY
diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp
index 959d2459c07..1f9ac960769 100644
--- a/TAO/tests/Param_Test/except.cpp
+++ b/TAO/tests/Param_Test/except.cpp
@@ -65,20 +65,17 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req
Param_Test::_tc_Ooops
));
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ req->invoke ();
req->return_value () >>= this->ret_;
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
*o2->value () >>= this->inout_;
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
*o3->value () >>= this->out_;
}
@@ -236,7 +233,6 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req
}
}
ACE_ENDTRY;
- ACE_CHECK;
}
int
@@ -268,7 +264,6 @@ Test_Exception::run_sii_test (Param_Test_ptr objref
this->inout_,
this->out_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (Param_Test::Ooops, ex)
{
diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp
index a8e5fe0f82a..09433669ad5 100644
--- a/TAO/tests/Param_Test/fixed_array.cpp
+++ b/TAO/tests/Param_Test/fixed_array.cpp
@@ -19,8 +19,8 @@
#include "helper.h"
#include "fixed_array.h"
-ACE_RCSID (Param_Test,
- fixed_array,
+ACE_RCSID (Param_Test,
+ fixed_array,
"$Id$")
// ************************************************************************
@@ -54,8 +54,7 @@ Test_Fixed_Array::dii_req_invoke (CORBA::Request *req
req->add_out_arg ("s3") <<= Param_Test::Fixed_Array_forany (this->out_);
req->set_return_type (Param_Test::_tc_Fixed_Array);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Param_Test::Fixed_Array_forany forany;
req->return_value () >>= forany;
@@ -63,13 +62,11 @@ Test_Fixed_Array::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr arg2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg2->value () >>= forany;
Param_Test::Fixed_Array_copy (this->inout_, forany.in ());
CORBA::NamedValue_ptr arg3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
Param_Test::Fixed_Array_forany out_any (this->out_);
*arg3->value () >>= forany;
Param_Test::Fixed_Array_copy (this->out_, forany.in ());
@@ -117,7 +114,6 @@ Test_Fixed_Array::run_sii_test (Param_Test_ptr objref
this->inout_,
this->out_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp
index 9447fbf88a1..39f02f728b5 100644
--- a/TAO/tests/Param_Test/fixed_struct.cpp
+++ b/TAO/tests/Param_Test/fixed_struct.cpp
@@ -19,8 +19,8 @@
#include "helper.h"
#include "fixed_struct.h"
-ACE_RCSID (Param_Test,
- fixed_struct,
+ACE_RCSID (Param_Test,
+ fixed_struct,
"$Id$")
// ************************************************************************
@@ -53,8 +53,7 @@ Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req
req->add_out_arg ("s3") <<= this->out_;
req->set_return_type (Param_Test::_tc_Fixed_Struct);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Param_Test::Fixed_Struct *tmp;
req->return_value () >>= tmp;
@@ -62,13 +61,11 @@ Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr arg2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg2->value () >>= tmp;
this->inout_ = *tmp;
CORBA::NamedValue_ptr arg3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg3->value () >>= tmp;
this->out_ = *tmp;
}
@@ -116,7 +113,6 @@ Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref
this->inout_,
this->out_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/multdim_array.cpp b/TAO/tests/Param_Test/multdim_array.cpp
index 69b3f3e8f3a..a8fc22b04e7 100644
--- a/TAO/tests/Param_Test/multdim_array.cpp
+++ b/TAO/tests/Param_Test/multdim_array.cpp
@@ -18,8 +18,8 @@
#include "multdim_array.h"
-ACE_RCSID (Param_Test,
- multdim_array,
+ACE_RCSID (Param_Test,
+ multdim_array,
"$Id$")
// ************************************************************************
@@ -57,8 +57,7 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req
req->set_return_type (Param_Test::_tc_Multdim_Array);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Param_Test::Multdim_Array_forany forany;
@@ -67,13 +66,11 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= forany;
Param_Test::Multdim_Array_copy (this->inout_, forany.in ());
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= forany;
Param_Test::Multdim_Array_copy (this->out_, forany.in ());
}
@@ -144,7 +141,6 @@ Test_Multdim_Array::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
this->out_.inout ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
ACE_CATCHANY
diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp
index b48b8ef65ed..dadb75e9c1d 100644
--- a/TAO/tests/Param_Test/nested_struct.cpp
+++ b/TAO/tests/Param_Test/nested_struct.cpp
@@ -20,7 +20,7 @@
#include "nested_struct.h"
ACE_RCSID (Param_Test,
- nested_struct,
+ nested_struct,
"$Id$")
// ************************************************************************
@@ -57,8 +57,7 @@ Test_Nested_Struct::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL)
req->add_out_arg ("s3") <<= this->out_.in ();
req->set_return_type (Param_Test::_tc_Nested_Struct);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Param_Test::Nested_Struct *tmp;
req->return_value () >>= tmp;
@@ -66,13 +65,11 @@ Test_Nested_Struct::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL)
CORBA::NamedValue_ptr arg2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg2->value () >>= tmp;
this->inout_ = new Param_Test::Nested_Struct (*tmp);
CORBA::NamedValue_ptr arg3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*arg3->value () >>= tmp;
this->out_ = new Param_Test::Nested_Struct (*tmp);
}
@@ -142,7 +139,6 @@ Test_Nested_Struct::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp
index 4b0986404b4..4c4d1c7cf4a 100644
--- a/TAO/tests/Param_Test/objref.cpp
+++ b/TAO/tests/Param_Test/objref.cpp
@@ -20,7 +20,7 @@
#include "objref.h"
ACE_RCSID (Param_Test,
- objref,
+ objref,
"$Id$")
// ************************************************************************
@@ -54,8 +54,7 @@ Test_ObjRef::dii_req_invoke (CORBA::Request *req
req->set_return_type (_tc_Coffee);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Coffee_ptr tmp;
req->return_value () >>= tmp;
@@ -63,13 +62,11 @@ Test_ObjRef::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = Coffee::_duplicate (tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = Coffee::_duplicate (tmp);
}
@@ -97,8 +94,7 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref
ACE_OS::strcpy (msg_str, "make_cofee");
// first get a Coffee object
- this->in_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->in_ = objref->make_coffee ();
// Get some index into Coffee_Flavor [].
CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 6);
@@ -107,7 +103,6 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref
// set the attribute of the object
ACE_OS::strcpy (msg_str, "set coffee attribute");
this->in_->description (desc ACE_ENV_ARG_PARAMETER); // set the attribute for the in object
- ACE_TRY_CHECK;
this->inout_ = Coffee::_nil ();
this->out_ = Coffee::_nil ();
@@ -139,7 +134,6 @@ Test_ObjRef::reset_parameters (void)
{
// set the attribute of the object
this->in_->description (desc ACE_ENV_ARG_PARAMETER); // set the attribute for the in object
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -166,7 +160,6 @@ Test_ObjRef::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
this->out_.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
@@ -197,25 +190,21 @@ Test_ObjRef::check_validity (void)
return 0;
}
Coffee::Desc_var in_desc =
- this->in_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->in_->description ();
const char *in = in_desc->name.in ();
Coffee::Desc_var inout_desc =
- this->inout_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->inout_->description ();
const char *inout = inout_desc->name.in ();
Coffee::Desc_var out_desc =
- this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->out_->description ();
const char *out = out_desc->name.in ();
- Coffee::Desc_var ret_desc = this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Coffee::Desc_var ret_desc = this->out_->description ();
const char* ret = ret_desc->name.in ();
@@ -260,32 +249,28 @@ Test_ObjRef::print_values (void)
if (!CORBA::is_nil (this->in_.in ()))
{
in_desc =
- this->in_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->in_->description ();
in = in_desc->name.in ();
}
if (!CORBA::is_nil (this->inout_.in ()))
{
inout_desc =
- this->inout_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->inout_->description ();
inout = inout_desc->name.in ();
}
if (!CORBA::is_nil (this->out_.in ()))
{
out_desc =
- this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->out_->description ();
out = out_desc->name.in ();
}
if (!CORBA::is_nil (this->ret_.in ()))
{
ret_desc =
- this->ret_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->ret_->description ();
ret = ret_desc->name.in ();
}
}
@@ -295,7 +280,6 @@ Test_ObjRef::print_values (void)
return;
}
ACE_ENDTRY;
- ACE_CHECK;
diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp
index c299f461a8a..444df058841 100644
--- a/TAO/tests/Param_Test/objref_struct.cpp
+++ b/TAO/tests/Param_Test/objref_struct.cpp
@@ -20,7 +20,7 @@
#include "objref_struct.h"
ACE_RCSID (Param_Test,
- objref_struct,
+ objref_struct,
"$Id$")
// ************************************************************************
@@ -59,8 +59,7 @@ Test_Objref_Struct::dii_req_invoke (CORBA::Request *req
req->set_return_type (Param_Test::_tc_Objref_Struct);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Param_Test::Objref_Struct *tmp;
req->return_value () >>= tmp;
@@ -68,13 +67,11 @@ Test_Objref_Struct::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = new Param_Test::Objref_Struct (*tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = new Param_Test::Objref_Struct (*tmp);
}
@@ -90,15 +87,13 @@ Test_Objref_Struct::init_parameters (Param_Test_ptr objref
// Set the long member.
this->in_.x = gen->gen_long ();
- this->in_.y = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->in_.y = objref->make_coffee ();
Coffee::Desc d;
d.name = gen->gen_string ();
this->in_.y->description (d
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->inout_->x = 0;
@@ -148,7 +143,6 @@ Test_Objref_Struct::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
@@ -182,17 +176,13 @@ Test_Objref_Struct::check_validity (void)
return 0;
}
- Coffee::Desc_var s_in = this->in_.y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Coffee::Desc_var s_in = this->in_.y->description ();
- Coffee::Desc_var s_out = this->out_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Coffee::Desc_var s_out = this->out_->y->description ();
- Coffee::Desc_var s_inout = this->inout_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Coffee::Desc_var s_inout = this->inout_->y->description ();
- Coffee::Desc_var s_ret = this->ret_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Coffee::Desc_var s_ret = this->ret_->y->description ();
if (ACE_OS::strcmp (s_in->name, s_out->name) != 0
|| ACE_OS::strcmp (s_in->name, s_inout->name) != 0
@@ -237,9 +227,8 @@ Test_Objref_Struct::print_values (void)
ACE_TRY
{
- Coffee::Desc_var s_in =
- this->in_.y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Coffee::Desc_var s_in =
+ this->in_.y->description ();
Coffee::Desc_var s_inout = new Coffee::Desc;
Coffee::Desc_var s_out = new Coffee::Desc;
@@ -250,20 +239,17 @@ Test_Objref_Struct::print_values (void)
if (!CORBA::is_nil (this->out_->y.in ()))
{
- s_out = this->out_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ s_out = this->out_->y->description ();
}
if (!CORBA::is_nil (this->inout_->y.in ()))
{
- s_inout = this->inout_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ s_inout = this->inout_->y->description ();
}
if (!CORBA::is_nil (this->ret_->y.in ()))
{
- s_ret = this->ret_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ s_ret = this->ret_->y->description ();
}
ACE_DEBUG ((LM_DEBUG,
@@ -283,5 +269,4 @@ Test_Objref_Struct::print_values (void)
"Test_Objref_Struct::print_values\n");
}
ACE_ENDTRY;
- ACE_CHECK;
}
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index a1710fd8122..fbdf0f0a978 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -692,10 +692,10 @@ Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1,
// make a Coffee object
Coffee_ptr
-Param_Test_i::make_coffee (ACE_ENV_SINGLE_ARG_DECL)
+Param_Test_i::make_coffee (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->obj_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->obj_._this ();
}
// test for object references
@@ -710,15 +710,13 @@ Param_Test_i::test_objref (Coffee_ptr o1,
ACE_TRY
{
- Coffee_var myobj = obj_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Coffee_var myobj = obj_._this ();
if (!CORBA::is_nil (o2))
CORBA::release (o2);
CORBA::Boolean equiv = myobj->_is_equivalent (o1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (equiv)
{
@@ -789,8 +787,7 @@ Param_Test_i::test_any (const CORBA::Any &a1,
if (TAO_debug_level > 0)
{
CORBA::TypeCode_var tc = a1.type ();
- int kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ int kind = tc->kind ();
ACE_DEBUG ((LM_DEBUG,
"Received any contents are <%d>\n",
@@ -994,8 +991,7 @@ Param_Test_i::test_exception (CORBA::ULong s1,
// warning that test_exception is throwing an exception
// not in its THROW_SPEC, but still test TAO's
// conversion of such an exception to UNKNOWN.
- this->throw_badboy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->throw_badboy ();
return 0;
}
@@ -1067,14 +1063,14 @@ Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1,
}
void
-Param_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Param_Test_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown ();
}
void
-Param_Test_i::throw_badboy (ACE_ENV_SINGLE_ARG_DECL)
+Param_Test_i::throw_badboy (void)
{
ACE_THROW (Param_Test::BadBoy ());
}
diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h
index 8f9307c3266..c35af9e5f29 100644
--- a/TAO/tests/Param_Test/param_test_i.h
+++ b/TAO/tests/Param_Test/param_test_i.h
@@ -31,7 +31,7 @@ public:
// =methods for the attribute
- virtual Coffee::Desc * description (ACE_ENV_SINGLE_ARG_DECL)
+ virtual Coffee::Desc * description (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// get attribute
@@ -241,7 +241,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
virtual Coffee_ptr
- make_coffee (ACE_ENV_SINGLE_ARG_DECL)
+ make_coffee (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// make a coffee object
@@ -328,7 +328,7 @@ public:
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
@@ -339,7 +339,7 @@ private:
Coffee_i obj_;
// the coffee object reference we maintain
- void throw_badboy (ACE_ENV_SINGLE_ARG_DECL);
+ void throw_badboy (void);
// Called by test_exception. This will avoid the compiler
// warning that test_exception is throwing an exception
// not in its THROW_SPEC, but still test TAO's
diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp
index 18d49fd2779..9117f8712ef 100644
--- a/TAO/tests/Param_Test/recursive_struct.cpp
+++ b/TAO/tests/Param_Test/recursive_struct.cpp
@@ -19,7 +19,7 @@
#include "recursive_struct.h"
ACE_RCSID (Param_Test,
- recursive_struct,
+ recursive_struct,
"$Id$")
const CORBA::ULong MAX_DEPTH = 5;
@@ -58,8 +58,7 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req
req->set_return_type (Param_Test::_tc_Recursive_Struct);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Param_Test::Recursive_Struct *tmp;
req->return_value () >>= tmp;
@@ -67,13 +66,11 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = new Param_Test::Recursive_Struct (*tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = new Param_Test::Recursive_Struct (*tmp);
}
@@ -129,7 +126,6 @@ Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp
index 5fc3c86506f..c636c7e7300 100644
--- a/TAO/tests/Param_Test/recursive_union.cpp
+++ b/TAO/tests/Param_Test/recursive_union.cpp
@@ -19,7 +19,7 @@
#include "recursive_union.h"
ACE_RCSID (Param_Test,
- recursive_union,
+ recursive_union,
"$Id$")
const CORBA::ULong MAX_DEPTH = 3;
@@ -58,8 +58,7 @@ Test_Recursive_Union::dii_req_invoke (CORBA::Request *req
req->set_return_type (Param_Test::_tc_Recursive_Union);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Param_Test::Recursive_Union *tmp;
req->return_value () >>= tmp;
@@ -67,13 +66,11 @@ Test_Recursive_Union::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = new Param_Test::Recursive_Union (*tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = new Param_Test::Recursive_Union (*tmp);
}
@@ -131,7 +128,6 @@ Test_Recursive_Union::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp
index c66e703967f..fd3e41e0f40 100644
--- a/TAO/tests/Param_Test/server.cpp
+++ b/TAO/tests/Param_Test/server.cpp
@@ -67,7 +67,6 @@ main (int argc, char *argv[])
const char *orb_name = "";
CORBA::ORB_var orb_ptr =
CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var temp; // holder for the myriad of times we get
// an object which we then have to narrow.
@@ -76,7 +75,6 @@ main (int argc, char *argv[])
temp = orb_ptr->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (temp.in()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -84,23 +82,19 @@ main (int argc, char *argv[])
1);
oa_ptr = PortableServer::POA::_narrow (temp.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- oa_ptr->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ oa_ptr->the_POAManager ();
CORBA::PolicyList policies (2);
policies.length (2);
policies[0] =
oa_ptr->create_id_assignment_policy (PortableServer::USER_ID
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
policies[1] =
oa_ptr->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// We use a different POA, otherwise the user would have to
// change the object key each time it invokes the server.
@@ -109,7 +103,6 @@ main (int argc, char *argv[])
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Parse remaining command line and verify parameters.
parse_args (argc, argv);
@@ -128,19 +121,16 @@ main (int argc, char *argv[])
good_poa->activate_object_with_id (id.in (),
param_test
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Stringify the objref we'll be implementing, and print it to
// stdout. Someone will take that string and give it to a
// client. Then release the object.
temp = good_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var str =
orb_ptr->object_to_string (temp.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (TAO_debug_level > 0)
{
@@ -166,21 +156,17 @@ main (int argc, char *argv[])
// Make the POAs controlled by this manager active
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
- orb_ptr->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb_ptr->run ();
good_poa->destroy (1,
1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
oa_ptr->destroy (1,
1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::SystemException, sysex)
{
@@ -193,7 +179,6 @@ main (int argc, char *argv[])
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
// Free resources
delete param_test;
diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp
index adaa7219c30..5fe6e403958 100644
--- a/TAO/tests/Param_Test/short.cpp
+++ b/TAO/tests/Param_Test/short.cpp
@@ -19,8 +19,8 @@
#include "helper.h"
#include "short.h"
-ACE_RCSID (Param_Test,
- short,
+ACE_RCSID (Param_Test,
+ short,
"$Id$")
// ************************************************************************
@@ -54,19 +54,16 @@ Test_Short::dii_req_invoke (CORBA::Request *req
req->set_return_type (CORBA::_tc_short);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
req->return_value () >>= this->ret_;
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= this->inout_;
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= this->out_;
}
@@ -100,7 +97,6 @@ Test_Short::run_sii_test (Param_Test_ptr objref
this->inout_,
this->out_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp
index 81a771b66ea..bc59b246fd8 100644
--- a/TAO/tests/Param_Test/small_union.cpp
+++ b/TAO/tests/Param_Test/small_union.cpp
@@ -20,7 +20,7 @@
#include "small_union.h"
ACE_RCSID (Param_Test,
- small_union,
+ small_union,
"$Id$")
// ************************************************************************
@@ -56,8 +56,7 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req
req->set_return_type (Param_Test::_tc_Small_Union);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Param_Test::Small_Union *tmp;
req->return_value () >>= tmp;
@@ -65,13 +64,11 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = *tmp;
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = new Param_Test::Small_Union (*tmp);
}
@@ -83,8 +80,7 @@ Test_Small_Union::init_parameters (Param_Test_ptr objref
ACE_TRY
{
// get access to a Coffee Object
- this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->cobj_ = objref->make_coffee ();
this->reset_parameters ();
return 0;
@@ -140,7 +136,6 @@ Test_Small_Union::run_sii_test (Param_Test_ptr objref
this->inout_,
this->out_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp
index 551ef486f39..3f35c5fcc6a 100644
--- a/TAO/tests/Param_Test/typecode.cpp
+++ b/TAO/tests/Param_Test/typecode.cpp
@@ -20,7 +20,7 @@
#include "typecode.h"
ACE_RCSID (Param_Test,
- typecode,
+ typecode,
"$Id$")
// ************************************************************************
@@ -54,8 +54,7 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req
req->set_return_type (CORBA::_tc_TypeCode);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
CORBA::TypeCode_ptr tmp;
req->return_value () >>= tmp;
@@ -63,13 +62,11 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = CORBA::TypeCode::_duplicate (tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = CORBA::TypeCode::_duplicate (tmp);
}
@@ -123,7 +120,6 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref
ACE_TRY
{
this->init_parameters (objref ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::TypeCode_out out (this->out_);
@@ -131,7 +127,6 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
@@ -156,15 +151,12 @@ Test_TypeCode::check_validity (void)
one = this->in_.in ()->equal (this->inout_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
two = this->in_.in ()->equal (this->out_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
three = this->in_.in ()->equal (this->ret_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (one && two && three)
return 1;
diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp
index dd5277d5924..d059728a3cd 100644
--- a/TAO/tests/Param_Test/ub_any_seq.cpp
+++ b/TAO/tests/Param_Test/ub_any_seq.cpp
@@ -21,7 +21,7 @@
#include "tao/debug.h"
ACE_RCSID (Param_Test,
- ub_any_seq,
+ ub_any_seq,
"$Id$")
const CORBA::ULong TEST_SEQ_LENGTH = 5;
@@ -62,8 +62,7 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req
req->set_return_type (CORBA::_tc_AnySeq);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
CORBA::AnySeq* tmp;
req->return_value () >>= tmp;
@@ -71,13 +70,11 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = new CORBA::AnySeq (*tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = new CORBA::AnySeq (*tmp);
}
@@ -126,8 +123,7 @@ Test_AnySeq::init_parameters (Param_Test_ptr objref
ACE_TRY
{
// get access to a Coffee Object
- Coffee_var cobj = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Coffee_var cobj = objref->make_coffee ();
// insert the coffee object into the Any
this->in_[i] <<= cobj.in ();
@@ -210,7 +206,6 @@ Test_AnySeq::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/ub_array_seq.cpp b/TAO/tests/Param_Test/ub_array_seq.cpp
index 104c4885c74..a672933cecb 100644
--- a/TAO/tests/Param_Test/ub_array_seq.cpp
+++ b/TAO/tests/Param_Test/ub_array_seq.cpp
@@ -19,8 +19,8 @@
#include "helper.h"
#include "ub_array_seq.h"
-ACE_RCSID (Param_Test,
- ub_array_seq,
+ACE_RCSID (Param_Test,
+ ub_array_seq,
"$Id$")
// ************************************************************************
@@ -59,8 +59,7 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req
req->set_return_type (Param_Test::_tc_ArraySeq);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Param_Test::ArraySeq *tmp;
req->return_value () >>= tmp;
@@ -68,13 +67,11 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = new Param_Test::ArraySeq (*tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = new Param_Test::ArraySeq (*tmp);
}
@@ -140,7 +137,6 @@ Test_Array_Sequence::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp
index 32ef0cba131..fb026404ab5 100644
--- a/TAO/tests/Param_Test/ub_long_seq.cpp
+++ b/TAO/tests/Param_Test/ub_long_seq.cpp
@@ -20,7 +20,7 @@
#include "ub_long_seq.h"
ACE_RCSID (Param_Test,
- ub_long_seq,
+ ub_long_seq,
"$Id$")
// ************************************************************************
@@ -58,8 +58,7 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req
req->set_return_type (CORBA::_tc_LongSeq);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
CORBA::LongSeq *tmp;
req->return_value () >>= tmp;
@@ -67,13 +66,11 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = CORBA::LongSeq (*tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = CORBA::LongSeq (*tmp);
}
@@ -120,7 +117,6 @@ Test_Long_Sequence::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp
index d15d6f0baac..247ddfaf5f2 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.cpp
+++ b/TAO/tests/Param_Test/ub_objref_seq.cpp
@@ -20,7 +20,7 @@
#include "ub_objref_seq.h"
ACE_RCSID (Param_Test,
- ub_objref_seq,
+ ub_objref_seq,
"$Id$")
// ************************************************************************
@@ -68,8 +68,7 @@ Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req
req->set_return_type (Param_Test::_tc_Coffee_Mix);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Param_Test::Coffee_Mix *tmp;
req->return_value () >>= tmp;
@@ -77,13 +76,11 @@ Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = new Param_Test::Coffee_Mix (*tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = new Param_Test::Coffee_Mix (*tmp);
}
@@ -108,8 +105,7 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref
{
// generate some arbitrary string to be filled into the ith location in
// the sequence
- this->in_[i] = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->in_[i] = objref->make_coffee ();
// select a Coffee flavor at random
CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 6);
@@ -120,7 +116,6 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref
tmp->description (desc
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
return 0;
@@ -156,7 +151,6 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
@@ -180,17 +174,14 @@ Test_ObjRef_Sequence::check_validity (void)
this->compare (this->in_,
this->inout_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->compare (this->in_,
this->out_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->compare (this->in_,
this->ret_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 1;
}
@@ -263,13 +254,11 @@ Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1,
return 0;
}
- Coffee::Desc_var desc1 = vs1->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Coffee::Desc_var desc1 = vs1->description ();
CORBA::String_var n1 = desc1->name.in ();
- Coffee::Desc_var desc2 = vs2->description (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Coffee::Desc_var desc2 = vs2->description ();
CORBA::String_var n2 = desc2->name.in ();
diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp
index c7740c69fdb..9ade673571a 100644
--- a/TAO/tests/Param_Test/ub_short_seq.cpp
+++ b/TAO/tests/Param_Test/ub_short_seq.cpp
@@ -20,7 +20,7 @@
#include "ub_short_seq.h"
ACE_RCSID (Param_Test,
- ub_short_seq,
+ ub_short_seq,
"$Id$")
// ************************************************************************
@@ -58,8 +58,7 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req
req->set_return_type (CORBA::_tc_ShortSeq);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
CORBA::ShortSeq *tmp;
req->return_value () >>= tmp;
@@ -67,13 +66,11 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = new CORBA::ShortSeq (*tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = new CORBA::ShortSeq (*tmp);
}
@@ -122,7 +119,6 @@ Test_Short_Sequence::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp
index 730701506f0..461de5233ba 100644
--- a/TAO/tests/Param_Test/ub_str_seq.cpp
+++ b/TAO/tests/Param_Test/ub_str_seq.cpp
@@ -20,7 +20,7 @@
#include "ub_str_seq.h"
ACE_RCSID (Param_Test,
- ub_str_seq,
+ ub_str_seq,
"$Id$")
// ************************************************************************
@@ -58,8 +58,7 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req
req->set_return_type (CORBA::_tc_StringSeq);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
CORBA::StringSeq *tmp;
req->return_value () >>= tmp;
@@ -67,13 +66,11 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = new CORBA::StringSeq (*tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = new CORBA::StringSeq (*tmp);
}
@@ -126,7 +123,6 @@ Test_String_Sequence::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp
index 1392df320c0..a44252ce1f3 100644
--- a/TAO/tests/Param_Test/ub_string.cpp
+++ b/TAO/tests/Param_Test/ub_string.cpp
@@ -20,7 +20,7 @@
#include "ub_string.h"
ACE_RCSID (Param_Test,
- ub_string,
+ ub_string,
"$Id$")
// ************************************************************************
@@ -69,8 +69,7 @@ Test_Unbounded_String::dii_req_invoke (CORBA::Request *req
req->set_return_type (CORBA::_tc_string);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
const char *tmp;
req->return_value () >>= tmp;
@@ -78,13 +77,11 @@ Test_Unbounded_String::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = CORBA::string_dup (tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = CORBA::string_dup (tmp);
}
@@ -138,7 +135,6 @@ Test_Unbounded_String::run_sii_test (Param_Test_ptr objref
this->inout_,
str_out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp
index 805ecf71579..49db2cf09d9 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.cpp
+++ b/TAO/tests/Param_Test/ub_struct_seq.cpp
@@ -20,7 +20,7 @@
#include "ub_struct_seq.h"
ACE_RCSID (Param_Test,
- ub_struct_seq,
+ ub_struct_seq,
"$Id$")
// ************************************************************************
@@ -59,8 +59,7 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req
req->set_return_type (Param_Test::_tc_StructSeq);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Param_Test::StructSeq *tmp;
req->return_value () >>= tmp;
@@ -68,13 +67,11 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = new Param_Test::StructSeq (*tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = new Param_Test::StructSeq (*tmp);
}
@@ -123,7 +120,6 @@ Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
@@ -266,8 +262,7 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req
req->set_return_type (Param_Test::_tc_PathSpec);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Param_Test::PathSpec *tmp;
req->return_value () >>= tmp;
@@ -275,13 +270,11 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = new Param_Test::PathSpec (*tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = new Param_Test::PathSpec (*tmp);
}
@@ -328,7 +321,6 @@ Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp
index e082cc19817..379e35214e0 100644
--- a/TAO/tests/Param_Test/ub_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp
@@ -21,7 +21,7 @@
#include "ace/OS_NS_wchar.h"
ACE_RCSID (Param_Test,
- ub_wstr_seq,
+ ub_wstr_seq,
"$Id$")
// ************************************************************************
@@ -59,8 +59,7 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req
req->set_return_type (CORBA::_tc_WStringSeq);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
CORBA::WStringSeq *tmp;
req->return_value () >>= tmp;
@@ -68,13 +67,11 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = new CORBA::WStringSeq (*tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = new CORBA::WStringSeq (*tmp);
}
@@ -122,7 +119,6 @@ Test_WString_Sequence::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp
index a74134ff06b..0adb35e7ebe 100644
--- a/TAO/tests/Param_Test/ub_wstring.cpp
+++ b/TAO/tests/Param_Test/ub_wstring.cpp
@@ -21,7 +21,7 @@
#include "ace/OS_NS_wchar.h"
ACE_RCSID (Param_Test,
- ub_wstring,
+ ub_wstring,
"$Id$")
// ************************************************************************
@@ -70,8 +70,7 @@ Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req
req->set_return_type (CORBA::_tc_wstring);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
const CORBA::WChar *tmp;
req->return_value () >>= tmp;
@@ -79,13 +78,11 @@ Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = CORBA::wstring_dup (tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = CORBA::wstring_dup (tmp);
}
@@ -138,7 +135,6 @@ Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref
this->inout_,
str_out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp
index d8104652da1..cdd06db2f10 100644
--- a/TAO/tests/Param_Test/ulonglong.cpp
+++ b/TAO/tests/Param_Test/ulonglong.cpp
@@ -20,7 +20,7 @@
#include "ulonglong.h"
ACE_RCSID (Param_Test,
- ulonglong,
+ ulonglong,
"$Id$")
Test_ULongLong::Test_ULongLong (void)
@@ -50,19 +50,16 @@ Test_ULongLong::dii_req_invoke (CORBA::Request *req
req->set_return_type (CORBA::_tc_ulonglong);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
req->return_value () >>= this->ret_;
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= this->inout_;
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= this->out_;
}
@@ -97,7 +94,6 @@ Test_ULongLong::run_sii_test (Param_Test_ptr objref
this->out_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp
index f07192921e5..aee46a70b8a 100644
--- a/TAO/tests/Param_Test/var_array.cpp
+++ b/TAO/tests/Param_Test/var_array.cpp
@@ -20,7 +20,7 @@
#include "var_array.h"
ACE_RCSID (Param_Test,
- var_array,
+ var_array,
"$Id$")
// ************************************************************************
@@ -56,8 +56,7 @@ Test_Var_Array::dii_req_invoke (CORBA::Request *req
req->set_return_type (Param_Test::_tc_Var_Array);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Param_Test::Var_Array_forany forany;
@@ -66,13 +65,11 @@ Test_Var_Array::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= forany;
Param_Test::Var_Array_copy (this->inout_, forany.in ());
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= forany;
this->out_ = Param_Test::Var_Array_dup (forany.in ());
}
@@ -115,7 +112,6 @@ Test_Var_Array::run_sii_test (Param_Test_ptr objref
this->inout_,
out_arr
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp
index 679ed7b3db3..7b944bded68 100644
--- a/TAO/tests/Param_Test/var_struct.cpp
+++ b/TAO/tests/Param_Test/var_struct.cpp
@@ -20,7 +20,7 @@
#include "var_struct.h"
ACE_RCSID (Param_Test,
- var_struct,
+ var_struct,
"$Id$")
// ************************************************************************
@@ -59,8 +59,7 @@ Test_Var_Struct::dii_req_invoke (CORBA::Request *req
req->set_return_type (Param_Test::_tc_Var_Struct);
- req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ req->invoke ();
Param_Test::Var_Struct *tmp;
req->return_value () >>= tmp;
@@ -68,13 +67,11 @@ Test_Var_Struct::dii_req_invoke (CORBA::Request *req
CORBA::NamedValue_ptr o2 =
req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = new Param_Test::Var_Struct (*tmp);
CORBA::NamedValue_ptr o3 =
req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = new Param_Test::Var_Struct (*tmp);
}
@@ -145,7 +142,6 @@ Test_Var_Struct::run_sii_test (Param_Test_ptr objref
this->inout_.inout (),
out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}