3 files changed, 41 insertions, 9 deletions

diff --git a/TAO/tao/Valuetype/Sequence_T.inl b/TAO/tao/Valuetype/Sequence_T.inl
index d36e355b374..f8bbada422e 100644
--- a/TAO/tao/Valuetype/Sequence_T.inl
+++ b/TAO/tao/Valuetype/Sequence_T.inl
@@ -83,7 +83,7 @@ ACE_INLINE
 T *&
 TAO_Valuetype_Manager<T,T_var,T_life>::out (void)
 {
-  T_life::tao_remove_ref (*this->ptr_);
+  TAO::Value_Traits<T>::tao_remove_ref (*this->ptr_);
   *this->ptr_ = 0;
   return *this->ptr_;
 }
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp
index 9ee88a39c8f..6b3bbb8b541 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.cpp
+++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp
@@ -9,6 +9,22 @@ ACE_RCSID (tao,
            Value_VarOut_T, 
            "$Id$")
 
+template<typename T>
+void
+TAO::Value_Traits<T>::tao_add_ref (T * p)
+{
+  CORBA::add_ref (p);
+}
+
+template<typename T>
+void
+TAO::Value_Traits<T>::tao_remove_ref (T * p)
+{
+  CORBA::remove_ref (p);
+}
+
+// ===============================================================
+
 template <typename T, typename T_life>
 TAO_Value_Var_T<T,T_life>::TAO_Value_Var_T (void)
   : ptr_ (0)
@@ -36,21 +52,21 @@ TAO_Value_Var_T<T,T_life>::TAO_Value_Var_T (
     const TAO_Value_Var_T<T,T_life> & p
   )
 {
-  T_life::tao_add_ref (p.ptr ());
+  TAO::Value_Traits<T>::tao_add_ref (p.ptr ());
   this->ptr_ = p.ptr ();
 }
 
 template <typename T, typename T_life>
 TAO_Value_Var_T<T,T_life>::~TAO_Value_Var_T (void)
 {
-  T_life::tao_remove_ref (this->ptr_);
+  TAO::Value_Traits<T>::tao_remove_ref (this->ptr_);
 }
 
 template <typename T, typename T_life>
 TAO_Value_Var_T<T,T_life> &
 TAO_Value_Var_T<T,T_life>::operator= (T * p)
 {
-  T_life::tao_remove_ref (this->ptr_);
+  TAO::Value_Traits<T>::tao_remove_ref (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
@@ -61,9 +77,9 @@ TAO_Value_Var_T<T,T_life>::operator= (const TAO_Value_Var_T & p)
 {
   if (this != &p)
   {
-    T_life::tao_remove_ref (this->ptr_);
+    TAO::Value_Traits<T>::tao_remove_ref (this->ptr_);
     T * tmp = p.ptr ();
-    T_life::tao_add_ref (tmp);
+    TAO::Value_Traits<T>::tao_add_ref (tmp);
     this->ptr_ = tmp;
   }
   
@@ -107,7 +123,7 @@ template <typename T, typename T_life>
 T *&
 TAO_Value_Var_T<T,T_life>::out (void)
 {
-  T_life::tao_remove_ref (this->ptr_);
+  TAO::Value_Traits<T>::tao_remove_ref (this->ptr_);
   this->ptr_ = 0;
   return this->ptr_;
 }
@@ -134,7 +150,7 @@ template <typename T, typename T_life>
 TAO_Value_Out_T<T,T_life>::TAO_Value_Out_T (TAO_Value_Var_T<T,T_life> & p)
   : ptr_ (p.out ())
 {
-  T_life::tao_remove_ref (this->ptr_);
+  TAO::Value_Traits<T>::tao_remove_ref (this->ptr_);
   this->ptr_ = 0;
 }
 
@@ -156,7 +172,7 @@ TAO_Value_Out_T<T,T_life> &
 TAO_Value_Out_T<T,T_life>::operator= (const TAO_Value_Var_T<T,T_life> & p)
 {
   T * tmp = p.ptr ();
-  T_life::tao_add_ref (tmp);
+  TAO::Value_Traits<T>::tao_add_ref (tmp);
   this->ptr_ = tmp;
   return *this;
 }
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h
index a2fcee4223e..320542876db 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.h
+++ b/TAO/tao/Valuetype/Value_VarOut_T.h
@@ -20,6 +20,22 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+namespace TAO
+{
+  /**
+   * struct Value_Traits
+   *
+   * @brief Specialized for each valuetype in generated code.
+   *
+   */
+  template<typename T>
+  struct Value_Traits
+  {
+    static void tao_add_ref (T *);
+    static void tao_remove_ref (T *);
+  };
+};
+
 /**
  * @class TAO_Value_Var_T
  *