ChangeLogTag:Sun May 18 05:42:21 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

2 files changed, 120 insertions, 110 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4fac48eacb8..c56650786de 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Sun May 18 05:42:21 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/Sequence.i: TAO_Unbounded_Array_Sequence and
+	  TAO_Bounded_Array_Sequence  were parametrized by T and
+	  T_var. But the template parameters in the .i file read T
+	  and T_life. Borland 6 compile doesnt seem to like this throwing
+	  up a bunch of link errors. 
+
+	  Thanks to Johnny Willemsen for providing this patch.
+
 Sat May 17 09:44:42 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* docs/Options.html: Revamped the original documentation to be
diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i
index 7b4d4645c44..62febe426fb 100644
--- a/TAO/tao/Sequence_T.i
+++ b/TAO/tao/Sequence_T.i
@@ -5,29 +5,29 @@
 // Operations on the generic unbounded sequence class.
 // ***************************************************
 
-template <typename T> 
-ACE_INLINE 
+template <typename T>
+ACE_INLINE
 T *
 TAO_Unbounded_Sequence<T>::allocbuf (CORBA::ULong size)
 {
   return new T[size];
 }
 
-template <typename T> 
-ACE_INLINE 
+template <typename T>
+ACE_INLINE
 void
 TAO_Unbounded_Sequence<T>::freebuf (T *buffer)
 {
   delete [] buffer;
 }
 
-template <typename T> 
+template <typename T>
 ACE_INLINE
 TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (void)
 {
 }
 
-template <typename T> 
+template <typename T>
 ACE_INLINE
 TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (CORBA::ULong maximum)
   : TAO_Unbounded_Base_Sequence (maximum,
@@ -35,7 +35,7 @@ TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (CORBA::ULong maximum)
 {
 }
 
-template <typename T> 
+template <typename T>
 ACE_INLINE
 TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (CORBA::ULong maximum,
                                                    CORBA::ULong length,
@@ -45,8 +45,8 @@ TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (CORBA::ULong maximum,
 {
 }
 
-template <typename T> 
-ACE_INLINE 
+template <typename T>
+ACE_INLINE
 const T *
 TAO_Unbounded_Sequence<T>::get_buffer (void) const
 {
@@ -57,30 +57,30 @@ TAO_Unbounded_Sequence<T>::get_buffer (void) const
 // operations on the generic Bounded sequence class
 // ***************************************************
 
-template <typename T, size_t MAX> 
-ACE_INLINE 
+template <typename T, size_t MAX>
+ACE_INLINE
 T *
 TAO_Bounded_Sequence<T, MAX>::allocbuf (CORBA::ULong)
 {
   return new T[MAX];
 }
 
-template <typename T, size_t MAX> 
-ACE_INLINE 
+template <typename T, size_t MAX>
+ACE_INLINE
 void
 TAO_Bounded_Sequence<T, MAX>::freebuf (T * buffer)
 {
   delete [] buffer;
 }
 
-template <typename T, size_t MAX> 
+template <typename T, size_t MAX>
 ACE_INLINE
 TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (void)
 {
   this->maximum_ = MAX;
 }
 
-template <typename T, size_t MAX> 
+template <typename T, size_t MAX>
 ACE_INLINE
 TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (CORBA::ULong length,
                                                     T * data,
@@ -89,16 +89,16 @@ TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (CORBA::ULong length,
 {
 }
 
-template <typename T, size_t MAX> 
-ACE_INLINE 
+template <typename T, size_t MAX>
+ACE_INLINE
 const T *
 TAO_Bounded_Sequence<T, MAX>::get_buffer (void) const
 {
   return ACE_reinterpret_cast (const T * ACE_CAST_CONST, this->buffer_);
 }
 
-template <class T, size_t MAX> 
-ACE_INLINE 
+template <class T, size_t MAX>
+ACE_INLINE
 T &
 TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i)
 {
@@ -107,8 +107,8 @@ TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i)
   return tmp[i];
 }
 
-template <class T, size_t MAX> 
-ACE_INLINE 
+template <class T, size_t MAX>
+ACE_INLINE
 const T &
 TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i) const
 {
@@ -121,13 +121,13 @@ TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i) const
 // Inline operations for class TAO_Object_Manager<T>
 // *************************************************************
 
-template <typename T, typename T_var, typename T_life> 
+template <typename T, typename T_var, typename T_life>
 ACE_INLINE
 TAO_Object_Manager<T,T_var,T_life>::~TAO_Object_Manager (void)
 {
 }
 
-template <typename T, typename T_var, typename T_life> 
+template <typename T, typename T_var, typename T_life>
 ACE_INLINE
 TAO_Object_Manager<T,T_var,T_life>::TAO_Object_Manager (
     const TAO_Object_Manager<T,T_var,T_life> & rhs
@@ -137,10 +137,10 @@ TAO_Object_Manager<T,T_var,T_life>::TAO_Object_Manager (
 {
 }
 
-template <typename T, typename T_var, typename T_life> 
+template <typename T, typename T_var, typename T_life>
 ACE_INLINE
 TAO_Object_Manager<T,T_var,T_life>::TAO_Object_Manager (
-    T ** buffer, 
+    T ** buffer,
     CORBA::Boolean release
   )
   : ptr_ (buffer),
@@ -148,44 +148,44 @@ TAO_Object_Manager<T,T_var,T_life>::TAO_Object_Manager (
 {
 }
 
-template <typename T, typename T_var, typename T_life> 
+template <typename T, typename T_var, typename T_life>
 ACE_INLINE T *
 TAO_Object_Manager<T,T_var,T_life>::operator-> (void) const
 {
   return *this->ptr_;
 }
 
-template <typename T, typename T_var, typename T_life> 
+template <typename T, typename T_var, typename T_life>
 ACE_INLINE
 TAO_Object_Manager<T,T_var,T_life>::operator const T_var () const
 {
   return T_life::tao_duplicate (*this->ptr_);
 }
 
-template <typename T, typename T_var, typename T_life> 
+template <typename T, typename T_var, typename T_life>
 ACE_INLINE
 TAO_Object_Manager<T,T_var,T_life>::operator const T *() const
 {
   return *this->ptr_;
 }
 
-template <typename T, typename T_var, typename T_life> 
+template <typename T, typename T_var, typename T_life>
 ACE_INLINE
 TAO_Object_Manager<T,T_var,T_life>::operator T *&()
 {
   return *this->ptr_;
 }
 
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE 
+template <typename T, typename T_var, typename T_life>
+ACE_INLINE
 T *
 TAO_Object_Manager<T,T_var,T_life>::in (void) const
 {
   return *this->ptr_;
 }
 
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE 
+template <typename T, typename T_var, typename T_life>
+ACE_INLINE
 T *&
 TAO_Object_Manager<T,T_var,T_life>::inout (void)
 {
@@ -215,7 +215,7 @@ TAO_Pseudo_Object_Manager<T,T_var>::TAO_Pseudo_Object_Manager (
 template <typename T, typename T_var>
 ACE_INLINE
 TAO_Pseudo_Object_Manager<T,T_var>::TAO_Pseudo_Object_Manager(
-    T ** buffer, 
+    T ** buffer,
     CORBA::Boolean release
   )
   : ptr_ (buffer),
@@ -224,7 +224,7 @@ TAO_Pseudo_Object_Manager<T,T_var>::TAO_Pseudo_Object_Manager(
 }
 
 template <typename T, typename T_var>
-ACE_INLINE 
+ACE_INLINE
 T *
 TAO_Pseudo_Object_Manager<T,T_var>::operator-> (void) const
 {
@@ -246,7 +246,7 @@ TAO_Pseudo_Object_Manager<T,T_var>::operator T *& ()
 }
 
 template <typename T, typename T_var>
-ACE_INLINE 
+ACE_INLINE
 T *
 TAO_Pseudo_Object_Manager<T,T_var>::in (void) const
 {
@@ -254,7 +254,7 @@ TAO_Pseudo_Object_Manager<T,T_var>::in (void) const
 }
 
 template <typename T, typename T_var>
-ACE_INLINE 
+ACE_INLINE
 T *&
 TAO_Pseudo_Object_Manager<T,T_var>::inout (void)
 {
@@ -262,7 +262,7 @@ TAO_Pseudo_Object_Manager<T,T_var>::inout (void)
 }
 
 template <typename T, typename T_var>
-ACE_INLINE 
+ACE_INLINE
 T *&
 TAO_Pseudo_Object_Manager<T,T_var>::out (void)
 {
@@ -272,7 +272,7 @@ TAO_Pseudo_Object_Manager<T,T_var>::out (void)
 }
 
 template <typename T, typename T_var>
-ACE_INLINE 
+ACE_INLINE
 T *
 TAO_Pseudo_Object_Manager<T,T_var>::_retn (void)
 {
@@ -285,14 +285,14 @@ TAO_Pseudo_Object_Manager<T,T_var>::_retn (void)
 // class TAO_Unbounded_Object_Sequence
 // *************************************************************
 
-template <typename T, typename T_var, typename T_life, typename T_cast> 
+template <typename T, typename T_var, typename T_life, typename T_cast>
 ACE_INLINE
 TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::
 TAO_Unbounded_Object_Sequence (void)
 {
 }
 
-template <typename T, typename T_var, typename T_life, typename T_cast> 
+template <typename T, typename T_var, typename T_life, typename T_cast>
 ACE_INLINE
 TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::
 TAO_Unbounded_Object_Sequence (CORBA::ULong maximum,
@@ -303,17 +303,17 @@ TAO_Unbounded_Object_Sequence (CORBA::ULong maximum,
 {
 }
 
-template <typename T, typename T_var, typename T_life, typename T_cast> 
-ACE_INLINE 
+template <typename T, typename T_var, typename T_life, typename T_cast>
+ACE_INLINE
 TAO_Object_Manager<T,T_var,T_life>
 TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::operator[] (
     CORBA::ULong slot
   ) const
 {
   ACE_ASSERT (slot < this->maximum_);
-  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
-					 this->buffer_);
-  return 
+  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST,
+                                         this->buffer_);
+  return
     TAO_Object_Manager<T,T_var,T_life> (tmp + slot, this->release_);
 }
 
@@ -321,11 +321,11 @@ TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::operator[] (
 // class TAO_Bounded_Object_Sequence
 // *************************************************************
 
-template <typename T, 
-	  typename T_var, 
-	  typename T_life, 
-	  typename T_cast, 
-	  size_t MAX> 
+template <typename T,
+          typename T_var,
+          typename T_life,
+          typename T_cast,
+          size_t MAX>
 ACE_INLINE
 TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::
 ~TAO_Bounded_Object_Sequence (void)
@@ -333,35 +333,35 @@ TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::
   this->_deallocate_buffer ();
 }
 
-template <typename T, 
-	  typename T_var, 
-	  typename T_life, 
-	  typename T_cast, 
-  	  size_t MAX> 
+template <typename T,
+          typename T_var,
+          typename T_life,
+          typename T_cast,
+          size_t MAX>
 ACE_INLINE
 TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::
 TAO_Bounded_Object_Sequence (CORBA::ULong length,
-		             T ** value,
-		             CORBA::Boolean release)
+                             T ** value,
+                             CORBA::Boolean release)
   : TAO_Bounded_Base_Sequence (MAX, length, value, release)
 {
 }
 
-template <typename T, 
-	  typename T_var, 
-  	  typename T_life, 
-	  typename T_cast, 
-	  size_t MAX> 
-ACE_INLINE 
+template <typename T,
+          typename T_var,
+          typename T_life,
+          typename T_cast,
+          size_t MAX>
+ACE_INLINE
 TAO_Object_Manager<T,T_var,T_life>
 TAO_Bounded_Object_Sequence<T, T_var,T_life,T_cast,MAX>::operator[] (
     CORBA::ULong slot
   ) const
 {
   ACE_ASSERT (slot < this->maximum_);
-  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
-					 this->buffer_);
-  return 
+  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST,
+                                         this->buffer_);
+  return
     TAO_Object_Manager<T,T_var,T_life> (tmp + slot, this->release_ );
 }
 
@@ -388,7 +388,7 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::TAO_Unbounded_Pseudo_Sequence (
 }
 
 template <typename T, typename T_var>
-ACE_INLINE 
+ACE_INLINE
 TAO_Pseudo_Object_Manager<T,T_var>
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::operator[] (CORBA::ULong slot) const
 {
@@ -401,14 +401,14 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::operator[] (CORBA::ULong slot) const
 // class TAO_Bounded_Pseudo_Sequence
 // *************************************************************
 
-template <typename T, typename T_var, size_t MAX> 
+template <typename T, typename T_var, size_t MAX>
 ACE_INLINE
 TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::~TAO_Bounded_Pseudo_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-template <typename T, typename T_var, size_t MAX> 
+template <typename T, typename T_var, size_t MAX>
 ACE_INLINE
 TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::
 TAO_Bounded_Pseudo_Sequence (CORBA::ULong length,
@@ -418,8 +418,8 @@ TAO_Bounded_Pseudo_Sequence (CORBA::ULong length,
 {
 }
 
-template <typename T, typename T_var, size_t MAX> 
-ACE_INLINE 
+template <typename T, typename T_var, size_t MAX>
+ACE_INLINE
 TAO_Pseudo_Object_Manager<T,T_var>
 TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::operator[] (
     CORBA::ULong slot
@@ -436,10 +436,10 @@ TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::operator[] (
 // class TAO_Unbounded_Array_Sequence
 // *************************************************************
 
-template <typename T, typename T_life> 
-ACE_INLINE 
+template <typename T, typename T_var>
+ACE_INLINE
 void
-TAO_Unbounded_Array_Sequence<T,T_life>::freebuf (T * buffer)
+TAO_Unbounded_Array_Sequence<T,T_var>::freebuf (T * buffer)
 {
   if (buffer == 0)
     {
@@ -449,26 +449,26 @@ TAO_Unbounded_Array_Sequence<T,T_life>::freebuf (T * buffer)
   delete [] buffer;
 }
 
-template <typename T, typename T_life> 
+template <typename T, typename T_var>
 ACE_INLINE
-TAO_Unbounded_Array_Sequence<T,T_life>::TAO_Unbounded_Array_Sequence (void)
+TAO_Unbounded_Array_Sequence<T,T_var>::TAO_Unbounded_Array_Sequence (void)
 {
 }
 
-template <typename T, typename T_life> 
+template <typename T, typename T_var>
 ACE_INLINE
-TAO_Unbounded_Array_Sequence<T,T_life>::
+TAO_Unbounded_Array_Sequence<T,T_var>::
 TAO_Unbounded_Array_Sequence (CORBA::ULong maximum)
   : TAO_Unbounded_Base_Sequence (
         maximum,
-        TAO_Unbounded_Array_Sequence<T,T_life>::allocbuf (maximum)
+        TAO_Unbounded_Array_Sequence<T,T_var>::allocbuf (maximum)
       )
 {
 }
 
-template <typename T, typename T_life> 
+template <typename T, typename T_var>
 ACE_INLINE
-TAO_Unbounded_Array_Sequence<T,T_life>::
+TAO_Unbounded_Array_Sequence<T,T_var>::
 TAO_Unbounded_Array_Sequence (CORBA::ULong maximum,
                               CORBA::ULong length,
                               T * value,
@@ -477,10 +477,10 @@ TAO_Unbounded_Array_Sequence (CORBA::ULong maximum,
 {
 }
 
-template <typename T, typename T_life> 
-ACE_INLINE 
+template <typename T, typename T_var>
+ACE_INLINE
 T &
-TAO_Unbounded_Array_Sequence<T,T_life>::operator[] (CORBA::ULong i)
+TAO_Unbounded_Array_Sequence<T,T_var>::operator[] (CORBA::ULong i)
 {
   ACE_ASSERT (i < this->maximum_);
 
@@ -491,10 +491,10 @@ TAO_Unbounded_Array_Sequence<T,T_life>::operator[] (CORBA::ULong i)
 #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
 }
 
-template <typename T, typename T_life> 
-ACE_INLINE 
+template <typename T, typename T_var>
+ACE_INLINE
 const T &
-TAO_Unbounded_Array_Sequence<T,T_life>::operator[] (CORBA::ULong i) const
+TAO_Unbounded_Array_Sequence<T,T_var>::operator[] (CORBA::ULong i) const
 {
   ACE_ASSERT (i < this->maximum_);
 
@@ -505,12 +505,12 @@ TAO_Unbounded_Array_Sequence<T,T_life>::operator[] (CORBA::ULong i) const
 #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
 }
 
-template <typename T, typename T_life> 
-ACE_INLINE 
+template <typename T, typename T_var>
+ACE_INLINE
 const T *
-TAO_Unbounded_Array_Sequence<T,T_life>::get_buffer (void) const
+TAO_Unbounded_Array_Sequence<T,T_var>::get_buffer (void) const
 {
-  return ACE_reinterpret_cast (const T * ACE_CAST_CONST, 
+  return ACE_reinterpret_cast (const T * ACE_CAST_CONST,
                                this->buffer_);
 }
 
@@ -518,17 +518,17 @@ TAO_Unbounded_Array_Sequence<T,T_life>::get_buffer (void) const
 // class TAO_Bounded_Array_Sequence
 // *************************************************************
 
-template <typename T, typename T_life, size_t MAX> 
+template <typename T, typename T_var, size_t MAX>
 ACE_INLINE
-TAO_Bounded_Array_Sequence<T,T_life,MAX>::
+TAO_Bounded_Array_Sequence<T,T_var,MAX>::
 TAO_Bounded_Array_Sequence (void)
   : TAO_Bounded_Base_Sequence (MAX, 0, allocbuf (MAX), 1)
 {
 }
 
-template <typename T, typename T_life, size_t MAX> 
+template <typename T, typename T_var, size_t MAX>
 ACE_INLINE
-TAO_Bounded_Array_Sequence<T,T_life,MAX>::
+TAO_Bounded_Array_Sequence<T,T_var,MAX>::
 TAO_Bounded_Array_Sequence (CORBA::ULong length,
                             T * data,
                             CORBA::Boolean release)
@@ -536,10 +536,10 @@ TAO_Bounded_Array_Sequence (CORBA::ULong length,
 {
 }
 
-template <typename T, typename T_life, size_t MAX> 
-ACE_INLINE 
+template <typename T, typename T_var, size_t MAX>
+ACE_INLINE
 T &
-TAO_Bounded_Array_Sequence<T,T_life,MAX>::operator[] (CORBA::ULong i)
+TAO_Bounded_Array_Sequence<T,T_var,MAX>::operator[] (CORBA::ULong i)
 {
   ACE_ASSERT (i < this->maximum_);
 
@@ -550,10 +550,10 @@ TAO_Bounded_Array_Sequence<T,T_life,MAX>::operator[] (CORBA::ULong i)
 #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
 }
 
-template <typename T, typename T_life, size_t MAX> 
-ACE_INLINE 
+template <typename T, typename T_var, size_t MAX>
+ACE_INLINE
 const T &
-TAO_Bounded_Array_Sequence<T,T_life,MAX>::operator[] (CORBA::ULong i) const
+TAO_Bounded_Array_Sequence<T,T_var,MAX>::operator[] (CORBA::ULong i) const
 {
   ACE_ASSERT (i < this->maximum_);
 
@@ -564,12 +564,12 @@ TAO_Bounded_Array_Sequence<T,T_life,MAX>::operator[] (CORBA::ULong i) const
 #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
 }
 
-template <typename T, typename T_life, size_t MAX> 
-ACE_INLINE 
+template <typename T, typename T_var, size_t MAX>
+ACE_INLINE
 const T *
-TAO_Bounded_Array_Sequence<T,T_life,MAX>::get_buffer (void) const
+TAO_Bounded_Array_Sequence<T,T_var,MAX>::get_buffer (void) const
 {
-  return ACE_reinterpret_cast (const T * ACE_CAST_CONST, 
+  return ACE_reinterpret_cast (const T * ACE_CAST_CONST,
                                this->buffer_);
 }
 
@@ -577,14 +577,14 @@ TAO_Bounded_Array_Sequence<T,T_life,MAX>::get_buffer (void) const
 // class TAO_Bounded_String_Sequence
 // *************************************************************
 
-template<size_t MAX> 
+template<size_t MAX>
 ACE_INLINE
 TAO_Bounded_String_Sequence<MAX>::~TAO_Bounded_String_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-template<size_t MAX> 
+template<size_t MAX>
 ACE_INLINE
 TAO_Bounded_String_Sequence<MAX>::
 TAO_Bounded_String_Sequence (CORBA::ULong length,
@@ -598,14 +598,14 @@ TAO_Bounded_String_Sequence (CORBA::ULong length,
 // class TAO_Bounded_WString_Sequence
 // *************************************************************
 
-template<size_t MAX> 
+template<size_t MAX>
 ACE_INLINE
 TAO_Bounded_WString_Sequence<MAX>::~TAO_Bounded_WString_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-template<size_t MAX> 
+template<size_t MAX>
 ACE_INLINE
 TAO_Bounded_WString_Sequence<MAX>::
 TAO_Bounded_WString_Sequence (CORBA::ULong length,