ChangeLogTag: Wed Aug 17 18:39:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 30 insertions, 15 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
index 7b67a019b52..f7a77246c3f 100644
--- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
@@ -141,7 +141,7 @@ be_visitor_arg_traits::visit_interface (be_interface *node)
             << "TAO::Objref_Traits<" << node->name () << ">";
         }
 
-      *os << "," << be_nl << "TAO::Any_Insert_Policy_Stream <"
+      *os << "," << be_nl << this->insert_policy() << " <"
           << node->name () << "_ptr>" << be_uidt_nl
           << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl
           << "{" << be_nl
@@ -224,7 +224,7 @@ be_visitor_arg_traits::visit_valuebox (be_valuebox *node)
              << "TAO::Value_Traits<" << node->name () << ">";
         }
 
-      os << "," << be_nl << "TAO::Any_Insert_Policy_Stream <"
+      os << "," << be_nl << this->insert_policy() << " <"
          << node->name () << "*>" << be_uidt_nl
          << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl
          << "{" << be_nl
@@ -274,7 +274,7 @@ be_visitor_arg_traits::visit_valuetype (be_valuetype *node)
              << "TAO::Value_Traits<" << node->name () << ">";
         }
 
-      os << "," << be_nl << "TAO::Any_Insert_Policy_Stream <"
+      os << "," << be_nl << this->insert_policy() << " <"
          << node->name () << "*>" << be_uidt_nl
          << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl
          << "{" << be_nl
@@ -394,7 +394,7 @@ be_visitor_arg_traits::visit_operation (be_operation *node)
               << "ACE_InputCDR::to_" << (wide ? "w" : "") << "string," << be_nl
               << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string," << be_nl
               << bound << "," << be_nl
-              << "TAO::Any_Insert_Policy_Stream <" << be_idt_nl
+              << this->insert_policy() << " <" << be_idt_nl
               << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string" << be_uidt_nl
               << ">"
               << be_uidt_nl
@@ -482,7 +482,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node)
       << "ACE_InputCDR::to_" << (wide ? "w" : "") << "string," << be_nl
       << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string," << be_nl
       << bound << "," << be_nl
-      << "TAO::Any_Insert_Policy_Stream <" << be_idt_nl
+      << this->insert_policy() << " <" << be_idt_nl
       << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string" << be_uidt_nl
       << ">"
       << be_uidt_nl
@@ -562,7 +562,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node)
       << "ACE_InputCDR::to_" << (wide ? "w" : "") << "string," << be_nl
       << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string," << be_nl
       << bound << "," << be_nl
-      << "TAO::Any_Insert_Policy_Stream <" << be_idt_nl
+      << this->insert_policy() << " <" << be_idt_nl
       << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string" << be_uidt_nl
       << ">"
       << be_uidt_nl
@@ -606,7 +606,7 @@ be_visitor_arg_traits::visit_sequence (be_sequence *node)
       << alias->name () << "," << be_nl
       << alias->name () << "_var," << be_nl
       << alias->name () << "_out," << be_nl
-      << "TAO::Any_Insert_Policy_Stream <" << alias->name () << ">" << be_uidt_nl
+      << this->insert_policy() << " <" << alias->name () << ">" << be_uidt_nl
       << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "};";
@@ -728,7 +728,7 @@ be_visitor_arg_traits::visit_string (be_string *node)
       << "ACE_InputCDR::to_" << (wide ? "w" : "") << "string," << be_nl
       << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string," << be_nl
       << bound << "," << be_nl
-      << "TAO::Any_Insert_Policy_Stream <" << be_idt_nl
+      << this->insert_policy() << " <" << be_idt_nl
       << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string" << be_uidt_nl
       << ">"
       << be_uidt_nl
@@ -818,7 +818,7 @@ be_visitor_arg_traits::visit_array (be_array *node)
           << node->name () << "_tag";
     }
 
-  *os << "," << be_nl << "TAO::Any_Insert_Policy_Stream <" << node->name ()
+  *os << "," << be_nl << this->insert_policy() << " <" << node->name ()
       << "_forany" << ">";
 
   *os << be_uidt_nl
@@ -861,7 +861,7 @@ be_visitor_arg_traits::visit_enum (be_enum *node)
 
   *os << "Basic_" << this->S_ << "Arg_Traits_T<" << be_idt << be_idt_nl
       << node->name () << "," << be_nl
-      << "TAO::Any_Insert_Policy_Stream <" << node->name () << ">" << be_uidt_nl
+      << this->insert_policy() << " <" << node->name () << ">" << be_uidt_nl
       << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "};";
@@ -912,7 +912,7 @@ be_visitor_arg_traits::visit_structure (be_structure *node)
           << node->name () << "_out";
     }
 
-  *os << "," << be_nl << "TAO::Any_Insert_Policy_Stream <"
+  *os << "," << be_nl << this->insert_policy() << " <"
       << node->name () << ">" << be_uidt_nl
       << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl
       << "{" << be_nl
@@ -1027,7 +1027,7 @@ be_visitor_arg_traits::visit_union (be_union *node)
           << node->name () << "_out";
     }
 
-  *os << "," << be_nl << "TAO::Any_Insert_Policy_Stream <"
+  *os << "," << be_nl << this->insert_policy() << " <"
       << node->name () << ">";
 
   *os << be_uidt_nl
@@ -1175,3 +1175,16 @@ be_visitor_arg_traits::visit_home (be_home *node)
 {
   return this->visit_interface (node);
 }
+
+const char *
+be_visitor_arg_traits::insert_policy (void)
+{
+  if (be_global->any_support ())
+    {
+      return "TAO::Any_Insert_Policy_Stream";
+    }
+  else
+    {
+      return "TAO::Any_Insert_Policy_Noop";
+    }
+}
diff --git a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
index ed2320152ac..9a5ef1055fc 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
@@ -46,11 +46,11 @@ public:
   virtual int visit_eventtype (be_eventtype *node);
 
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
-  
+
   virtual int visit_operation (be_operation *node);
-  
+
   virtual int visit_attribute (be_attribute *node);
-  
+
   virtual int visit_argument (be_argument *node);
 
   virtual int visit_sequence (be_sequence *node);
@@ -81,6 +81,8 @@ private:
   void generated (be_decl *node,
                   idl_bool val);
 
+  const char *insert_policy (void);
+
 private:
   char *S_;
 };