Thu Dec 8 14:43:36 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:
          Removed export macro for contextes.

        * TAO_IDL/be/be_visitor_component.cpp:
        * TAO_IDL/be/be_visitor_interface/facet_svts.cpp:
        * TAO_IDL/be/be_visitor_interface/interface_svth.cpp:
        * TAO_IDL/be/be_visitor_interface/interface_svts.cpp:
          Fixed warnings.

7 files changed, 15 insertions, 11 deletions

diff --git a/TAO/ChangeLog.BRANCH b/TAO/ChangeLog.BRANCH
index 371aa24e9f3..cd9ef6e9d49 100644
--- a/TAO/ChangeLog.BRANCH
+++ b/TAO/ChangeLog.BRANCH
@@ -1,3 +1,15 @@
+Thu Dec  8 14:43:36 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:
+          Removed export macro for contextes.
+
+        * TAO_IDL/be/be_visitor_component.cpp:
+        * TAO_IDL/be/be_visitor_interface/facet_svts.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_svth.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_svts.cpp:
+          Fixed warnings.
+
 Thu Dec  8 14:16:52 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
         * TAO_IDL/be/be_produce.cpp:
diff --git a/TAO/TAO_IDL/be/be_visitor_component.cpp b/TAO/TAO_IDL/be/be_visitor_component.cpp
index f9c5c9cabe3..a99f0306968 100644
--- a/TAO/TAO_IDL/be/be_visitor_component.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component.cpp
@@ -88,4 +88,3 @@
 #include "be_visitor_component/component_ami_rh_ex_base.cpp"
 #include "be_visitor_component/component_ami_rh_exh.cpp"
 #include "be_visitor_component/component_ami_rh_exs.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 dcc254fb1d8..c5d52ccbf38 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp
@@ -48,15 +48,11 @@ be_visitor_context_svth::visit_component (be_component *node)
 
   os_ << "template <typename CONTAINER_TYPE, typename BASE>" << be_nl;
 
-  os_ << "class " << export_macro_.c_str () << " " << lname
-      << "_Context_T" << be_idt_nl;
+  os_ << "class " << lname << "_Context_T" << be_idt_nl;
   // Spec: no multiple inheritance allowed for components.
   AST_Component * base = node->base_component ();
   if (base)
     {
-      AST_Decl *base_scope = ScopeAsDecl (base->defined_in ());
-      ACE_CString sbase_name_str (scope->full_name ());
-      const char *sbase_name = sbase_name_str.c_str ();
       const char *lbase_name =
         base->original_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 2a5962cae24..22c115bc26c 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp
@@ -34,7 +34,6 @@ be_visitor_context_svts::visit_component (be_component *node)
 
   AST_Decl *scope = ScopeAsDecl (node->defined_in ());
   ACE_CString sname_str (scope->full_name ());
-  const char *sname = sname_str.c_str ();
   const char *lname = node_->local_name ();
   const char *global = (sname_str == "" ? "" : "::");
 
@@ -54,9 +53,6 @@ be_visitor_context_svts::visit_component (be_component *node)
   AST_Component * base = node->base_component ();
   if (base)
     {
-      AST_Decl *base_scope = ScopeAsDecl (base->defined_in ());
-      ACE_CString sbase_name_str (scope->full_name ());
-      const char *sbase_name = sbase_name_str.c_str ();
       const char *lbase_name =
         base->original_local_name ()->get_string ();
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/facet_svts.cpp b/TAO/TAO_IDL/be/be_visitor_interface/facet_svts.cpp
index 4db0de42140..d96f4a16ef6 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/facet_svts.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/facet_svts.cpp
@@ -25,7 +25,6 @@ be_visitor_facet_svts::~be_visitor_facet_svts (void)
 int
 be_visitor_facet_svts::visit_interface (be_interface *node)
 {
-  // TODO: ANOTHER CHECK IS NEEDED !!!!!!!!!!
   if (node->imported () ||
       node->svnt_src_facet_gen () ||
       idl_global->ami_connector_seen_ ||
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_svth.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_svth.cpp
index 052224b501b..4ad5e102f9e 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_svth.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_svth.cpp
@@ -41,6 +41,7 @@ be_visitor_interface_svth::visit_interface (be_interface *node)
                          ACE_TEXT ("facet visitor failed\n")),
                         -1);
     }
+  return 0;
 }
 
 int
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_svts.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_svts.cpp
index ebf766cbe37..364a8ec4bb6 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_svts.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_svts.cpp
@@ -41,6 +41,7 @@ be_visitor_interface_svts::visit_interface (be_interface *node)
                          ACE_TEXT ("facet visitor failed\n")),
                         -1);
     }
+  return 0;
 }
 
 int