ChangeLogTag: Fri Aug 6 20:18:12 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>

10 files changed, 36 insertions, 230 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index dccc987d133..94a57c8a9a6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Fri Aug  6 20:18:12 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_home/home_ch.cpp:
+        * TAO_IDL/be/be_visitor_home/home_cs.cpp:
+        * TAO_IDL/be_include/be_visitor_home/home_cs.h:
+        * TAO_IDL/be_include/be_visitor_home/home_ch.h:
+
+          Removed these visitors, their functionality has
+          been subsumed by the corresponding interface
+          visitors.
+
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_home.cpp:
+        * TAO_IDL/be/be_visitor_module/module.cpp:
+        * TAO_IDL/be_include/be_visitor_home.h:
+
+          Changes related to the visitor removal described
+          above.
+
 Fri Aug  6 18:57:50 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_component/component_ss.cpp:
diff --git a/TAO/TAO_IDL/be/be_visitor_home.cpp b/TAO/TAO_IDL/be/be_visitor_home.cpp
index 7d758e8c7b7..9c0f6c4bf68 100644
--- a/TAO/TAO_IDL/be/be_visitor_home.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home.cpp
@@ -42,8 +42,6 @@
 #include "be_visitor_valuetype/valuetype_init_arglist_ch.h"
 #include "be_visitor_context.h"
 
-#include "be_visitor_home/home_ch.cpp"
-#include "be_visitor_home/home_cs.cpp"
 #include "be_visitor_home/home_svh.cpp"
 #include "be_visitor_home/home_svs.cpp"
 #include "be_visitor_home/home_ex_idl.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_ch.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_ch.cpp
deleted file mode 100644
index 54500e6f8f0..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_home/home_ch.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-
-//=============================================================================
-/**
- *  @file    home_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Component Home node in the client header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-be_visitor_home_ch::be_visitor_home_ch (
-    be_visitor_context *ctx
-  )
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_home_ch::~be_visitor_home_ch (void)
-{
-}
-
-int
-be_visitor_home_ch::visit_home (be_home *node)
-{
-  if (node->cli_hdr_gen () || node->imported ())
-    {
-      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 _ptr typedef.
-  *os << be_nl << be_nl 
-      << "typedef " << node->local_name () << " *" << node->local_name ()
-      << "_ptr;";
-
-    if (be_global->tc_support ())
-      {
-        be_visitor_context ctx (*this->ctx_);
-        ctx.node (node);
-        be_visitor_typecode_decl tc_visitor (&ctx);
-
-        if (node->accept (&tc_visitor) == -1)
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                              "(%N:%l) be_visitor_home_ch::"
-                              "visit_home - "
-                              "TypeCode definition failed\n"),
-                              -1);
-          }
-      }
-
-  node->cli_hdr_gen (true);
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_cs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_cs.cpp
deleted file mode 100644
index e497508d8f4..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_home/home_cs.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-
-//=============================================================================
-/**
- *  @file    home_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Component Home node in the client source.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-be_visitor_home_cs::be_visitor_home_cs (
-    be_visitor_context *ctx
-  )
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_home_cs::~be_visitor_home_cs (void)
-{
-}
-
-int
-be_visitor_home_cs::visit_home (be_home *node)
-{
-  if (node->cli_stub_gen () || node->imported ())
-    {
-      return 0;
-    }
-
-    if (be_global->tc_support ())
-      {
-        be_visitor_context ctx (*this->ctx_);
-        ctx.node (node);
-        TAO::be_visitor_objref_typecode tc_visitor (&ctx);
-
-        // No double dispatch here so the objref_typecode visitor
-        // can dynamic_cast the node to tell it's a home.
-        if (tc_visitor.visit_interface (node) == -1)
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                              "(%N:%l) be_visitor_home_cs::"
-                              "visit_home - "
-                              "TypeCode definition failed\n"),
-                              -1);
-          }
-      }
-
-  node->cli_stub_gen (true);
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index a762a53655a..710d1129c4c 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -217,9 +217,11 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
               << be_nl << be_nl;
         }
 
-      if (be_global->gen_direct_collocation() || be_global->gen_thru_poa_collocation ())
+      if (be_global->gen_direct_collocation()
+          || be_global->gen_thru_poa_collocation ())
         {
-          *os << "// These methods traverse the inheritance tree and set the"
+          *os << "// These methods traverse the "
+              << "inheritance tree and set the"
               << be_nl
               << "// parents piece of the given class in the right mode."
               << be_nl
@@ -324,7 +326,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
         }
     }
 
-  if (be_global->tc_support () && !node->home_equiv ())
+  if (be_global->tc_support ())
     {
       be_visitor_typecode_decl td_visitor (&ctx);
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index ea5ec42b2f2..9d77aaf5b04 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -407,7 +407,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
         }
     }
 
-  if (be_global->tc_support () && !node->home_equiv ())
+  if (be_global->tc_support ())
     {
 
       be_visitor_context ctx = *this->ctx_;
@@ -452,9 +452,10 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
 
   if (node->is_local ())
     {
-      *os << "return " << node->local_name () << "::_duplicate ("
-          << be_idt << be_idt_nl
-          << "dynamic_cast<" << node->local_name () << "_ptr> (_tao_objref)"
+      *os << "return " << node->local_name ()
+          << "::_duplicate (" << be_idt << be_idt_nl
+          << "dynamic_cast<" << node->local_name ()
+          << "_ptr> (_tao_objref)"
           << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl
           << "}" << be_nl << be_nl;
@@ -464,7 +465,8 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
   else if (be_global->gen_smart_proxies () &&
            !node->is_abstract ())
     {
-      *os << node->full_name () << " *proxy = 0;" << be_nl << be_nl
+      *os << node->full_name () << " *proxy = 0;"
+      << be_nl << be_nl
           << "proxy = TAO::Narrow_Utils<"
           << node->local_name () << ">::" << pre << " (";
 
@@ -472,7 +474,8 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
           << "_tao_objref," << be_nl
           << "\"" << node->repoID () << "\"," << be_nl;
 
-      if (be_global->gen_direct_collocation() || be_global->gen_thru_poa_collocation ())
+      if (be_global->gen_direct_collocation()
+          || be_global->gen_thru_poa_collocation ())
         {
           *os << node->flat_client_enclosing_scope ()
               << node->base_proxy_broker_name ()
@@ -507,7 +510,8 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
           << "_tao_objref," << be_nl
           << "\"" << node->repoID () << "\"," << be_nl;
 
-      if (be_global->gen_direct_collocation() || be_global->gen_thru_poa_collocation ())
+      if (be_global->gen_direct_collocation()
+          || be_global->gen_thru_poa_collocation ())
         {
           *os << node->flat_client_enclosing_scope ()
               << node->base_proxy_broker_name ()
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module.cpp b/TAO/TAO_IDL/be/be_visitor_module/module.cpp
index d380b0ad4f6..8a3f05abf91 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module.cpp
@@ -825,18 +825,6 @@ be_visitor_module::visit_home (be_home *node)
 
   switch (this->ctx_->state ())
     {
-    case TAO_CodeGen::TAO_ROOT_CH:
-      {
-        be_visitor_home_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_CS:
-      {
-        be_visitor_home_cs visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
     case TAO_CodeGen::TAO_ROOT_SVH:
       {
         be_visitor_home_svh visitor (&ctx);
@@ -867,9 +855,6 @@ be_visitor_module::visit_home (be_home *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_CNH:
-    case TAO_CodeGen::TAO_ROOT_CNS:
-      break;
     default:
       return 0; // nothing to be done
     }
diff --git a/TAO/TAO_IDL/be_include/be_visitor_home.h b/TAO/TAO_IDL/be_include/be_visitor_home.h
index db7500a2db0..f8f8e8afe56 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_home.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_home.h
@@ -23,8 +23,6 @@
 #include "be_visitor_operation/operation.h"
 #include "be_visitor_operation/arglist.h"
 
-#include "be_visitor_home/home_ch.h"
-#include "be_visitor_home/home_cs.h"
 #include "be_visitor_home/home_svh.h"
 #include "be_visitor_home/home_svs.h"
 #include "be_visitor_home/home_ex_idl.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_ch.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_ch.h
deleted file mode 100644
index 03a0adbd1b3..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_home/home_ch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    home_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component Home node.
- *  This one provides code generation for component home node.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef _BE_VISITOR_HOME_CH_H_
-#define _BE_VISITOR_HOME_CH_H_
-
-/**
- * @class be_visitor_home_ch
- *
- * @brief be_visitor_home_ch
- *
- * This is the visitor for component home for the header file
- */
-class be_visitor_home_ch : public be_visitor_decl
-{
-public:
-  /// constructor
-  be_visitor_home_ch (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_home_ch (void);
-
-  /// visit home.
-  virtual int visit_home (be_home *node);
-};
-
-#endif /* _BE_VISITOR_HOME_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_cs.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_cs.h
deleted file mode 100644
index fdd18125011..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_home/home_cs.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    home_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component Home node.
- *  This one provides code generation for component home node.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef _BE_VISITOR_HOME_CS_H_
-#define _BE_VISITOR_HOME_CS_H_
-
-/**
- * @class be_visitor_home_cs
- *
- * @brief be_visitor_home_cs
- *
- * This is the visitor for component home for the source file
- */
-class be_visitor_home_cs : public be_visitor_decl
-{
-public:
-  /// constructor
-  be_visitor_home_cs (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_home_cs (void);
-
-  /// visit home.
-  virtual int visit_home (be_home *node);
-};
-
-#endif /* _BE_VISITOR_HOME_CS_H_ */