ChangeLogTag: Wed Sep 25 11:12:59 2002 Jeff Parsons <parsons@cs.wustl.edu>

4 files changed, 18 insertions, 59 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
index eafc335ad18..f7c297f2789 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
@@ -61,15 +61,18 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  // Generate the Any <<= and >>= operator declarations.
-  os->indent ();
-  *os << "// Any operators for interface " << node->name () << be_nl;
+  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+
+  *os << be_global->stub_export_macro () << " void"
+      << " operator<<= (CORBA::Any &, " << node->name ()
+      << "_ptr); // copying" << be_nl;
   *os << be_global->stub_export_macro () << " void"
       << " operator<<= (CORBA::Any &, " << node->name ()
-      << "_ptr);" << be_nl;
+      << "_ptr *); // non-copying" << be_nl;
   *os << be_global->stub_export_macro () << " CORBA::Boolean"
       << " operator>>= (const CORBA::Any &, "
-      << node->name () << " *&);\n";
+      << node->name () << " *&);";
 
   node->cli_hdr_any_op_gen (1);
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ci.cpp
index 34b287aa202..8d99e8abaf9 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ci.cpp
@@ -55,8 +55,8 @@ be_visitor_interface_fwd_cdr_op_ci::visit_interface_fwd (
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  // generate the CDR << and >> operator declarations
-  os->indent ();
+  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   *os << be_global->stub_export_macro () << " CORBA::Boolean operator<< ("
       << be_idt << be_idt_nl
@@ -68,7 +68,7 @@ be_visitor_interface_fwd_cdr_op_ci::visit_interface_fwd (
       << be_idt << be_idt_nl
       << "TAO_InputCDR &," << be_nl
       << node->name () << "_ptr &" << be_uidt_nl
-      << ");" << be_uidt << "\n\n";
+      << ");" << be_uidt;
 
   node->cli_inline_cdr_decl_gen (1);
 
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 7984871f1ee..dba8cd37da6 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
@@ -49,15 +49,19 @@ be_visitor_interface_fwd_ch::visit_interface_fwd (be_interface_fwd *node)
 
   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 << "class " << node->local_name () << ";" << be_nl;
+  *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 << "typedef " << node->local_name () << " *" << node->local_name ()
-      << "_ptr;" << be_nl;
+  *os << be_nl << be_nl 
+      << "typedef " << node->local_name () << " *" << node->local_name ()
+      << "_ptr;";
 
   os->gen_endif ();
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ci.cpp
deleted file mode 100644
index 8fa023edc4b..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ci.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    interface_fwd_ci.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Interface_Fwd node in the client inline.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_interface_fwd, 
-           interface_fwd_ci, 
-           "$Id$")
-
-// ********************************************************************
-// Visitor implementation for the Interface_Fwd type
-// This one for the client inline file
-// ********************************************************************
-
-be_visitor_interface_fwd_ci::be_visitor_interface_fwd_ci (
-    be_visitor_context *ctx
-  )
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_interface_fwd_ci::~be_visitor_interface_fwd_ci (void)
-{
-}
-
-int
-be_visitor_interface_fwd_ci::visit_interface_fwd (be_interface_fwd *)
-{
-  // _var and _out class generation for interfaces has been moved to the
-  // .cpp file - nothing to do here at the moment.
-
-  return 0;
-}