in some cases the & was genearted twice, rectidfied

2 files changed, 58 insertions, 58 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp b/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp
index 7d793f47ef3..de8b11414ed 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp
@@ -68,8 +68,8 @@ int be_visitor_args_request_info_ch::visit_argument (be_argument *node)
                          "cannot accept visitor\n"),
                         -1);
     }
-
-  *os << " &" << node->local_name () << "_;\n";
+  // As we visit each type we print out the &.
+  *os << node->local_name () << "_;\n";
   return 0;
 }
 
@@ -80,13 +80,13 @@ int be_visitor_args_request_info_ch::visit_array (be_array *node)
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
-      *os << "const " << this->type_name (node);
+      *os << "const " << this->type_name (node)<< " &";
       break;
     case AST_Argument::dir_INOUT:
-      *os << this->type_name (node);
+      *os << this->type_name (node)<< " &";
       break;
     case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
+      *os << this->type_name (node, "_out")<< " &";
       break;
     }
   return 0;
@@ -99,13 +99,13 @@ int be_visitor_args_request_info_ch::visit_enum (be_enum *node)
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
-      *os << this->type_name (node);
+      *os << this->type_name (node)<< " &";
       break;
     case AST_Argument::dir_INOUT:
       *os << this->type_name (node) << " &";
       break;
     case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
+      *os << this->type_name (node, "_out")<< " &";
       break;
     }
   return 0;
@@ -118,13 +118,13 @@ int be_visitor_args_request_info_ch::visit_interface (be_interface *node)
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
-      *os << this->type_name (node, "_ptr");
+      *os << this->type_name (node, "_ptr")<< " &";
       break;
     case AST_Argument::dir_INOUT: // inout
       *os << this->type_name (node, "_ptr") << " &";
       break;
     case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
+      *os << this->type_name (node, "_out")<< " &";
       break;
     }
   return 0;
@@ -137,13 +137,13 @@ int be_visitor_args_request_info_ch::visit_interface_fwd (be_interface_fwd *node
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
-      *os << this->type_name (node, "_ptr");
+      *os << this->type_name (node, "_ptr")<< " &";
       break;
     case AST_Argument::dir_INOUT: // inout
       *os << this->type_name (node, "_ptr") << " &";
       break;
     case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
+      *os << this->type_name (node, "_out")<< " &";
       break;
     }
   return 0;
@@ -156,7 +156,7 @@ int be_visitor_args_request_info_ch::visit_native (be_native *node)
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
-      *os << this->type_name (node);
+      *os << this->type_name (node)<< " &";
       break;
     case AST_Argument::dir_INOUT:
       *os << this->type_name (node) << " &";
@@ -184,7 +184,7 @@ int be_visitor_args_request_info_ch::visit_predefined_type (be_predefined_type *
           *os << this->type_name (node) << " &";
           break;
         case AST_Argument::dir_OUT:
-          *os << this->type_name (node, "_out");
+          *os << this->type_name (node, "_out")<< " &";
           break;
         } // end switch direction
     } // end of if
@@ -193,13 +193,13 @@ int be_visitor_args_request_info_ch::visit_predefined_type (be_predefined_type *
       switch (this->direction ())
         {
         case AST_Argument::dir_IN:
-          *os << this->type_name (node, "_ptr");
+          *os << this->type_name (node, "_ptr")<< " &";
           break;
         case AST_Argument::dir_INOUT:
           *os << this->type_name (node, "_ptr") << " &";
           break;
         case AST_Argument::dir_OUT:
-          *os << this->type_name (node, "_out");
+          *os << this->type_name (node, "_out")<< " &";
           break;
         } // end switch direction
     } // end else if
@@ -208,13 +208,13 @@ int be_visitor_args_request_info_ch::visit_predefined_type (be_predefined_type *
       switch (this->direction ())
         {
         case AST_Argument::dir_IN:
-          *os << this->type_name (node);
+          *os << this->type_name (node)<< " &";
           break;
         case AST_Argument::dir_INOUT:
           *os << this->type_name (node) << " &";
           break;
         case AST_Argument::dir_OUT:
-          *os << this->type_name (node, "_out");
+          *os << this->type_name (node, "_out")<< " &";
           break;
         } // end switch direction
     } // end of else
@@ -235,7 +235,7 @@ int be_visitor_args_request_info_ch::visit_sequence (be_sequence *node)
       *os << this->type_name (node) << " &";
       break;
     case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
+      *os << this->type_name (node, "_out")<< " &";
       break;
     }
   return 0;
@@ -250,13 +250,13 @@ int be_visitor_args_request_info_ch::visit_string (be_string *node)
       switch (this->direction ())
         {
         case AST_Argument::dir_IN:
-          *os << "const char *";
+          *os << "const char *&";
           break;
         case AST_Argument::dir_INOUT:
           *os << "char *&";
           break;
         case AST_Argument::dir_OUT:
-          *os << "CORBA::String_out";
+          *os << "CORBA::String_out &";
           break;
         }
     }
@@ -265,13 +265,13 @@ int be_visitor_args_request_info_ch::visit_string (be_string *node)
       switch (this->direction ())
         {
         case AST_Argument::dir_IN:
-          *os << "const CORBA::WChar *";
+          *os << "const CORBA::WChar *&";
           break;
         case AST_Argument::dir_INOUT:
           *os << "CORBA::WChar *&";
           break;
         case AST_Argument::dir_OUT:
-          *os << "CORBA::WString_out";
+          *os << "CORBA::WString_out &";
           break;
         }
     }
@@ -292,7 +292,7 @@ int be_visitor_args_request_info_ch::visit_structure (be_structure *node)
       *os << this->type_name (node) << " &";
       break;
     case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
+      *os << this->type_name (node, "_out") &;
       break;
     }
   return 0;
@@ -311,7 +311,7 @@ int be_visitor_args_request_info_ch::visit_union (be_union *node)
       *os << this->type_name (node) << " &";
       break;
     case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
+      *os << this->type_name (node, "_out") &;
       break;
     }
   return 0;
@@ -342,13 +342,13 @@ int be_visitor_args_request_info_ch::visit_valuetype (be_valuetype *node)
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
-      *os << this->type_name (node) << " *";
+      *os << this->type_name (node) << " *&";
       break;
     case AST_Argument::dir_INOUT:
       *os << this->type_name (node) << " *&";
       break;
     case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
+      *os << this->type_name (node, "_out")<< " &";;
       break;
     }
   return 0;
@@ -361,13 +361,13 @@ int be_visitor_args_request_info_ch::visit_valuetype_fwd (be_valuetype_fwd *node
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
-      *os << "const " << this->type_name (node) << " *";
+      *os << "const " << this->type_name (node) << " *"<< " &";;
       break;
     case AST_Argument::dir_INOUT:
       *os << this->type_name (node) << " *&";
       break;
     case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
+      *os << this->type_name (node, "_out")<< " &";;
       break;
     }
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/request_info_sh.cpp b/TAO/TAO_IDL/be/be_visitor_argument/request_info_sh.cpp
index a3977d20bc5..49e151de502 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/request_info_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/request_info_sh.cpp
@@ -68,8 +68,8 @@ int be_visitor_args_request_info_sh::visit_argument (be_argument *node)
                          "cannot accept visitor\n"),
                         -1);
     }
-
-  *os << " &" << node->local_name () << "_;\n";
+  // As we visit each type we print out the &.
+  *os << node->local_name () << "_;\n";
   return 0;
 }
 int be_visitor_args_request_info_sh::visit_array (be_array *node)
@@ -79,13 +79,13 @@ int be_visitor_args_request_info_sh::visit_array (be_array *node)
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
-      *os << "const " << this->type_name (node);
+      *os << "const " << this->type_name (node)<< " &";;
       break;
     case AST_Argument::dir_INOUT:
-      *os << this->type_name (node);
+      *os << this->type_name (node)<< " &";;
       break;
     case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
+      *os << this->type_name (node, "_out")<< " &";;
       break;
     }
   return 0;
@@ -98,13 +98,13 @@ int be_visitor_args_request_info_sh::visit_enum (be_enum *node)
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
-      *os << this->type_name (node);
+      *os << this->type_name (node)<< " &";;
       break;
     case AST_Argument::dir_INOUT:
       *os << this->type_name (node) << " &";
       break;
     case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
+      *os << this->type_name (node, "_out")<< " &";;
       break;
     }
   return 0;
@@ -117,13 +117,13 @@ int be_visitor_args_request_info_sh::visit_interface (be_interface *node)
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
-      *os << this->type_name (node, "_ptr");
+      *os << this->type_name (node, "_ptr")<< " &";;
       break;
     case AST_Argument::dir_INOUT: // inout
       *os << this->type_name (node, "_ptr") << " &";
       break;
     case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
+      *os << this->type_name (node, "_out")<< " &";;
       break;
     }
   return 0;
@@ -136,13 +136,13 @@ int be_visitor_args_request_info_sh::visit_interface_fwd (be_interface_fwd *node
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
-      *os << this->type_name (node, "_ptr");
+      *os << this->type_name (node, "_ptr")<< " &";
       break;
     case AST_Argument::dir_INOUT: // inout
       *os << this->type_name (node, "_ptr") << " &";
       break;
     case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
+      *os << this->type_name (node, "_out")<< " &";
       break;
     }
   return 0;
@@ -155,7 +155,7 @@ int be_visitor_args_request_info_sh::visit_native (be_native *node)
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
-      *os << this->type_name (node);
+      *os << this->type_name (node)<< " &";
       break;
     case AST_Argument::dir_INOUT:
       *os << this->type_name (node) << " &";
@@ -183,7 +183,7 @@ int be_visitor_args_request_info_sh::visit_predefined_type (be_predefined_type *
           *os << this->type_name (node) << " &";
           break;
         case AST_Argument::dir_OUT:
-          *os << this->type_name (node, "_out");
+          *os << this->type_name (node, "_out")<<" &";
           break;
         } // end switch direction
     } // end of if
@@ -192,13 +192,13 @@ int be_visitor_args_request_info_sh::visit_predefined_type (be_predefined_type *
       switch (this->direction ())
         {
         case AST_Argument::dir_IN:
-          *os << this->type_name (node, "_ptr");
+          *os << this->type_name (node, "_ptr")<<" &";
           break;
         case AST_Argument::dir_INOUT:
           *os << this->type_name (node, "_ptr") << " &";
           break;
         case AST_Argument::dir_OUT:
-          *os << this->type_name (node, "_out");
+          *os << this->type_name (node, "_out")<<" &";
           break;
         } // end switch direction
     } // end else if
@@ -207,13 +207,13 @@ int be_visitor_args_request_info_sh::visit_predefined_type (be_predefined_type *
       switch (this->direction ())
         {
         case AST_Argument::dir_IN:
-          *os << this->type_name (node);
+          *os << this->type_name (node)<<" &";
           break;
         case AST_Argument::dir_INOUT:
           *os << this->type_name (node) << " &";
           break;
         case AST_Argument::dir_OUT:
-          *os << this->type_name (node, "_out");
+          *os << this->type_name (node, "_out")<<" &";
           break;
         } // end switch direction
     } // end of else
@@ -234,7 +234,7 @@ int be_visitor_args_request_info_sh::visit_sequence (be_sequence *node)
       *os << this->type_name (node) << " &";
       break;
     case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
+      *os << this->type_name (node, "_out")<<" &";
       break;
     }
   return 0;
@@ -249,13 +249,13 @@ int be_visitor_args_request_info_sh::visit_string (be_string *node)
       switch (this->direction ())
         {
         case AST_Argument::dir_IN:
-          *os << "const char *";
+          *os << "const char *"<<" &";
           break;
         case AST_Argument::dir_INOUT:
-          *os << "char *&";
+          *os << "char *&"<<" &";
           break;
         case AST_Argument::dir_OUT:
-          *os << "CORBA::String_out";
+          *os << "CORBA::String_out"<<" &";
           break;
         }
     }
@@ -264,13 +264,13 @@ int be_visitor_args_request_info_sh::visit_string (be_string *node)
       switch (this->direction ())
         {
         case AST_Argument::dir_IN:
-          *os << "const CORBA::WChar *";
+          *os << "const CORBA::WChar *"<<" &";
           break;
         case AST_Argument::dir_INOUT:
-          *os << "CORBA::WChar *&";
+          *os << "CORBA::WChar *&"<<" &";
           break;
         case AST_Argument::dir_OUT:
-          *os << "CORBA::WString_out";
+          *os << "CORBA::WString_out"<<" &";
           break;
         }
     }
@@ -291,7 +291,7 @@ int be_visitor_args_request_info_sh::visit_structure (be_structure *node)
       *os << this->type_name (node) << " &";
       break;
     case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
+      *os << this->type_name (node, "_out")<<" &";
       break;
     }
   return 0;
@@ -310,7 +310,7 @@ int be_visitor_args_request_info_sh::visit_union (be_union *node)
       *os << this->type_name (node) << " &";
       break;
     case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
+      *os << this->type_name (node, "_out")<<" &";
       break;
     }
   return 0;
@@ -341,13 +341,13 @@ int be_visitor_args_request_info_sh::visit_valuetype (be_valuetype *node)
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
-      *os << this->type_name (node) << " *";
+      *os << this->type_name (node) << " *&";
       break;
     case AST_Argument::dir_INOUT:
       *os << this->type_name (node) << " *&";
       break;
     case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
+      *os << this->type_name (node, "_out")<<" &";
       break;
     }
   return 0;
@@ -360,13 +360,13 @@ int be_visitor_args_request_info_sh::visit_valuetype_fwd (be_valuetype_fwd *node
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
-      *os << "const " << this->type_name (node) << " *";
+      *os << "const " << this->type_name (node) << " *&";
       break;
     case AST_Argument::dir_INOUT:
       *os << this->type_name (node) << " *&";
       break;
     case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
+      *os << this->type_name (node, "_out")<<" &";
       break;
     }
   return 0;