1 files changed, 23 insertions, 57 deletions

diff --git a/TAO/tao/Objref_VarOut_T.cpp b/TAO/tao/Objref_VarOut_T.cpp
index 34d4129a855..d037bdaea94 100644
--- a/TAO/tao/Objref_VarOut_T.cpp
+++ b/TAO/tao/Objref_VarOut_T.cpp
@@ -15,92 +15,58 @@ ACE_RCSID (tao,
            Objref_VarOut_T,
            "$Id$")
 
+// @@@ (JP) This needs to be here temporarily until we regenerate the
+// hand-crafted files.
+
 template<typename T>
 T *
-TAO_Life<T>::tao_duplicate (
-    T * p
-  )
+TAO::Objref_Traits<T>::tao_duplicate (T * p)
 {
   return T::_duplicate (p);
 }
 
 template<typename T>
 void
-TAO_Life<T>::tao_release (
-    T * p
-  )
+TAO::Objref_Traits<T>::tao_release (T * p)
 {
   CORBA::release (p);
 }
 
 template<typename T>
 T *
-TAO_Life<T>::tao_nil (
-    void
-  )
+TAO::Objref_Traits<T>::tao_nil (void)
 {
   return T::_nil ();
 }
 
-template<typename T>
-CORBA::Boolean
-TAO_Life<T>::tao_marshal (
-    T * p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return p->marshal (cdr);
-}
-
-// ================================================================
-
-template<typename T>
-T *
-TAO_Cast<T>::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return T::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-template<typename T>
-CORBA::Object *
-TAO_Cast<T>::tao_upcast (
-    void *src
-  )
-{
-  T ** tmp =
-    ACE_static_cast (T **, src);
-  return *tmp;
-}
-
 // =================================================================
 
 template <typename T, typename T_life>
 TAO_Objref_Var_T<T, T_life>::TAO_Objref_Var_T (void)
-  : ptr_ (T_life::tao_nil ())
+  : ptr_ (TAO::Objref_Traits<T>::tao_nil ())
 {
 }
 
 template <typename T, typename T_life>
-TAO_Objref_Var_T<T, T_life>::TAO_Objref_Var_T (const TAO_Objref_Var_T<T, T_life> & p)
+TAO_Objref_Var_T<T, T_life>::TAO_Objref_Var_T (
+    const TAO_Objref_Var_T<T, T_life> & p
+  )
   : TAO_Base_var (),
-    ptr_ (T_life::tao_duplicate (p.ptr ()))
+    ptr_ (TAO::Objref_Traits<T>::tao_duplicate (p.ptr ()))
 {
 }
 
 template <typename T, typename T_life>
 TAO_Objref_Var_T<T, T_life>::~TAO_Objref_Var_T (void)
 {
-  T_life::tao_release (this->ptr_);
+  TAO::Objref_Traits<T>::tao_release (this->ptr_);
 }
 
 template <typename T, typename T_life>
 TAO_Objref_Var_T<T, T_life> &
 TAO_Objref_Var_T<T, T_life>::operator= (T * p)
 {
-  T_life::tao_release (this->ptr_);
+  TAO::Objref_Traits<T>::tao_release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
@@ -113,8 +79,8 @@ TAO_Objref_Var_T<T, T_life>::operator= (
 {
   if (this != &p)
     {
-      T_life::tao_release (this->ptr_);
-      this->ptr_ = T_life::tao_duplicate (p.ptr ());
+      TAO::Objref_Traits<T>::tao_release (this->ptr_);
+      this->ptr_ = TAO::Objref_Traits<T>::tao_duplicate (p.ptr ());
     }
 
   return *this;
@@ -157,8 +123,8 @@ template <typename T, typename T_life>
 T *&
 TAO_Objref_Var_T<T, T_life>::out (void)
 {
-  T_life::tao_release (this->ptr_);
-  this->ptr_ = T_life::tao_nil ();
+  TAO::Objref_Traits<T>::tao_release (this->ptr_);
+  this->ptr_ = TAO::Objref_Traits<T>::tao_nil ();
   return this->ptr_;
 }
 
@@ -167,7 +133,7 @@ T *
 TAO_Objref_Var_T<T, T_life>::_retn (void)
 {
   T * val = this->ptr_;
-  this->ptr_ = T_life::tao_nil ();
+  this->ptr_ = TAO::Objref_Traits<T>::tao_nil ();
   return val;
 }
 
@@ -182,14 +148,14 @@ template <typename T, typename T_life>
 void
 TAO_Objref_Var_T<T, T_life>::free (void)
 {
-  T_life::tao_release (this->ptr_);
+  TAO::Objref_Traits<T>::tao_release (this->ptr_);
 }
 
 template <typename T, typename T_life>
 void
 TAO_Objref_Var_T<T, T_life>::reset (T * p)
 {
-  T_life::tao_release (this->ptr_);
+  TAO::Objref_Traits<T>::tao_release (this->ptr_);
   this->ptr_ = p;
 }
 
@@ -208,8 +174,8 @@ TAO_Objref_Out_T<T, T_life>::TAO_Objref_Out_T (
   )
   : ptr_ (p.out ())
 {
-  T_life::tao_release (this->ptr_);
-  this->ptr_ = T_life::tao_nil ();
+  TAO::Objref_Traits<T>::tao_release (this->ptr_);
+  this->ptr_ = TAO::Objref_Traits<T>::tao_nil ();
 }
 
 template <typename T, typename T_life>
@@ -236,7 +202,7 @@ TAO_Objref_Out_T<T, T_life>::operator= (
     const TAO_Objref_Var_T<T, T_life> & p
   )
 {
-  this->ptr_ = T_life::tao_duplicate (p.ptr ());
+  this->ptr_ = TAO::Objref_Traits<T>::tao_duplicate (p.ptr ());
   return *this;
 }