1 files changed, 13 insertions, 23 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
index 70cc19ba281..af980e349a4 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
@@ -259,7 +259,8 @@ be_visitor_field_ch::visit_valuetype (be_valuetype *node)
 
   // if not a typedef and we are defined in the use scope, we must be defined
   os->indent ();
-  *os << bt->nested_type_name (this->ctx_->scope (), "_var");
+  *os <<  bt->nested_type_name (this->ctx_->scope (), "")
+      << "_var";
   return 0;
 }
 
@@ -279,7 +280,8 @@ be_visitor_field_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
 
   // if not a typedef and we are defined in the use scope, we must be defined
   os->indent ();
-  *os << bt->nested_type_name (this->ctx_->scope (), "_var");
+  *os << bt->nested_type_name (this->ctx_->scope (), "")
+      << "_var";
   return 0;
 }
 
@@ -362,19 +364,6 @@ be_visitor_field_ch::visit_sequence (be_sequence *node)
                              ), -1);
         }
       delete visitor;
-
-      // Generate the anonymous sequence member typedef
-      // but we must protect against certain versions of g++.
-      // This provides a consistent name to use instead of the
-      // implementation-specific name.
-      be_decl *bs = this->ctx_->scope ();  // get the enclosing struct backend
-      os->decr_indent (0);
-      *os << "#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)"
-          << be_idt_nl
-          << "typedef " << bt->nested_type_name (bs) 
-          << " _" << this->ctx_->node ()->local_name () << "_seq;" << be_uidt_nl;
-      *os << "#endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */\n" << be_nl;
-      os->incr_indent ();
     }
 
   os->indent (); // start from current indentation level
@@ -384,23 +373,24 @@ be_visitor_field_ch::visit_sequence (be_sequence *node)
 
 // visit string type
 int
-be_visitor_field_ch::visit_string (be_string *node)
+be_visitor_field_ch::visit_string (be_string *)
 {
   TAO_OutStream *os; // output stream
 
   os = this->ctx_->stream ();
   os->indent (); // start from current indentation level
-
   // set the right type;
-  if (node->width () == sizeof (char))
+
+#if 0
+  if (this->ctx_->alias ())
     {
-      *os << "TAO_String_Manager";
+      *os << this->ctx_->alias ()->nested_type_name (this->ctx_->scope ())
+          << "_var";
     }
   else
-    {
-      *os << "TAO_WString_Manager";
-    }
-
+    *os << "CORBA::String_var";
+#endif
+  *os << "TAO_String_Manager";
   return 0;
 }