ChangeLogTag: Mon Apr 30 19:17:42 2001 Jeff Parsons <parsons@cs.wustl.edu>

3 files changed, 30 insertions, 36 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp
index 5dd8e883403..a6d567bd521 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp
@@ -300,7 +300,7 @@ be_visitor_union_branch_cdr_op_ci::visit_interface (be_interface *node)
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
       *os << node->name () << "_var _tao_union_tmp;" << be_nl
-          << "result = strm >> _tao_union_tmp;" << be_nl
+          << "result = strm >> _tao_union_tmp.inout ();" << be_nl
           << "if (result)" << be_idt_nl
           << "{" << be_idt_nl
           << "_tao_union."
@@ -354,7 +354,7 @@ be_visitor_union_branch_cdr_op_ci::visit_interface_fwd (be_interface_fwd *node)
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
       *os << node->name () << "_var _tao_union_tmp;" << be_nl
-          << "result = strm >> _tao_union_tmp;" << be_nl
+          << "result = strm >> _tao_union_tmp.inout ();" << be_nl
           << "if (result)" << be_idt_nl
           << "{" << be_idt_nl
           << "_tao_union."
diff --git a/TAO/tests/IDL_Test/full.idl b/TAO/tests/IDL_Test/full.idl
index c6e64d185e7..b1eb5e9d721 100644
--- a/TAO/tests/IDL_Test/full.idl
+++ b/TAO/tests/IDL_Test/full.idl
@@ -26,34 +26,31 @@
 // for such ILD files to include each other, as long as 
 // they are part of the same build.
 
-module mod1
+module mod2
 {
-  module mod2
+  interface fwd;
+  interface full;
+
+  interface fwd 
   {
-    interface fwd;
-    interface full;
+    attribute string attr;
 
-    interface fwd 
+    union un switch (short)
     {
-      attribute string attr;
-
-      union un switch (short)
-      {
-        case 0: full full_mem;
-      };
-
-      typedef sequence<full> full_seq;
+      case 0: full full_mem;
+    };
 
-      exception bar {};
+    typedef sequence<full> full_seq;
 
-      full op (inout full full_arg,
-               inout un un_arg,
-               inout full_seq full_seq_arg)
-               raises (bar);
-    };
+    exception bar {};
 
-    interface full;
-    interface fwd;
+    full op (inout full full_arg,
+             inout un un_arg,
+             inout full_seq full_seq_arg)
+             raises (bar);
   };
+
+  interface full;
+  interface fwd;
 };
 
diff --git a/TAO/tests/IDL_Test/fwd.idl b/TAO/tests/IDL_Test/fwd.idl
index 59dc7c75700..6a5f309bd5a 100644
--- a/TAO/tests/IDL_Test/fwd.idl
+++ b/TAO/tests/IDL_Test/fwd.idl
@@ -26,22 +26,19 @@
 // for such ILD files to include each other, as long as 
 // they are part of the same build.
 
-module mod1
+module mod2
 {
-  module mod2
-  {
-    interface fwd;
+  interface fwd;
 
-    interface full
-    {
-      fwd op (in fwd inarg,
-              inout fwd inoutarg,
-              out fwd outarg);
-    };
+  interface full
+  {
+    fwd op (in fwd inarg,
+            inout fwd inoutarg,
+            out fwd outarg);
+  };
 
-    typedef sequence<full, 5> full_seq2;
+  typedef sequence<full, 5> full_seq2;
 
-    interface fwd;
-  };
+  interface fwd;
 };