1 files changed, 11 insertions, 21 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/elemtype.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/elemtype.cpp
index 8937821e78e..01632c2bdfd 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/elemtype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/elemtype.cpp
@@ -89,8 +89,8 @@ be_visitor_sequence_elemtype::visit_predefined_type (be_predefined_type *node)
           }
         if (this->ctx_->state () == TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH)
           {
-            *os << bt->nested_type_name (this->ctx_->scope ()) << ",";
-            *os << bt->nested_type_name (this->ctx_->scope (), "_var") << "> ";
+            *os << bt->nested_type_name (this->ctx_->scope ()) << ","
+                << bt->nested_type_name (this->ctx_->scope ()) << "_var> ";
           }
         else
           {
@@ -127,16 +127,14 @@ be_visitor_sequence_elemtype::visit_interface (be_interface *node)
 
   if (this->ctx_->state () == TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH)
     {
-      *os << "TAO_Object_Manager<";
-      *os << bt->nested_type_name (this->ctx_->scope ()) << ", ";
-      *os << bt->nested_type_name (this->ctx_->scope (), "_var") << "> ";
+      *os << "TAO_Object_Manager<"
+          << bt->nested_type_name (this->ctx_->scope ()) << ","
+          << bt->nested_type_name (this->ctx_->scope ()) << "_var> ";
     }
   else
-    {
-      *os << "TAO_Object_Manager<";
-      *os << bt->name () << ", ";
-      *os << bt->name () << "_var> ";
-    }
+    *os << "TAO_Object_Manager<"
+        << bt->name () << ","
+        << bt->name () << "_var> ";
 
   return 0;
 }
@@ -156,7 +154,7 @@ be_visitor_sequence_elemtype::visit_interface_fwd (be_interface_fwd *node)
     {
       *os << "TAO_Object_Manager<"
           << bt->nested_type_name (this->ctx_->scope ()) << ","
-          << bt->nested_type_name (this->ctx_->scope (), "_var") << "> ";
+          << bt->nested_type_name (this->ctx_->scope ()) << "_var> ";
     }
   else
     *os << "TAO_Object_Manager<"
@@ -169,19 +167,11 @@ be_visitor_sequence_elemtype::visit_interface_fwd (be_interface_fwd *node)
 }
 
 int
-be_visitor_sequence_elemtype::visit_string (be_string *node)
+be_visitor_sequence_elemtype::visit_string (be_string *)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  if (node->width () == sizeof (char))
-    {
-      *os << "TAO_SeqElem_String_Manager ";
-    }
-  else
-    {
-      *os << "TAO_SeqElem_WString_Manager ";
-    }
-
+  *os << "TAO_SeqElem_String_Manager ";
   return 0;
 }