ChangeLogTag: Thu Jun 19 20:39:25 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

3 files changed, 123 insertions, 115 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 916a27b7569..da7ebbdf484 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,11 @@
+Thu Jun 19 20:39:25 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/BD_String_Argument_T.cpp:
+        * tao/BD_String_Argument_T.h:
+
+          Updates to make these files correspond with the 
+          unbounded version.
+
 Thu Jun 19 17:31:11 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tests/Bench/wire/client.cpp:
diff --git a/TAO/tao/BD_String_Argument_T.cpp b/TAO/tao/BD_String_Argument_T.cpp
index ec71ba06b26..9323deed576 100644
--- a/TAO/tao/BD_String_Argument_T.cpp
+++ b/TAO/tao/BD_String_Argument_T.cpp
@@ -26,17 +26,8 @@ TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::marshal (
 }
 
 template<typename S, typename to_S, typename from_S, size_t BOUND>
-CORBA::Boolean
-TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::demarshal (
-    TAO_InputCDR &
-  )
-{
-  return 1;
-}
-
-template<typename S, typename to_S, typename from_S, size_t BOUND>
 void
-TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::add_to_interceptor (
+TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param (
     Dynamic::Parameter & p
   )
 {
@@ -44,6 +35,13 @@ TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::add_to_interceptor (
   p.mode = CORBA::PARAM_IN;
 }
 
+template<typename S, typename to_S, typename from_S, size_t BOUND>
+CORBA::Boolean
+TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_replace (CORBA::Any & any)
+{
+  return any >>= to_S (this->x_, BOUND);
+}
+
 // ===========================================================
 
 template<typename S, typename to_S, typename from_S, size_t BOUND>
@@ -72,7 +70,7 @@ TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::demarshal (
 
 template<typename S, typename to_S, typename from_S, size_t BOUND>
 void
-TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::add_to_interceptor (
+TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param (
     Dynamic::Parameter & p
   )
 {
@@ -80,72 +78,77 @@ TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::add_to_interceptor (
   p.mode = CORBA::PARAM_INOUT;
 }
 
+template<typename S, typename to_S, typename from_S, size_t BOUND>
+CORBA::Boolean
+TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_replace (CORBA::Any & any)
+{
+  return any >>= to_S (this->x_, BOUND);
+}
+
 // ==============================================================
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-TAO::Out_BD_String_Argument_T<S,to_S,from_S,BOUND>::Out_BD_String_Argument_T (
+template<typename S, typename S_out, typename to_S, typename from_S, size_t BOUND>
+TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::Out_BD_String_Argument_T (
     S *& x
   )
   : x_ (x)
 {}
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S, typename S_out, typename to_S, typename from_S, size_t BOUND>
 CORBA::Boolean
-TAO::Out_BD_String_Argument_T<S,to_S,from_S,BOUND>::marshal (
-    TAO_OutputCDR &
-  )
-{
-  return 1;
-}
-
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-CORBA::Boolean
-TAO::Out_BD_String_Argument_T<S,to_S,from_S,BOUND>::demarshal (
+TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::demarshal (
     TAO_InputCDR & cdr
   )
 {
   return cdr >> to_S (this->x_, BOUND);
 }
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-void
-TAO::Out_BD_String_Argument_T<S,to_S,from_S,BOUND>::add_to_interceptor (
-    Dynamic::Parameter &
-  )
-{
-}
-
 // ============================================================
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-TAO::Ret_BD_String_Argument_T<S,to_S,from_S,BOUND>::Ret_BD_String_Argument_T (
+template<typename S, typename S_var,  typename to_S, typename from_S, size_t BOUND>
+TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::Ret_BD_String_Argument_T (
     void
   )
 {
 }
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S, typename S_var, typename to_S, typename from_S, size_t BOUND>
 CORBA::Boolean
-TAO::Ret_BD_String_Argument_T<S,to_S,from_S,BOUND>::demarshal (
+TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::demarshal (
     TAO_InputCDR & cdr
   )
 {
   return cdr >> to_S (this->x_, BOUND);
 }
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S, typename S_var, typename to_S, typename from_S, size_t BOUND>
 void
-TAO::Ret_BD_String_Argument_T<S,to_S,from_S,BOUND>::add_to_interceptor (
+TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::interceptor_result (
     CORBA::Any * any
   )
 {
   (*any) <<= from_S (this->x_, BOUND);
 }
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-TAO::Ret_BD_String_Argument_T<S,to_S,from_S,BOUND>::operator S * () const
+template<typename S, typename S_var, typename to_S, typename from_S, size_t BOUND>
+CORBA::Boolean
+TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::interceptor_replace (CORBA::Any & any)
+{
+  return any >>= to_S (this->x_, BOUND);
+}
+
+template<typename S, typename S_var, typename to_S, typename from_S, size_t BOUND>
+S *
+TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::excp (void)
+{
+  return this->x_.ptr ();
+}
+
+template<typename S, typename S_var, typename to_S, typename from_S, size_t BOUND>
+S *
+TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::retn (void)
 {
-  return this->x_;
+  return this->x_._retn ();
 }
 
 // ============================================================
@@ -158,36 +161,35 @@ TAO::In_BD_String_SArgument_T<S,to_S,from_S,BOUND>::In_BD_String_SArgument_T (
 
 template<typename S, typename to_S, typename from_S, size_t BOUND>
 CORBA::Boolean
-TAO::In_BD_String_SArgument_T<S,to_S,from_S,BOUND>::marshal (
-    TAO_OutputCDR &
-  )
-{
-  return 1;
-}
-
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-CORBA::Boolean
 TAO::In_BD_String_SArgument_T<S,to_S,from_S,BOUND>::demarshal (
     TAO_InputCDR & cdr
   )
 {
-  return cdr >> to_S (this->x_, BOUND);
+  return cdr >> to_S (this->x_.out (), BOUND);
 }
 
 template<typename S, typename to_S, typename from_S, size_t BOUND>
 void
-TAO::In_BD_String_SArgument_T<S,to_S,from_S,BOUND>::add_to_interceptor (
+TAO::In_BD_String_SArgument_T<S,to_S,from_S,BOUND>::interceptor_param (
     Dynamic::Parameter & p
   )
 {
-  p.argument <<= from_S (this->x_, BOUND);
+  p.argument <<= from_S (this->x_.in (), BOUND);
   p.mode = CORBA::PARAM_IN;
 }
 
 template<typename S, typename to_S, typename from_S, size_t BOUND>
-TAO::In_BD_String_SArgument_T<S,to_S,from_S,BOUND>::operator S * () const
+CORBA::Boolean
+TAO::In_BD_String_SArgument_T<S,to_S,from_S,BOUND>::interceptor_replace (CORBA::Any & any)
+{
+  return any >>= to_S (this->x_.out (), BOUND);
+}
+
+template<typename S, typename to_S, typename from_S, size_t BOUND>
+const S *
+TAO::In_BD_String_SArgument_T<S,to_S,from_S,BOUND>::arg (void) const
 {
-  return this->x_;
+  return this->x_.in ();
 }
 
 // ===========================================================
@@ -203,7 +205,7 @@ TAO::Inout_BD_String_SArgument_T<S,to_S,from_S,BOUND>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return cdr << from_S (this->x_, BOUND);
+  return cdr << from_S (this->x_.in (), BOUND);
 }
 
 template<typename S, typename to_S, typename from_S, size_t BOUND>
@@ -212,23 +214,31 @@ TAO::Inout_BD_String_SArgument_T<S,to_S,from_S,BOUND>::demarshal (
     TAO_InputCDR & cdr
   )
 {
-  return cdr >> to_S (this->x_, BOUND);
+  return cdr >> to_S (this->x_.out (), BOUND);
 }
 
 template<typename S, typename to_S, typename from_S, size_t BOUND>
 void
-TAO::Inout_BD_String_SArgument_T<S,to_S,from_S,BOUND>::add_to_interceptor (
+TAO::Inout_BD_String_SArgument_T<S,to_S,from_S,BOUND>::interceptor_param (
     Dynamic::Parameter & p
   )
 {
-  p.argument <<= from_S (this->x_, BOUND);
+  p.argument <<= from_S (this->x_.in (), BOUND);
   p.mode = CORBA::PARAM_INOUT;
 }
 
 template<typename S, typename to_S, typename from_S, size_t BOUND>
-TAO::Inout_BD_String_SArgument_T<S,to_S,from_S,BOUND>::operator S *& ()
+CORBA::Boolean
+TAO::Inout_BD_String_SArgument_T<S,to_S,from_S,BOUND>::interceptor_replace (CORBA::Any & any)
 {
-  return this->x_;
+  return any >>= to_S (this->x_.in (), BOUND);
+}
+
+template<typename S, typename to_S, typename from_S, size_t BOUND>
+S *&
+TAO::Inout_BD_String_SArgument_T<S,to_S,from_S,BOUND>::arg (void)
+{
+  return this->x_.inout ();
 }
 
 // ==============================================================
@@ -244,30 +254,14 @@ TAO::Out_BD_String_SArgument_T<S,to_S,from_S,BOUND>::marshal (
     TAO_OutputCDR &cdr
   )
 {
-  return cdr << from_S (this->x_, BOUND);
+  return cdr << from_S (this->x_.in (), BOUND);
 }
 
 template<typename S, typename to_S, typename from_S, size_t BOUND>
-CORBA::Boolean
-TAO::Out_BD_String_SArgument_T<S,to_S,from_S,BOUND>::demarshal (
-    TAO_InputCDR &
-  )
+S_out
+TAO::Out_BD_String_SArgument_T<S,to_S,from_S,BOUND>::arg (void)
 {
-  return 1;
-}
-
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-void
-TAO::Out_BD_String_SArgument_T<S,to_S,from_S,BOUND>::add_to_interceptor (
-    Dynamic::Parameter &
-  )
-{
-}
-
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-TAO::Out_BD_String_SArgument_T<S,to_S,from_S,BOUND>::operator S *& ()
-{
-  return this->x_;
+  return this->x_.out ();
 }
 
 // ============================================================
@@ -284,28 +278,30 @@ TAO::Ret_BD_String_SArgument_T<S,to_S,from_S,BOUND>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return cdr << from_S (this->x_, BOUND);
+  return cdr << from_S (this->x_.in (), BOUND);
 }
 
 template<typename S, typename to_S, typename from_S, size_t BOUND>
 void
-TAO::Ret_BD_String_SArgument_T<S,to_S,from_S,BOUND>::add_to_interceptor (
+TAO::Ret_BD_String_SArgument_T<S,to_S,from_S,BOUND>::interceptor_result (
     CORBA::Any * any
   )
 {
-  (*any) <<= from_S (this->x_, BOUND);
+  (*any) <<= from_S (this->x_.in (), BOUND);
 }
 
 template<typename S, typename to_S, typename from_S, size_t BOUND>
-TAO::Ret_BD_String_SArgument_T<S,to_S,from_S,BOUND>::operator S * () const
+CORBA::Boolean
+TAO::Ret_BD_String_SArgument_T<S,to_S,from_S,BOUND>::interceptor_replace (CORBA::Any & any)
 {
-  return this->x_;
+  return any >>= to_S (this->x_.out (), BOUND);
 }
 
 template<typename S, typename to_S, typename from_S, size_t BOUND>
-TAO::Ret_BD_String_SArgument_T<S,to_S,from_S,BOUND>::operator S *& ()
+S *&
+TAO::Ret_BD_String_SArgument_T<S,to_S,from_S,BOUND>::arg (void)
 {
-  return this->x_;
+  return this->x_.out ();
 }
 
 #endif /* TAO_BD_STRING_ARGUMENT_T_C */
diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h
index e39ceebba22..58a6733fbce 100644
--- a/TAO/tao/BD_String_Argument_T.h
+++ b/TAO/tao/BD_String_Argument_T.h
@@ -27,7 +27,7 @@ namespace TAO
   /**
    * @class In_BD_String_Argument_T
    *
-   * @brief Template class for IN unbounded (w)string argument.
+   * @brief Template class for IN bounded (w)string argument.
    *
    */
   template<typename S, typename to_S, typename from_S, size_t BOUND>
@@ -37,8 +37,9 @@ namespace TAO
     In_BD_String_Argument_T (const S * x);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-    virtual void add_to_interceptor (Dynamic::Parameter &);
+
+    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
   private:
     const S * x_;
@@ -47,7 +48,7 @@ namespace TAO
   /**
    * @class Inout_BD_String_Argument_T
    *
-   * @brief Template class for INOUT unbounded (w)string argument.
+   * @brief Template class for INOUT bounded (w)string argument.
    *
    */
   template<typename S, typename to_S, typename from_S, size_t BOUND>
@@ -58,7 +59,9 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-    virtual void add_to_interceptor (Dynamic::Parameter &);
+
+    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
   private:
     mutable S *& x_;
@@ -67,7 +70,7 @@ namespace TAO
   /**
    * @class Out_BD_String_Argument_T
    *
-   * @brief Template class for INOUT unbounded (w)string argument.
+   * @brief Template class for INOUT bounded (w)string argument.
    *
    */
   template<typename S, 
@@ -80,9 +83,7 @@ namespace TAO
   public:
     Out_BD_String_Argument_T (S_out x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-    virtual void add_to_interceptor (Dynamic::Parameter &);
 
   private:
     mutable S *& x_;
@@ -91,7 +92,7 @@ namespace TAO
   /**
    * @class Ret_BD_String_Argument_T
    *
-   * @brief Template class for return stub value of ub (w)string argument.
+   * @brief Template class for return stub value of bd (w)string argument.
    *
    */
   template<typename S, 
@@ -104,11 +105,12 @@ namespace TAO
   public:
     Ret_BD_String_Argument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-    virtual void add_to_interceptor (CORBA::Any *);
 
-    operator S * ();
+    virtual void interceptor_result (CORBA::Any *);
+    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
+
+    S * excp (void);
     S * retn (void);
 
   private:
@@ -118,7 +120,7 @@ namespace TAO
   /**
    * @class In_BD_String_SArgument_T
    *
-   * @brief Template class for IN skeleton UB (w)string argument.
+   * @brief Template class for IN skeleton bd (w)string argument.
    *
    */
   template<typename S, 
@@ -131,11 +133,12 @@ namespace TAO
   public:
     In_BD_String_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-    virtual void add_to_interceptor (Dynamic::Parameter &);
 
-    operator const S * () const;
+    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
+
+    const S * arg (void) const;
 
   private:
     S * x_;
@@ -144,7 +147,7 @@ namespace TAO
   /**
    * @class Inout_BD_String_SArgument_T
    *
-   * @brief Template class for INOUT skeleton UB (w)string argument.
+   * @brief Template class for INOUT skeleton bd (w)string argument.
    *
    */
   template<typename S, 
@@ -159,9 +162,11 @@ namespace TAO
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-    virtual void add_to_interceptor (Dynamic::Parameter &);
 
-    operator S *& ();
+    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
+
+    S *& arg (void);
 
   private:
     S_var x_;
@@ -170,7 +175,7 @@ namespace TAO
   /**
    * @class Out_BD_String_SArgument_T
    *
-   * @brief Template class for INOUT skeleton UB (w)string argument.
+   * @brief Template class for INOUT skeleton bd (w)string argument.
    *
    */
   template<typename S, 
@@ -185,10 +190,8 @@ namespace TAO
     Out_BD_String_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-    virtual void add_to_interceptor (Dynamic::Parameter &);
 
-    operator S_out ();
+    S_out arg (void);
 
   private:
     S_var x_;
@@ -197,7 +200,7 @@ namespace TAO
   /**
    * @class Ret_BD_String_SArgument_T
    *
-   * @brief Template class for return skeleton value of UB (w)string.
+   * @brief Template class for return skeleton value of bd (w)string.
    *
    */
   template<typename S, 
@@ -211,10 +214,11 @@ namespace TAO
     Ret_BD_String_SArgument_T (void);
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-    virtual void add_to_interceptor (CORBA::Any *);
 
-    operator S * ();
+    virtual void interceptor_result (CORBA::Any *);
+    virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
+
+    S *& arg (void);
 
   private:
     S_var x_;