Thu Jan 7 18:45:39 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp:
          Added some more code for implicit sendc_ ports

        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
          Fixed typos

        * TAO_IDL/be_include/be_interface_strategy.h:
          Layout changes

3 files changed, 25 insertions, 32 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp
index 6de657411e1..a5f78e003f2 100644
--- a/TAO/TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp
@@ -35,6 +35,7 @@
 #include "be_predefined_type.h"
 #include "be_uses.h"
 #include "be_argument.h"
+#include "be_component.h"
 #include "be_global.h"
 #include "be_extern.h"
 #include "utl_identifier.h"
@@ -64,14 +65,14 @@ be_visitor_ami4ccm_pre_proc::visit_component (be_component *node)
 {
 printf ("here 1\n");
 
-  //if (this->visit_scope (node) == -1)
-  //  {
-  //    ACE_ERROR_RETURN ((LM_ERROR,
-  //                       "(%N:%l) be_visitor_ami4ccm_pre_proc::"
-  //                       "visit_component - "
-  //                       "visit scope failed\n"),
-  //                      -1);
-  //  }
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_ami4ccm_pre_proc::"
+                         "visit_component - "
+                         "visit scope failed\n"),
+                        -1);
+    }
 
   return 0;
 }
@@ -165,7 +166,7 @@ be_visitor_ami4ccm_pre_proc::visit_uses (be_uses *node)
                         -1);
     }
 
-  be_uses *uses = this->create_sendc_uses (node);
+  be_uses *uses = 0;//this->create_sendc_uses (node);
 
   if (uses)
     {
@@ -173,7 +174,7 @@ be_visitor_ami4ccm_pre_proc::visit_uses (be_uses *node)
 
       // Insert the ami handler after the node, the
       // exception holder will be placed between these two later.
-      component->be_add_uses (node);
+      component->be_add_uses (uses, node);
 
       // Remember from whom we were cloned
       //uses->original_interface (node);
@@ -182,6 +183,7 @@ be_visitor_ami4ccm_pre_proc::visit_uses (be_uses *node)
       // unless we set it.
       uses->set_imported (node->imported ());
     }
+
   return 0;
 }
 
@@ -354,7 +356,7 @@ int
 be_visitor_ami4ccm_pre_proc::visit_attribute (be_attribute *)
 {
 /*
-  // Temporerily generate the set operation.
+  // Temporarily generate the set operation.
   be_operation *set_operation =
     this->generate_set_operation (node);
 
@@ -387,7 +389,7 @@ be_visitor_ami4ccm_pre_proc::visit_attribute (be_attribute *)
         }
     }
 
-  // Temporerily generate the get operation.
+  // Temporarily generate the get operation.
   be_operation *get_operation =
     this->generate_get_operation (node);
 
@@ -862,13 +864,13 @@ be_visitor_ami4ccm_pre_proc::create_sendc_uses (be_uses *node)
   UTL_ScopedName *op_name =
     static_cast<UTL_ScopedName *> (node->name ()->copy ());
   op_name->last_component ()->replace_string (new_op_name.c_str ());
-
+printf ("%s\n", new_op_name.c_str());
   // Create the uses
   be_uses *op = 0;
   ACE_NEW_RETURN (op,
                   be_uses (op_name,
                            node->uses_type (),
-                           false),
+                           node->is_multiple ()),
                   0);
 
   op->set_name (op_name);
@@ -1165,7 +1167,7 @@ be_visitor_ami4ccm_pre_proc::visit_scope (be_scope *)
           }
       }
 
-      AST_Decl **elements;
+      AST_Decl **elements = 0;
       ACE_NEW_RETURN (elements,
                       AST_Decl *[number_of_elements],
                       -1);
@@ -1211,7 +1213,6 @@ be_visitor_ami4ccm_pre_proc::visit_scope (be_scope *)
           this->ctx_->node (bd);
           ++elem_number;
 
-
           // Send the visitor.
           if (bd == 0 ||  bd->accept (this) == -1)
             {
@@ -1227,7 +1228,7 @@ be_visitor_ami4ccm_pre_proc::visit_scope (be_scope *)
       delete [] elements;
       elements = 0;
     } // end of if
-    
+
   return 0;
 }
 */
diff --git a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
index 782f61cdef3..961c86d7667 100644
--- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
@@ -261,7 +261,7 @@ be_visitor_ami_pre_proc::visit_operation (be_operation *node)
 int
 be_visitor_ami_pre_proc::visit_attribute (be_attribute *node)
 {
-  // Temporerily generate the set operation.
+  // Temporarily generate the set operation.
   be_operation *set_operation =
     this->generate_set_operation (node);
 
@@ -294,7 +294,7 @@ be_visitor_ami_pre_proc::visit_attribute (be_attribute *node)
         }
     }
 
-  // Temporerily generate the get operation.
+  // Temporarily generate the get operation.
   be_operation *get_operation =
     this->generate_get_operation (node);
 
@@ -378,14 +378,14 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node,
 
   reply_handler->set_name (reply_handler_name);
   reply_handler->set_defined_in (s);
-  
+
   // Set repo id to 0, so it will be recomputed on the next access,
   // and set the prefix to the node's prefix. All this is
   // necessary in case the node's prefix was modified after
   // its declaration.
   reply_handler->AST_Decl::repoID (0);
   reply_handler->prefix (const_cast<char*> (node->prefix ()));
-  
+
   reply_handler->gen_fwd_helper_name ();
 
   // Now our customized reply handler is created, we have to
@@ -1037,7 +1037,7 @@ be_visitor_ami_pre_proc::visit_scope (be_scope *node)
           }
       }
 
-      AST_Decl **elements;
+      AST_Decl **elements = 0;
       ACE_NEW_RETURN (elements,
                       AST_Decl *[number_of_elements],
                       -1);
diff --git a/TAO/TAO_IDL/be_include/be_interface_strategy.h b/TAO/TAO_IDL/be_include/be_interface_strategy.h
index b5c885ef3f7..90a21d7776d 100644
--- a/TAO/TAO_IDL/be_include/be_interface_strategy.h
+++ b/TAO/TAO_IDL/be_include/be_interface_strategy.h
@@ -27,7 +27,6 @@ class be_interface;
 
 // This class serves as a strategy base class for the differences
 // in generating e.g. ami reply handlers.
-
 class be_interface_strategy
 {
 public:
@@ -122,7 +121,6 @@ public:
   // Return the "flat" version of the scope
   //that encloses the interface.
 
-
   const char *relative_skel_name (const char *skel_name);
   // relative skeleton name
 
@@ -156,13 +154,11 @@ public:
 
   virtual TAO_CodeGen::CG_STATE next_state (
       TAO_CodeGen::CG_STATE current_state,
-      int is_extra_state = 0
-    );
+      int is_extra_state = 0);
   // Change the sate if necessary
 
   virtual int has_extra_code_generation (
-      TAO_CodeGen::CG_STATE current_state
-    );
+      TAO_CodeGen::CG_STATE current_state);
 
   virtual be_interface *replacement (void);
   // Returns the node, which is used instead of the original node,
@@ -301,8 +297,6 @@ protected:
   // of "str" and "suffix" and using the
   // "separator" to concatenate the two.
 
-
-
 protected:
 
   enum Suffix_Code
@@ -322,8 +316,6 @@ protected:
                   // with the user classes.
   };
 
-
-
   static const char *suffix_table_[];
   static const char *tag_table_[];