*** empty log message ***

4 files changed, 21 insertions, 27 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 31ec8b50b0d..0f71c7cf5a2 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,12 @@
+Tue Aug 18 15:43:16 1998  Jeff Parsons <jp4@cs.wustl.edu>
+
+	* Param_Test/ub_objref_seq.cpp:
+	* Param_Test/client.dsp:
+	* Param_Test/README:
+	  DII test now works with objref sequences. Also changed client
+	  file to reflect that longlong.cpp was changed to ulonglong.cpp.
+	  Updated README file.
+
 Tue Aug 18 15:23:21 1998  Steve Huston  <shuston@riverace.com>
 
 	* tao/Any.cpp: Use operator delete directly, rather than delete, to
diff --git a/TAO/tests/Param_Test/README b/TAO/tests/Param_Test/README
index acc3fb83095..998ed87852b 100644
--- a/TAO/tests/Param_Test/README
+++ b/TAO/tests/Param_Test/README
@@ -51,7 +51,7 @@ To run the client, type
        Data types supported in this version are:
 
        short                for shorts
-       short                for long long
+       ulonglong            for unsigned long long
        ubstring             for unbounded string
        bdstring             for bounded string
        fixed_struct         for fixed sized structs
@@ -94,13 +94,3 @@ run_test.pl:
         -t type             -- runs only one type of param test
         -i (dii|sii)        -- Changes the type of invocation (default is sii)
         
-NOTE**
-----
-	Currently there are still problems with multiple virtual inheritance
-	used in the objref data type. In these tests, type objref works with
-	sii but not dii, and objref_sequence does not work for either sii or dii.
-
-
-
-
-
diff --git a/TAO/tests/Param_Test/client.dsp b/TAO/tests/Param_Test/client.dsp
index 5b39202fc31..05c85921840 100644
--- a/TAO/tests/Param_Test/client.dsp
+++ b/TAO/tests/Param_Test/client.dsp
@@ -134,10 +134,6 @@ SOURCE=.\helper.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\longlong.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\nested_struct.cpp

 # End Source File

 # Begin Source File

@@ -206,6 +202,10 @@ SOURCE=.\ub_struct_seq.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\ulonglong.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\var_array.cpp

 # End Source File

 # Begin Source File

@@ -330,6 +330,10 @@ SOURCE=.\ub_struct_seq.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\ulonglong.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\var_array.h

 # End Source File

 # Begin Source File

diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp
index 17498a363e2..bd708813971 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.cpp
+++ b/TAO/tests/Param_Test/ub_objref_seq.cpp
@@ -35,7 +35,7 @@ static const char *Coffee_Flavor [] = {
 };
 
 Test_ObjRef_Sequence::Test_ObjRef_Sequence (void)
-  : opname_ (CORBA::string_dup ("test_objref_sequence")),
+  : opname_ (CORBA::string_dup ("test_coffe_mix")),
     inout_ (new Param_Test::Coffee_Mix),
     out_ (new Param_Test::Coffee_Mix),
     ret_ (new Param_Test::Coffee_Mix)
@@ -153,7 +153,7 @@ Test_ObjRef_Sequence::add_args (CORBA::NVList_ptr param_list,
 
   // add return value
   retval->item (0, env)->value ()->replace (Param_Test::_tc_Coffee_Mix,
-                                            &this->ret_,
+                                            &this->ret_.inout (),
                                             CORBA::B_FALSE, // does not own
                                             env);
   return 0;
@@ -204,16 +204,7 @@ Test_ObjRef_Sequence::check_validity (void)
 CORBA::Boolean
 Test_ObjRef_Sequence::check_validity (CORBA::Request_ptr req)
 {
-#if 0
-  CORBA::Environment env;
-  this->inout_ = new Param_Test::Coffee_Mix (*(Param_Test::Coffee_Mix *)
-                                                req->arguments ()->item
-                                                (1, env)->value ()->value ());
-  this->out_ = new Param_Test::Coffee_Mix (*(Param_Test::Coffee_Mix *) req->arguments
-                                              ()->item (2, env)->value ()->value ());
-  this->ret_ = new Param_Test::Coffee_Mix (*(Param_Test::Coffee_Mix *)req->result
-                                              ()->value ()->value ());
-#endif
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }