1 files changed, 3 insertions, 47 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
index dba8cd37da6..878a05e9549 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
@@ -47,24 +47,6 @@ be_visitor_interface_fwd_ch::visit_interface_fwd (be_interface_fwd *node)
       return 0;
     }
 
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  // All we do in this is generate a forward declaration of the class.
-  *os << be_nl << be_nl << "class " << node->local_name () << ";";
-
-  // Generate the ifdefined macro for the _ptr type.
-  os->gen_ifdef_macro (node->flat_name (), "_ptr");
-
-  // Generate the _ptr typedef.
-  *os << be_nl << be_nl 
-      << "typedef " << node->local_name () << " *" << node->local_name ()
-      << "_ptr;";
-
-  os->gen_endif ();
-
   AST_Interface *fd = node->full_definition ();
   be_interface *bfd = be_interface::narrow_from_decl (fd);
 
@@ -74,38 +56,12 @@ be_visitor_interface_fwd_ch::visit_interface_fwd (be_interface_fwd *node)
       be_global->non_defined_interfaces.enqueue_tail (node);
     }
 
-  // Enclose under an ifdef macro.
-  os->gen_ifdef_macro (node->flat_name (), "_var");
-
-  // Generate the _var declaration.
-  if (bfd->gen_var_defn () == -1)
+  if (bfd->var_out_seq_decls_gen () == 0)
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_fwd_ch::"
-                         "visit_interface_fwd - "
-                         "codegen for _var failed\n"),
-                        -1);
+      bfd->gen_var_out_seq_decls ();
+      bfd->var_out_seq_decls_gen (1);
     }
 
-  // Generate an endif.
-  os->gen_endif ();
-
-  // Enclose under an ifdef macro.
-  os->gen_ifdef_macro (node->flat_name (), "_out");
-
-  // generate the _out declaration - ORBOS/97-05-15 pg 16-20 spec
-  if (bfd->gen_out_defn () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_fwd_ch::"
-                         "visit_interface_fwd - "
-                         "codegen for _out failed\n"),
-                        -1);
-    }
-
-  // Generate the endif macro.
-  os->gen_endif ();
-
   node->cli_hdr_gen (I_TRUE);
   return 0;
 }