ChangeLogTag: Fri Apr 16 20:20:07 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>

2 files changed, 29 insertions, 23 deletions

diff --git a/CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp b/CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp
index 17821dba5cb..8f6932ea5b4 100644
--- a/CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp
@@ -40,16 +40,20 @@ TAO_SunSoft_OutStream::print (AST_Expression *expr)
       switch (ev->et)
         {
         case AST_Expression::EV_short:
-          this->TAO_OutStream::print (ACE_INT32_FORMAT_SPECIFIER_ASCII, ev->u.sval);
+          this->TAO_OutStream::print (ACE_INT32_FORMAT_SPECIFIER_ASCII,
+                                      ev->u.sval);
           break;
         case AST_Expression::EV_ushort:
-          this->TAO_OutStream::print (ACE_INT32_FORMAT_SPECIFIER_ASCII "%c", ev->u.usval, 'U');
+          this->TAO_OutStream::print (ACE_INT32_FORMAT_SPECIFIER_ASCII,
+                                      ev->u.usval);
           break;
         case AST_Expression::EV_long:
-          this->TAO_OutStream::print (ACE_INT32_FORMAT_SPECIFIER_ASCII, ev->u.lval);
+          this->TAO_OutStream::print (ACE_INT32_FORMAT_SPECIFIER_ASCII,
+                                      ev->u.lval);
           break;
         case AST_Expression::EV_ulong:
-          this->TAO_OutStream::print (ACE_UINT32_FORMAT_SPECIFIER_ASCII "%c", ev->u.ulval, 'U');
+          this->TAO_OutStream::print (ACE_UINT32_FORMAT_SPECIFIER_ASCII,
+                                      ev->u.ulval);
           break;
         /// The next 2 cases differ from the tao_idl backend - the
         /// ACE_(U)INT64_LITERAL macros have been removed since
@@ -63,7 +67,7 @@ TAO_SunSoft_OutStream::print (AST_Expression *expr)
                                       ev->u.ullval);
           break;
         case AST_Expression::EV_float:
-          this->TAO_OutStream::print ("%f%c", ev->u.fval, 'F');
+          this->TAO_OutStream::print ("%f", ev->u.fval);
           break;
         case AST_Expression::EV_double:
           this->TAO_OutStream::print ("%24.16G", ev->u.dval);
@@ -125,7 +129,7 @@ TAO_SunSoft_OutStream::print (AST_Expression *expr)
           this->TAO_OutStream::print ("%d", ev->u.oval);
           break;
         case AST_Expression::EV_bool:
-          this->TAO_OutStream::print ("%s", ev->u.bval ? "true" : "false");
+          this->TAO_OutStream::print ("%s", ev->u.bval ? "TRUE" : "FALSE");
           break;
         case AST_Expression::EV_string:
           this->TAO_OutStream::print ("\"%s\"", ev->u.strval->get_string ());
diff --git a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
index d68d42fdcd2..6048eccb58b 100644
--- a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
@@ -236,54 +236,56 @@ idl3_to_idl2_visitor::visit_uses (AST_Uses *node)
     IdentifierHelper::original_local_name (node->local_name ());
 
   UTL_ScopedName *n = node->uses_type ()->name ();
-  ACE_CString impl_name =
+  ACE_CString impl_str =
     IdentifierHelper::orig_sn (n);
+  const char *impl_name = impl_str.c_str ();
     
   ACE_CString port_name (this->port_prefix_);
   port_name += orig_id->get_string ();
+  const char *ext_port_name = port_name.c_str ();
 
   if (node->is_multiple ())
     {
       /// We generate these by hand instead of by traversal so
       /// they will be declared before the get_connections()
       /// operation below.
-      *os << "struct " << port_name.c_str ()
+      *os << "struct " << ext_port_name
           << "Connection" << be_nl
           << "{" << be_idt_nl
-          << impl_name.c_str () << " objref;" << be_nl
+          << impl_name << " objref;" << be_nl
           << "Components::Cookie ck;" << be_uidt_nl
           << "};" << be_nl << be_nl
-          << "typedef sequence<" << orig_id << "Connection> "
-          << port_name.c_str () << "Connections;"
+          << "typedef sequence<" << ext_port_name
+          << "Connection> " << ext_port_name << "Connections;"
           << be_nl << be_nl;
          
-      *os << "Components::Cookie connect_" << port_name.c_str ()
-          << " (in " << impl_name.c_str () << " connection)"
+      *os << "Components::Cookie connect_" << ext_port_name
+          << " (in " << impl_name << " connection)"
           << be_idt_nl
           << "raises (Components::ExceededConnectionLimit, "
           << "Components::InvalidConnection);"
           << be_uidt_nl << be_nl
-          << impl_name.c_str () << " disconnect_"
-          << port_name.c_str () << " (in Components::Cookie ck)"
+          << impl_name << " disconnect_"
+          << ext_port_name << " (in Components::Cookie ck)"
           << be_idt_nl
           << "raises (Components::InvalidConnection);"
           << be_uidt_nl << be_nl
-          << port_name.c_str () << "Connections get_connections_"
-          << port_name.c_str () << " ();";
+          << ext_port_name << "Connections get_connections_"
+          << ext_port_name << " ();";
     }
   else
     {
-      *os << "void connect_" << port_name.c_str () << " (in "
-          << impl_name.c_str () << " conxn)" << be_idt_nl
+      *os << "void connect_" << ext_port_name << " (in "
+          << impl_name << " conxn)" << be_idt_nl
           << "raises (Components::AlreadyConnected, "
           << "Components::InvalidConnection);"
           << be_uidt_nl << be_nl
-          << impl_name.c_str () << " disconnect_"
-          << port_name.c_str () << " ()" << be_idt_nl
+          << impl_name << " disconnect_"
+          << ext_port_name << " ()" << be_idt_nl
           << "raises (Components::NoConnection);"
           << be_uidt_nl << be_nl
-          << impl_name.c_str () << " get_connection_"
-          << port_name.c_str () << " ();";
+          << impl_name << " get_connection_"
+          << ext_port_name << " ();";
     }
 
   orig_id->destroy ();