summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-06-04 16:02:45 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-06-04 16:02:45 +0000
commit2062224006a77cfca5fe13e7781fc6497b3a4b0a (patch)
treeec7068c2fd6c9e32b04f33191f39b8ee9f81779b
parentd1da36f76c1e711d4ecbef092f860769da159f6a (diff)
downloadATCD-2062224006a77cfca5fe13e7781fc6497b3a4b0a.tar.gz
Fixed broken test code in test_union_dii().
-rw-r--r--TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp14
1 files changed, 5 insertions, 9 deletions
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index b99dfef566a..e85e39bf9ce 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -524,17 +524,13 @@ DII_Cubit_Client::cube_union_dii (void)
ACE_TRY_CHECK;
- Cubit::oneof arg_union, ret_union;
+ Cubit::oneof arg_union;
arg_union._d(Cubit::e_3rd);
arg_union.cm ().l = 5;
arg_union.cm ().s = -7;
arg_union.cm ().o = 3;
- // A different discrim value than arg_ret, just to be ornery.
- ret_union._d(Cubit::e_1st);
- ret_union.s (0);
-
// Add the union to the request arg list and set the return type.
req->add_in_arg () <<= arg_union;
@@ -549,12 +545,12 @@ DII_Cubit_Client::cube_union_dii (void)
ACE_TRY_CHECK;
// Extract the result and check validity.
- Cubit::oneof* ret_ptr = &ret_union;
+ Cubit::oneof* ret_ptr;
req->return_value () >>= ret_ptr;
- if (ret_union.cm ().l != arg_union.cm ().l * arg_union.cm ().l * arg_union.cm ().l
- || ret_union.cm ().s != arg_union.cm ().s * arg_union.cm ().s * arg_union.cm ().s
- || ret_union.cm ().o != arg_union.cm ().o * arg_union.cm ().o * arg_union.cm ().o)
+ if (ret_ptr->cm ().l != arg_union.cm ().l * arg_union.cm ().l * arg_union.cm ().l
+ || ret_ptr->cm ().s != arg_union.cm ().s * arg_union.cm ().s * arg_union.cm ().s
+ || ret_ptr->cm ().o != arg_union.cm ().o * arg_union.cm ().o * arg_union.cm ().o)
{
ACE_ERROR ((LM_ERROR,
"cube_union_dii -- bad results\n"));