Wed Dec 7 12:34:49 UTC 2011 Marcel Smit <msmit@remedy.nl>

        * TAO_IDL/be/be_visitor_component/context_svth.cpp:
        * TAO_IDL/be/be_visitor_component/context_svts.cpp:
          No need to visit the component_scope; just visit
          the scope is enough..

3 files changed, 17 insertions, 39 deletions

diff --git a/TAO/ChangeLog.BRANCH b/TAO/ChangeLog.BRANCH
index a41b4255fdd..81fb4892463 100644
--- a/TAO/ChangeLog.BRANCH
+++ b/TAO/ChangeLog.BRANCH
@@ -1,3 +1,10 @@
+Wed Dec  7 12:34:49 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/context_svth.cpp:
+        * TAO_IDL/be/be_visitor_component/context_svts.cpp:
+          No need to visit the component_scope; just visit
+          the scope is enough..
+
 Wed Dec  7 07:34:56 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
         * TAO_IDL/be/be_codegen.cpp:
diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp
index 206d5b416be..dcc254fb1d8 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp
@@ -125,13 +125,13 @@ be_visitor_context_svth::visit_component (be_component *node)
       << be_nl
       << "//@{";
 
-  if (this->visit_component_scope (node) == -1)
+  if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_context_svth")
-                         ACE_TEXT ("::visit_component - ")
-                         ACE_TEXT ("visit_component_scope() ")
-                         ACE_TEXT ("failed\n")),
+                        ACE_TEXT ("be_visitor_context_svth")
+                        ACE_TEXT ("::visit_component - ")
+                        ACE_TEXT ("visit_component_scope() ")
+                        ACE_TEXT ("failed\n")),
                         -1);
     }
 
@@ -152,11 +152,6 @@ be_visitor_context_svth::visit_connector (be_connector *node)
 int
 be_visitor_context_svth::visit_uses (be_uses *node)
 {
-  if (node->imported () && node->is_local ())
-    {
-      return 0;
-    }
-
   ACE_CString prefix (this->ctx_->port_prefix ());
   prefix += node->local_name ()->get_string ();
   const char *port_name = prefix.c_str ();
@@ -229,11 +224,6 @@ be_visitor_context_svth::visit_uses (be_uses *node)
 int
 be_visitor_context_svth::visit_publishes (be_publishes *node)
 {
-  if (node->imported () && node->is_local ())
-    {
-      return 0;
-    }
-
   const char *obj_name = node->publishes_type ()->full_name ();
   const char *port_name = node->local_name ()->get_string ();
 
@@ -273,11 +263,6 @@ be_visitor_context_svth::visit_publishes (be_publishes *node)
 int
 be_visitor_context_svth::visit_emits (be_emits *node)
 {
-  if (node->imported () && node->is_local ())
-    {
-      return 0;
-    }
-
   const char *obj_name = node->emits_type ()->full_name ();
   const char *port_name = node->local_name ()->get_string ();
 
diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp
index 9405997ef7a..2a5962cae24 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp
@@ -80,13 +80,13 @@ be_visitor_context_svts::visit_component (be_component *node)
       << "{" << be_nl
       << "}";
 
-  if (this->visit_component_scope (node) == -1)
+  if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_context_svts")
-                         ACE_TEXT ("::visit_component - ")
-                         ACE_TEXT ("visit_component_scope() ")
-                         ACE_TEXT ("failed\n")),
+                        ACE_TEXT ("be_visitor_context_svts")
+                        ACE_TEXT ("::visit_component - ")
+                        ACE_TEXT ("visit_component_scope() ")
+                        ACE_TEXT ("failed\n")),
                         -1);
     }
 
@@ -102,10 +102,6 @@ be_visitor_context_svts::visit_connector (be_connector *node)
 int
 be_visitor_context_svts::visit_uses (be_uses *node)
 {
-  if (node->imported () && node->is_local ())
-    {
-      return 0;
-    }
 
   ACE_CString prefix (this->ctx_->port_prefix ());
   prefix += node->local_name ()->get_string ();
@@ -129,11 +125,6 @@ be_visitor_context_svts::visit_uses (be_uses *node)
 int
 be_visitor_context_svts::visit_publishes (be_publishes *node)
 {
-  if (node->imported () && node->is_local ())
-    {
-      return 0;
-    }
-
   AST_Type *obj = node->publishes_type ();
   const char *port_name =
     node->local_name ()->get_string ();
@@ -270,11 +261,6 @@ be_visitor_context_svts::visit_publishes (be_publishes *node)
 int
 be_visitor_context_svts::visit_emits (be_emits *node)
 {
-  if (node->imported () && node->is_local ())
-    {
-      return 0;
-    }
-
   AST_Type *obj = node->emits_type ();
   const char *port_name =
     node->local_name ()->get_string ();