ChangeLogTag: Sun Mar 30 12:32:33 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

8 files changed, 35 insertions, 23 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d72ee9be5ed..7bd383f1883 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Sun Mar 30 12:32:33 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_type.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+        * tao/Array_VarOut_T.cpp:
+        * tao/Array_VarOut_T.inl:
+        * tao/ORB.cpp:
+        * tao/Sequence_T.cpp:
+        * tao/Sequence_T.h:
+
+          Fixed typos and cut and paste errors.
+
 Sun Mar 30 02:50:01 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/ast/ast_type.cpp:
diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp
index 5ff335a1896..a9014341a49 100644
--- a/TAO/TAO_IDL/ast/ast_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_type.cpp
@@ -495,6 +495,7 @@ AST_Type::nested_name (const char* local_name,
   return this->nested_type_name_;
 }
 
+int
 AST_Type::ast_accept (ast_visitor *visitor)
 {
   return visitor->visit_type (this);
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
index e044ddeb502..74062c664c8 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
@@ -44,7 +44,6 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
   be_type *bt = be_type::narrow_from_decl (node->base_type ());
-  AST_Type::SIZE_TYPE st = bt->size_type ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
       << "// "__FILE__ << ":" << __LINE__;
diff --git a/TAO/tao/Array_VarOut_T.cpp b/TAO/tao/Array_VarOut_T.cpp
index c3282b714d2..b9058fedc07 100644
--- a/TAO/tao/Array_VarOut_T.cpp
+++ b/TAO/tao/Array_VarOut_T.cpp
@@ -39,7 +39,7 @@ TAO_FixedArray_Var_T<T_slice,T_life>::operator= (
       T_life::tao_free (this->ptr_);
       
       // Deep copy.
-      this->ptr_ = T_life::tao_dup (p.in ()));
+      this->ptr_ = T_life::tao_dup (p.in ());
     }
   
   return *this;
@@ -73,7 +73,7 @@ TAO_VarArray_Var_T<T_slice,T_life>::operator= (
       T_life::tao_free (this->ptr_);
       
       // Deep copy.
-      this->ptr_ = T_life::tao_dup (p.in ()));
+      this->ptr_ = T_life::tao_dup (p.in ());
     }
   
   return *this;
diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl
index edbfab034fc..3f2c2622492 100644
--- a/TAO/tao/Array_VarOut_T.inl
+++ b/TAO/tao/Array_VarOut_T.inl
@@ -18,7 +18,7 @@ TAO_Array_Var_Base_T<T_slice,T_life>::TAO_Array_Var_Base_T (
     const TAO_Array_Var_Base_T & p
   )
 {
-  this->ptr_ = T_life::tao_dup (p.in ()));
+  this->ptr_ = T_life::tao_dup (p.in ());
 }
 
 template<typename T_slice, typename T_life>
@@ -121,7 +121,7 @@ ACE_INLINE
 TAO_FixedArray_Var_T<T_slice,T_life>::TAO_FixedArray_Var_T (
     const TAO_FixedArray_Var_T & p
   )
-  : TAO_Array_Var_Base_T<T_slice,T_life (p)
+  : TAO_Array_Var_Base_T<T_slice,T_life> (p)
 {}
 
 // *************************************************************
@@ -134,7 +134,7 @@ TAO_VarArray_Var_T<T_slice,T_life>::TAO_VarArray_Var_T (void)
 template<typename T_slice, typename T_life>
 ACE_INLINE
 TAO_VarArray_Var_T<T_slice,T_life>::TAO_VarArray_Var_T (T_slice * p)
-  : TAO_VarArray_Var_T<T_slice,T_life (p)
+  : TAO_VarArray_Var_T<T_slice,T_life> (p)
 {}
 
 template<typename T_slice, typename T_life>
@@ -142,7 +142,7 @@ ACE_INLINE
 TAO_VarArray_Var_T<T_slice,T_life>::TAO_VarArray_Var_T (
     const TAO_VarArray_Var_T & p
   )
-  : TAO_Array_Var_Base_T<T_slice,T_life (p)
+  : TAO_Array_Var_Base_T<T_slice,T_life> (p)
 {}
 
 template<typename T_slice, typename T_life>
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 4a5dd900757..4e77a23767e 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -2149,7 +2149,7 @@ CORBA::ORB::lookup_value_factory (const char *repository_id
 # pragma instantiate \
     TAO_Seq_Out_T< \
         CORBA::ORB::RequestSeq, \
-        CORBA::ORB::RequestSeq_var, \ 
+        CORBA::ORB::RequestSeq_var, \
         TAO_Pseudo_Object_Manager< \
             CORBA::Request, \
             CORBA::Request_var \
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
index 04d238b01cc..72e9114b1db 100644
--- a/TAO/tao/Sequence_T.cpp
+++ b/TAO/tao/Sequence_T.cpp
@@ -2280,7 +2280,7 @@ TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::
 TAO_Bounded_Abstract_Sequence (void)
   : TAO_Bounded_Base_Sequence (
         MAX,
-        TAO_Bounded_Abstract_Sequence<T, T_var, MAX>::allocbuf (MAX)
+        TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::allocbuf (MAX)
       )
 {
 }
@@ -2584,7 +2584,7 @@ TAO_Unbounded_Array_Sequence<T,T_life>::get_buffer (CORBA::Boolean orphan)
           if (this->length_ > 0)
             {
               result = 
-	        TAO_Unbounded_Array_Sequence<T,T_lifev>::allocbuf (
+	        TAO_Unbounded_Array_Sequence<T,T_life>::allocbuf (
                     this->length_
                   );
               this->buffer_ = result;
@@ -2828,6 +2828,18 @@ TAO_Bounded_Array_Sequence<T,T_life,MAX>::get_buffer (CORBA::Boolean orphan)
 
 template <typename T, typename T_life, size_t MAX> 
 void
+TAO_Bounded_Array_Sequence<T,T_life,MAX>::freebuf (T * buffer)
+{
+  if (buffer == 0)
+    {
+      return;
+    }
+
+  delete [] buffer;
+}
+
+template <typename T, typename T_life, size_t MAX> 
+void
 TAO_Bounded_Array_Sequence<T,T_life,MAX>::_allocate_buffer (
     CORBA::ULong length
   )
@@ -2847,18 +2859,6 @@ TAO_Bounded_Array_Sequence<T,T_life,MAX>::_deallocate_buffer (void)
       return;
     }
 
-template <typename T, typename T_life, size_t MAX> 
-void
-TAO_Bounded_Array_Sequence<T,T_life,MAX>::freebuf (T * buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-
-  delete [] buffer;
-}
-
 #if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
   T * tmp = (T *) this->buffer_;
 #else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index ba883060b51..a5f420fcf4a 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -1370,7 +1370,7 @@ public:
 
   /// Free a buffer allocated by allocbuf() and release each element on
   /// it.
-  static void freebuf (T *buffer);
+  static void freebuf (T * buffer);
 
   static void _tao_any_destructor (void *);