ChangeLogTag Fri Aug 19 07:56:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 24 insertions, 30 deletions

diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp
index a22d029b64c..a84a261ed85 100644
--- a/TAO/tao/UB_String_Argument_T.cpp
+++ b/TAO/tao/UB_String_Argument_T.cpp
@@ -4,50 +4,46 @@
 #define TAO_UB_STRING_ARGUMENT_T_C
 
 #include "tao/UB_String_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 #include "tao/CDR.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/UB_String_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-//#include "tao/DynamicC.h"
-
 ACE_RCSID (tao,
            UB_String_Argument_T,
            "$Id$")
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::In_UB_String_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::In_UB_String_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::In_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::In_UB_String_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_UB_String_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_UB_String_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_UB_String_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_UB_String_Argument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   delete [] this->x_;
   return cdr >> this->x_;
@@ -55,55 +51,53 @@ TAO::Inout_UB_String_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::Inout_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Inout_UB_String_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, typename S_out>
+template<typename S, typename S_out, typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_UB_String_Argument_T<S,S_out>::demarshal (TAO_InputCDR & cdr)
+TAO::Out_UB_String_Argument_T<S,S_out,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_out>
+template<typename S, typename S_out, typename Insert_Policy>
 void
-TAO::Out_UB_String_Argument_T<S,S_out>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_UB_String_Argument_T<S,S_out,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S, typename S_var>
+template<typename S, typename S_var, typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_UB_String_Argument_T<S,S_var>::demarshal (TAO_InputCDR & cdr)
+TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_.out ();
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_var>
+template<typename S, typename S_var, typename Insert_Policy>
 void
-TAO::Ret_UB_String_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any)
+TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  (*any) <<= this->x_.in ();
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */