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

9 files changed, 12 insertions, 130 deletions

diff --git a/TAO/TAO_IDL/be_include/be_component.h b/TAO/TAO_IDL/be_include/be_component.h
index 32ab8f5a009..4c49b12f4a8 100644
--- a/TAO/TAO_IDL/be_include/be_component.h
+++ b/TAO/TAO_IDL/be_include/be_component.h
@@ -73,6 +73,9 @@ public:
   /// Generate the "public virtual" entries in the stub header.
   virtual void gen_stub_inheritance (TAO_OutStream *os);
   
+  /// Generate the "public virtual" entries in the skel header.
+  virtual void gen_skel_inheritance (TAO_OutStream *os);
+  
   /// Generate the string compares for ancestors in _is_a().
   virtual int gen_is_a_ancestors (TAO_OutStream *os);
   
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index 098d9e2b65b..72b5b0027f7 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -343,6 +343,9 @@ public:
   /// Generate the "public virtual" entries in the stub header.
   virtual void gen_stub_inheritance (TAO_OutStream *os);
   
+  /// Generate the "public virtual" entries in the skel header.
+  virtual void gen_skel_inheritance (TAO_OutStream *os);
+  
   /// Generate the string compares for ancestors in _is_a().
   virtual int gen_is_a_ancestors (TAO_OutStream *os);
   
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component.h b/TAO/TAO_IDL/be_include/be_visitor_component.h
index 4f7e30736f7..481302dced0 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component.h
@@ -20,9 +20,6 @@
 #include "be_visitor_component_scope.h"
 
 #include "be_visitor_component/component.h"
-#include "be_visitor_component/component_sh.h"
-#include "be_visitor_component/component_si.h"
-#include "be_visitor_component/component_ss.h"
 #include "be_visitor_component/component_svh.h"
 #include "be_visitor_component/facet_svh.h"
 #include "be_visitor_component/context_svh.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_sh.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_sh.h
deleted file mode 100644
index d03948c064d..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_sh.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    component_sh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This provides for code generation in the server header
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef _BE_COMPONENT_COMPONENT_SH_H_
-#define _BE_COMPONENT_COMPONENT_SH_H_
-
-/**
- * @class be_visitor_component_sh
- *
- * @brief be_visitor_component_sh
- *
- * This is a concrete visitor to generate the server header for component.
- */
-class be_visitor_component_sh : public be_visitor_component
-{
-public:
-  be_visitor_component_sh (be_visitor_context *ctx);
-  ~be_visitor_component_sh (void);
-  
-  virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
-  
-protected:
-  virtual int generate_amh_classes (be_component *node);
-};
-
-#endif /* _BE_COMPONENT_COMPONENT_SH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_si.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_si.h
deleted file mode 100644
index 42f46d52726..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_si.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    component_si.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This provides for code generation in the server inline
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef _BE_COMPONENT_COMPONENT_SI_H_
-#define _BE_COMPONENT_COMPONENT_SI_H_
-
-/**
- * @class be_visitor_component_si
- *
- * @brief be_visitor_component_sh
- *
- * This is a concrete visitor to generate the server header for component.
- */
-class be_visitor_component_si : public be_visitor_component
-{
-public:
-  be_visitor_component_si (be_visitor_context *ctx);
-  ~be_visitor_component_si (void);
-  
-  virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
-};
-
-#endif /* _BE_COMPONENT_COMPONENT_SI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ss.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ss.h
deleted file mode 100644
index 17968be0fef..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_ss.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    component_ss.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This provides for code generation in the server skeleton
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef _BE_COMPONENT_COMPONENT_SS_H_
-#define _BE_COMPONENT_COMPONENT_SS_H_
-
-/**
- * @class be_visitor_component_ss
- *
- * @brief be_visitor_component_ss
- *
- * This is a concrete visitor to generate 
- * the server skeleton for component.
- */
-class be_visitor_component_ss : public be_visitor_component
-{
-public:
-  be_visitor_component_ss (be_visitor_context *ctx);
-  ~be_visitor_component_ss (void);
-  
-  virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
-};
-
-#endif /* _BE_COMPONENT_COMPONENT_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h
index 6e180cbea9e..995c09314af 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h
@@ -13,7 +13,6 @@
  */
 //=============================================================================
 
-
 #ifndef _BE_INTERFACE_INTERFACE_SH_H_
 #define _BE_INTERFACE_INTERFACE_SH_H_
 
@@ -27,14 +26,12 @@
 class be_visitor_interface_sh : public be_visitor_interface
 {
 public:
-  /// constructor
   be_visitor_interface_sh (be_visitor_context *ctx);
-  
-  /// destructor
   ~be_visitor_interface_sh (void);
   
-  /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
+  virtual int visit_component (be_component *node);
+  virtual int visit_connector (be_connector *node);
     
   /// Helper to generate the declarations for the operations
   /// of any abstract parents we may have.
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h
index 93269de40a4..cbf85d0f780 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h
@@ -13,7 +13,6 @@
  */
 //=============================================================================
 
-
 #ifndef _BE_INTERFACE_INTERFACE_SI_H_
 #define _BE_INTERFACE_INTERFACE_SI_H_
 
@@ -27,14 +26,12 @@
 class be_visitor_interface_si : public be_visitor_interface
 {
 public:
-  /// constructor
   be_visitor_interface_si (be_visitor_context *ctx);
-
-  /// destructor
   ~be_visitor_interface_si (void);
 
-  /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
+  virtual int visit_component (be_component *node);
+  virtual int visit_connector (be_connector *node);
 
 protected:
   virtual int generate_amh_classes (be_interface *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h
index 7c35a33e681..f86a68aa722 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h
@@ -15,7 +15,6 @@
  */
 //=============================================================================
 
-
 #ifndef _BE_INTERFACE_INTERFACE_SS_H_
 #define _BE_INTERFACE_INTERFACE_SS_H_
 
@@ -30,14 +29,12 @@
 class be_visitor_interface_ss : public be_visitor_interface
 {
 public:
-  /// constructor
   be_visitor_interface_ss (be_visitor_context *ctx);
-
-  /// destructor
   ~be_visitor_interface_ss (void);
 
-  /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
+  virtual int visit_component (be_component *node);
+  virtual int visit_connector (be_connector *node);
 
   /// Helper to generate the declarations for the operations
   /// of any abstract parents we may have.