Mon Jun 21 18:45:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * TAO_IDL/be/be_visitor_component/context_svh.cpp:
        * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
        * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
        * TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp:
        * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp:
        * TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp:
        * TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp:
          Layout and const changes

        * examples/ior_corbaloc/run_test.pl:
          Use -debug

9 files changed, 32 insertions, 25 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 978cc76be93..2fb517f3c6a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Mon Jun 21 18:45:27 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/context_svh.cpp:
+        * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+        * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp:
+        * TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp:
+        * TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp:
+          Layout and const changes
+
+        * examples/ior_corbaloc/run_test.pl:
+          Use -debug
+
 Mon Jun 21 17:38:35 UTC 2010  Jeff Parsons  <j.parsons@vanderbilt.edu>
 
         * tao/Vector_CDR_T.h:
diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp
index ccfa7e24778..09a720a4674 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp
@@ -162,17 +162,16 @@ be_visitor_context_svh::visit_uses (be_uses *node)
       << "virtual "
       << (is_multiple ? "::Components::Cookie *" : "void")
       << be_nl
-      << "connect_" << port_name << " (" << be_idt_nl
+      << "connect_" << port_name << " (" 
       << "::" << obj_name << "_ptr);"
-      << be_uidt_nl << be_nl;
+      << be_nl << be_nl;
 
   os_ << "virtual ::" << obj_name << "_ptr" << be_nl
       << "disconnect_" << port_name << " (";
 
   if (is_multiple)
     {
-      os_ << be_idt_nl
-          << "::Components::Cookie * ck);" << be_uidt;
+      os_ << "::Components::Cookie * ck);";
     }
   else
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
index 5e953b5a4fc..7f8158a9676 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
@@ -111,9 +111,8 @@ be_visitor_executor_exh::visit_component (be_component *node)
       << "/** Operations from Components::SessionComponent. */";
 
   os_ << be_nl << be_nl
-      << "virtual void" << be_nl
-      << "set_session_context (" << be_idt_nl
-      << "::Components::SessionContext_ptr ctx);" << be_uidt;
+      << "virtual void set_session_context ("
+      << "::Components::SessionContext_ptr ctx);";
 
   os_ << be_nl << be_nl
       << "virtual void configuration_complete (void);";
diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
index d77ddace03f..47193d68f21 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
@@ -198,17 +198,16 @@ be_visitor_servant_svh::visit_uses (be_uses *node)
       << "virtual "
       << (is_multiple ? "::Components::Cookie *" : "void")
       << be_nl
-      << "connect_" << port_name << " (" << be_idt_nl
+      << "connect_" << port_name << " (" 
       << "::" << obj_name << "_ptr);"
-      << be_uidt_nl << be_nl;
+      << be_nl << be_nl;
 
   os_ << "virtual ::" << obj_name << "_ptr" << be_nl
       << "disconnect_" << port_name << " (";
 
   if (is_multiple)
     {
-      os_ << be_idt_nl
-          << "::Components::Cookie * ck);" << be_uidt;
+      os_ << "::Components::Cookie * ck);";
     }
   else
     {
@@ -365,13 +364,11 @@ be_visitor_servant_svh::gen_non_type_specific (void)
     {
       os_ << be_nl
           << "virtual ::Components::Cookie *" << be_nl
-          << "connect (const char * name," << be_nl
-          << "         ::CORBA::Object_ptr connection);";
+          << "connect (const char * name, ::CORBA::Object_ptr connection);";
 
       os_ << be_nl << be_nl
-          << "virtual ::CORBA::Object_ptr" << be_nl
-          << "disconnect (const char * name," << be_nl
-          << "            ::Components::Cookie * ck);";
+          << "virtual ::CORBA::Object_ptr " << be_nl
+          << "disconnect (const char * name, ::Components::Cookie * ck);";
     }
     
   if (!be_global->gen_lwccm ())
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp
index c20189b6b44..e06fbae1fab 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp
@@ -101,7 +101,7 @@ be_visitor_connector_dds_ex_base::process_template_args (
   /// We depend on the DDS datatype being the first template
   /// argument for now, this may change.
   AST_Decl **datatype = 0;
-  int status = this->t_args_->get (datatype, 0UL);
+  int const status = this->t_args_->get (datatype, 0UL);
 
   if (status != 0)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp
index 2dc8a211c62..c22fed0435b 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp
@@ -47,7 +47,7 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node)
       << ": " << this->base_tname_ << "_Connector_T";
 
   AST_Decl **datatype = 0;
-  int status = this->t_args_->get (datatype, 0UL);
+  int const status = this->t_args_->get (datatype, 0UL);
 
   if (status != 0)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp
index 99382210b0e..06fb1124656 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp
@@ -58,10 +58,9 @@ be_visitor_executor_ami_exh::visit_connector (be_connector *node)
     }
 
   os_ << be_nl << be_nl
-      << "virtual void" << be_nl
-      << "set_session_context (" << be_idt_nl
+      << "virtual void set_session_context (" 
       << "::Components::SessionContext_ptr ctx);"
-      << be_uidt_nl << be_nl
+      << be_nl << be_nl
       << "virtual void configuration_complete (void);"
       << be_nl << be_nl
       << "virtual void ccm_activate (void);" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp
index 324cf53c185..2d4f427ce14 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp
@@ -202,9 +202,8 @@ be_visitor_facet_ami_exh::gen_facet_executor_class (void)
     }
     
   os_ << be_nl << be_nl
-      << "void" << be_nl
-      << "set_session_context (" << be_idt_nl
-      << "::Components::SessionContext_ptr ctx);" << be_uidt;
+      << "virtual void set_session_context (" 
+      << "::Components::SessionContext_ptr ctx);";
 
   os_ << be_uidt_nl << be_nl
       << "private:" << be_idt_nl
diff --git a/TAO/examples/ior_corbaloc/run_test.pl b/TAO/examples/ior_corbaloc/run_test.pl
index edbe6e6c632..d2418fa918b 100755
--- a/TAO/examples/ior_corbaloc/run_test.pl
+++ b/TAO/examples/ior_corbaloc/run_test.pl
@@ -219,7 +219,7 @@ print STDERR "\n======= Running corbaname: tests\n";
 foreach $o ( @corbaname_tests) {
     print STDERR "\n$test_number:  $o\n";
 
-    $CLs[1]->Arguments ("$o $corbaname_tests[$i]");
+    $CLs[1]->Arguments ("$o $corbaname_tests[$i] -ORBdebuglevel $debug_level ");
 
     $client_status =
         $CLs[1]->SpawnWaitKill ($clients[1]->ProcessStartWaitInterval() + 45);