Merge pull request #1032 from jwillemsen/jwi-taoidlcleanup

Small tao_idl cleanup

3 files changed, 1 insertions, 13 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index e37489f190e..fa3e691ebc8 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -453,11 +453,9 @@ be_visitor_interface_ss::generate_amh_classes (be_interface *node)
 int
 be_visitor_interface_ss::generate_proxy_classes (be_interface *node)
 {
-  be_visitor_context ctx = *this->ctx_;
-
   if (be_global->gen_direct_collocation ())
     {
-      ctx = *this->ctx_;
+      be_visitor_context ctx = *this->ctx_;
       ctx.state (TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SS);
       be_visitor_interface_direct_proxy_impl_ss idpi_visitor (&ctx);
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
index 499bc04426a..9f83d277dfb 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
@@ -53,9 +53,6 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node)
 
   const char *full_skel_name = full_skel_name_holder.c_str ();
 
-  ACE_CString flat_name_holder =
-    this->generate_flat_name (node);
-
   *os << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
@@ -128,12 +125,6 @@ be_visitor_valuetype_ss::visit_eventtype (be_eventtype *node)
 }
 
 ACE_CString
-be_visitor_valuetype_ss::generate_flat_name (be_valuetype *node)
-{
-  return ACE_CString (node->flat_name ());
-}
-
-ACE_CString
 be_visitor_valuetype_ss::generate_local_name (be_valuetype *node)
 {
   return ACE_CString (node->local_name ());
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h
index ea53f7e5598..0c844fae670 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h
@@ -35,7 +35,6 @@ public:
   virtual int visit_eventtype (be_eventtype *node);
 
 protected:
-  ACE_CString generate_flat_name (be_valuetype *node);
   ACE_CString generate_local_name (be_valuetype *node);
   ACE_CString generate_full_skel_name (be_valuetype *node);
 };