ChangeLogTag: Thu May 7 18:14:03 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>

3 files changed, 1 insertions, 17 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
index ef1a145949d..e2ef8974ad7 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
@@ -60,9 +60,6 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  // Now the valuetype definition itself.
-  os->gen_ifdef_macro (node->flat_name ());
-
   if (node->node_type () == AST_Decl::NT_eventtype)
     {
       *os << be_nl << be_nl
@@ -364,8 +361,6 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
   *os << be_uidt_nl
       << "};";
 
-  os->gen_endif ();
-
   // Generate the _init -related declarations.
   be_visitor_context ctx (*this->ctx_);
   be_visitor_valuetype_init_ch visitor (&ctx);
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
index 701bb1d3816..6f6d091ffb6 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
@@ -65,9 +65,6 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node)
 
   TAO_OutStream& os = *(this->ctx_->stream ());
 
-  // Generate the ifdef macro for the _init class.
-  os.gen_ifdef_macro (node->flat_name (), "_init");
-
   os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
@@ -139,9 +136,6 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node)
 
   os << be_uidt_nl << "};";
 
-  // Generate the endif macro.
-  os.gen_endif ();
-
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
index 133ea8811a1..094b0c96967 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
@@ -71,9 +71,6 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
     }
   else
     {
-      // STEP 1: Generate the class name and the class name we inherit.
-      os->gen_ifdef_macro (node->flat_name (), "_OBV");
-
       *os << be_nl << be_nl << "// OBV_ class" << be_nl;
       *os << "class " << be_global->stub_export_macro() << " ";;
 
@@ -86,7 +83,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
           << ": public virtual "
           << node->full_name ();
 
-      // STEP 1a (about which previous implementer forgot ):
+      // STEP 1 (about which previous implementer forgot ):
       // Generate inheritance from corresponding OBV_ classes.
 
 //------>>>
@@ -245,8 +242,6 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
       *os << be_nl
           << "CORBA::Boolean require_truncation_;" << be_uidt_nl
           << "};";
-
-      os->gen_endif ();
     }
 
   return 0;