1 files changed, 4 insertions, 138 deletions
diff --git a/TAO/CIAO/CIDLC/TypeNameEmitter.hpp b/TAO/CIAO/CIDLC/TypeNameEmitter.hpp
index cab1c29e1b8..8a66e400d53 100644
--- a/TAO/CIAO/CIDLC/TypeNameEmitter.hpp
+++ b/TAO/CIAO/CIDLC/TypeNameEmitter.hpp
@@ -43,35 +43,6 @@ class TypeNameEmitter : public Traversal::Void,
                         public Traversal::Component,
                         public Traversal::Home
 {
-public:
-  virtual void traverse (Void&);
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-  
 protected:
   TypeNameEmitter (std::ostream&);
 
@@ -123,6 +94,7 @@ class INArgTypeNameEmitter : public TypeNameEmitter
 public:
   INArgTypeNameEmitter (std::ostream&);
 
+  virtual void traverse (Void&);
   virtual void traverse (Boolean&);
   virtual void traverse (Octet&);
   virtual void traverse (Char&);
@@ -159,6 +131,7 @@ class INOUTArgTypeNameEmitter : public TypeNameEmitter
 public:
   INOUTArgTypeNameEmitter (std::ostream&);
 
+  virtual void traverse (Void&);
   virtual void traverse (Boolean&);
   virtual void traverse (Octet&);
   virtual void traverse (Char&);
@@ -195,6 +168,7 @@ class OUTArgTypeNameEmitter : public TypeNameEmitter
 public:
   OUTArgTypeNameEmitter (std::ostream&);
 
+  virtual void traverse (Void&);
   virtual void traverse (Boolean&);
   virtual void traverse (Octet&);
   virtual void traverse (Char&);
@@ -232,115 +206,7 @@ class NullReturnEmitter : public TypeNameEmitter
 public:
   NullReturnEmitter (std::ostream&);
 
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-};
-
-// Generates the appropriate NULL value, including the assignment operator,
-// if needed, for the rhs of an assignment statement.
-//
-//
-class NullRHSEmitter : public TypeNameEmitter
-{
-public:
-  NullRHSEmitter (std::ostream&);
-
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-};
-
-// Declares and initializes a variable to use for any extraction.
-//
-//
-class ExtractedTypeDeclEmitter : public TypeNameEmitter
-{
-public:
-  ExtractedTypeDeclEmitter (std::ostream&);
-  
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-};
-
-// Declares and initializes a variable to use for any extraction.
-//
-//
-class AssignFromExtractedEmitter : public TypeNameEmitter
-{
-public:
-  AssignFromExtractedEmitter (std::ostream&);
-  
+  virtual void traverse (Void&);
   virtual void traverse (Boolean&);
   virtual void traverse (Octet&);
   virtual void traverse (Char&);